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

[voas]

The following commit has been merged in the debian/unstable branch:
commit 535ae8844777066a186d37881da5b5ce2b35b056
Author: voas <voas at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 19:55:33 2003 +0000

            Netscape plugins were being improperly positioned. I noticed this when I
            put the web view into a window with borders around it (Carbon metal window,
            but I would imagine Cocoa metal would do it too).
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 24c6296..811a68e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-24  Ed Voas  <set EMAIL_ADDRESS environment variable>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * ChangeLog:
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+
+2003-01-24  Ed Voas  <voas at apple.com>
+
+        Reviewed by Darin.
+
+		Netscape plugins were being improperly positioned. I noticed this when I
+		put the web view into a window with borders around it (Carbon metal window,
+		but I would imagine Cocoa metal would do it too).
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+
 2003-01-23  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index b2867b8..1ab7145 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -147,9 +147,18 @@ typedef struct {
     NSRect visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
     
     // flip Y coordinates to convert NSWindow coordinates to Carbon window coordinates
-    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;
+	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;
     
     // Set up NS_Port.
     

-- 
WebKit Debian packaging