[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 0011a9cda88115139e2edc30ec51864270511f3a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 23 06:09:45 2003 +0000

            Reviewed by Dave.
    
            - worked around 3429631 -- window stops getting mouse moved events after first tooltip appears
    
            * WebView.subproj/WebHTMLViewPrivate.m: (-[NSToolTipPanel setAcceptsMouseMovedEvents:]):
            Do nothing, preventing the real setAcceptsMouseMovedEvents: (in class NSWindow) from being called.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6df5cc1..fe1e6c6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,26 @@
 2003-09-22  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+        - worked around 3429631 -- window stops getting mouse moved events after first tooltip appears
+
+        * WebView.subproj/WebHTMLViewPrivate.m: (-[NSToolTipPanel setAcceptsMouseMovedEvents:]):
+        Do nothing, preventing the real setAcceptsMouseMovedEvents: (in class NSWindow) from being called.
+
+2003-09-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        - fixed 3431033 -- crash in -[NSToolTipManager _shouldInstallToolTip:]
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _addTrackingRect:owner:userData:assumeInside:useTrackingNum:]):
+        Override this alternate version of addTrackingRect. If I don't do this, we might
+        create a real tracking rect, which we would then never remove.
+        (-[WebHTMLView removeTrackingRect:]): Added assertions.
+
+2003-09-22  Darin Adler  <darin at apple.com>
+
         * WebKit.pbproj/project.pbxproj: Rename Mixed build style to OptimizedWithSymbols.
 
 2003-09-21  Darin Adler  <darin at apple.com>
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 8b9c16b..6c2fc06 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -296,7 +296,7 @@ static WebHTMLView *lastHitView = nil;
     }
 }
 
-- (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)flag
+- (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside
 {
     ASSERT(_private->trackingRectOwner == nil);
     _private->trackingRectOwner = owner;
@@ -304,9 +304,17 @@ static WebHTMLView *lastHitView = nil;
     return TRACKING_RECT_TAG;
 }
 
+- (NSTrackingRectTag)_addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside useTrackingNum:(int)tag
+{
+    ASSERT(tag == TRACKING_RECT_TAG);
+    return [self addTrackingRect:rect owner:owner userData:data assumeInside:assumeInside];
+}
+
 - (void)removeTrackingRect:(NSTrackingRectTag)tag
 {
+    ASSERT(tag == TRACKING_RECT_TAG);
     if (_private != nil) {
+        ASSERT(_private->trackingRectOwner != nil);
         _private->trackingRectOwner = nil;
     }
 }
@@ -669,3 +677,24 @@ static WebHTMLView *lastHitView = nil;
 }
 
 @end
+
+// The following is a workaround for
+// <rdar://problem/3429631> window stops getting mouse moved events after first tooltip appears
+// The trick is to define a category on NSToolTipPanel that implements setAcceptsMouseMovedEvents:.
+// Since the category will be searched before the real class, we'll prevent the flag from being
+// set on the tool tip panel.
+
+ at interface NSToolTipPanel : NSPanel
+ at end
+
+ at interface NSToolTipPanel (WebHTMLViewPrivate)
+ at end
+
+ at implementation NSToolTipPanel (WebHTMLViewPrivate)
+
+- (void)setAcceptsMouseMovedEvents:(BOOL)flag
+{
+    // Do nothing, preventing the tool tip panel from trying to accept mouse-moved events.
+}
+
+ at end

-- 
WebKit Debian packaging