[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 c56195d926ec2731a16b146c4ce05787376b7e97
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 4 16:28:01 2003 +0000

            Reviewed by Ken.
    
            - fixed 3498426: assertion failure in tooltip code at macosx.apple.com
    
            * WebView.subproj/WebHTMLView.m: (-[WebHTMLView _setToolTip:]): Work around
            the apparent bug in AppKit (3500217) that causes it to return 0 for the tool tip
            tag by using removeAllToolTips and not storing the tag at all. Besides the assertion
            failure there may also be a symptom of a "stuck" tool tip and a small memory
            leak until the window is closed.
            * WebView.subproj/WebHTMLViewPrivate.h: Remove unused toolTipTag.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5690 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f9aff45..253d596 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3498426: assertion failure in tooltip code at macosx.apple.com
+
+        * WebView.subproj/WebHTMLView.m: (-[WebHTMLView _setToolTip:]): Work around
+        the apparent bug in AppKit (3500217) that causes it to return 0 for the tool tip
+        tag by using removeAllToolTips and not storing the tag at all. Besides the assertion
+        failure there may also be a symptom of a "stuck" tool tip and a small memory
+        leak until the window is closed.
+        * WebView.subproj/WebHTMLViewPrivate.h: Remove unused toolTipTag.
+
 2003-12-02  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 3455993..2ef09e1 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -441,11 +441,9 @@ static WebHTMLView *lastHitView = nil;
     }
     _private->toolTip = [toolTip copy];
     if (toolTip) {
-        if (_private->toolTipTag) {
-            [self removeToolTip:_private->toolTipTag];
-        }
+        [self removeAllToolTips];
         NSRect wideOpenRect = NSMakeRect(-100000, -100000, 200000, 200000);
-        _private->toolTipTag = [self addToolTipRect:wideOpenRect owner:self userData:NULL];
+        [self addToolTipRect:wideOpenRect owner:self userData:NULL];
         [self _sendToolTipMouseEntered];
     }
 }
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 1ca4c0e..21fa082 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -37,7 +37,6 @@
     WebPluginController *pluginController;
     
     NSString *toolTip;
-    NSToolTipTag toolTipTag;
     id trackingRectOwner;
     void *trackingRectUserData;
     

-- 
WebKit Debian packaging