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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 17c3da1ca71469087056549b797b2930e7734280
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 01:58:05 2004 +0000

    	Workaround for 3585644.  Force the window number of the
    	mouse moved event to be correct.
    
            Reviewed by Chris.
    
            * Carbon.subproj/CarbonWindowFrame.m:
            * Carbon.subproj/HIWebView.m:
            (MouseMoved):
            (MouseDragged):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowFrame.m b/WebKit/Carbon.subproj/CarbonWindowFrame.m
index 529d088..426a607 100644
--- a/WebKit/Carbon.subproj/CarbonWindowFrame.m
+++ b/WebKit/Carbon.subproj/CarbonWindowFrame.m
@@ -41,6 +41,21 @@ The class of objects that are meant to be used as _borderViews of NSCarbonWindow
 @implementation CarbonWindowFrame
 
 
+- (NSRect)titlebarRect
+{
+    NSRect	titlebarRect;
+    NSRect	boundsRect;
+
+    boundsRect = [self bounds];
+
+    titlebarRect.origin.x    = boundsRect.origin.x;
+    titlebarRect.size.width  = boundsRect.size.width;
+    titlebarRect.size.height = 22;
+    titlebarRect.origin.y    = NSMaxY(boundsRect) - titlebarRect.size.height;
+
+    return titlebarRect;
+}
+
 // Given a content rectangle and style mask, return a corresponding frame rectangle.
 + (NSRect)frameRectForContentRect:(NSRect)contentRect styleMask:(unsigned int)style {
 
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index ad6b320..a88a887 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -552,6 +552,14 @@ MouseMoved( HIWebView* inView, EventRef inEvent )
 	
 	GetEventPlatformEventRecord( inEvent, &eventRec );
 	RetainEvent( inEvent );
+
+#define WORK_AROUND_3585644
+#ifdef WORK_AROUND_3585644
+    int windowNumber = [inView->fKitWindow windowNumber];
+    CGSWindowID *winID = (void *)windowNumber;
+    eventRec.window = winID;
+#endif
+    
 	kitEvent = [[NSEvent alloc] _initWithCGSEvent:(CGSEventRecord)eventRec eventRef:(void *)inEvent];
 
 //	targ = [[inView->fKitWindow _borderView] hitTest:[kitEvent locationInWindow]];
@@ -574,7 +582,7 @@ MouseDragged( HIWebView* inView, EventRef inEvent )
 	CGSEventRecord			eventRec;
 	NSEvent*				kitEvent;
 //	NSView*					targ;
-	
+    
 	GetEventPlatformEventRecord( inEvent, &eventRec );
 	RetainEvent( inEvent );
 	kitEvent = [[NSEvent alloc] _initWithCGSEvent:(CGSEventRecord)eventRec eventRef:(void *)inEvent];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6b429d8..a47ce78 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-03-11  Richard Williamson   <rjw at apple.com>
+
+	Workaround for 3585644.  Force the window number of the
+	mouse moved event to be correct.
+
+        Reviewed by Chris.
+
+        * Carbon.subproj/CarbonWindowFrame.m:
+        * Carbon.subproj/HIWebView.m:
+        (MouseMoved):
+        (MouseDragged):
+
 2004-03-11  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Dave

-- 
WebKit Debian packaging