[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit b94fe5a1e5d97ef034fd8cc0128313a09ed6db1c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 17:12:33 2003 +0000

            Reviewed by John.
    
            - fixed 3160710 -- REGRESSION: bizrate.com front page ad in wrong position
    
            The new code to compute port coordinates was screwing up somehow.
            I had to roll it out and we'll have to try again to fix the problem Ed was fixing.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
            Roll back changes between 1.45 and 1.47.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3506 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 49a9c85..846f41c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-01-30  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3160710 -- REGRESSION: bizrate.com front page ad in wrong position
+
+        The new code to compute port coordinates was screwing up somehow.
+        I had to roll it out and we'll have to try again to fix the problem Ed was fixing.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+        Roll back changes between 1.45 and 1.47.
+
 2003-01-29  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index c1535f0..829f6c0 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -147,18 +147,9 @@ typedef struct {
     NSRect visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
     
     // flip Y coordinates to convert NSWindow coordinates to Carbon window coordinates
-    float borderViewHeight = [[self window] frame].size.height;
-
-    boundsInWindow.origin.y = borderViewHeight - NSMaxY( boundsInWindow );
-    visibleRectInWindow.origin.y = borderViewHeight - NSMaxY( visibleRectInWindow );
-    
-    // OK, we now have top-left based window-relative rectangles. Move them into port coordinates.
-    
-    PixMapHandle pix = GetPortPixMap( port );
-    boundsInWindow.origin.x += (**pix).bounds.left;
-    boundsInWindow.origin.y += (**pix).bounds.top;
-    visibleRectInWindow.origin.x += (**pix).bounds.left;
-    visibleRectInWindow.origin.y += (**pix).bounds.top;
+    float contentViewHeight = [[[self window] contentView] frame].size.height;
+    boundsInWindow.origin.y = contentViewHeight - boundsInWindow.origin.y - boundsInWindow.size.height; 
+    visibleRectInWindow.origin.y = contentViewHeight - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
     
     // Set up NS_Port.
     

-- 
WebKit Debian packaging