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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 7e67f7b842f7e36f4de8d3b801ba0db74be520e8
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 17 17:36:57 2003 +0000

            - fixed <rdar://problem/3512801>: REGRESSION (Safari 100-116):
            Mike Hay's Magic 8-ball game ignores slow clicks
    
            Reviewed by Darin.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _handleAutoscrollForMouseDragged:]):
            start the autoscroll timer here, so the timer only runs when KHTML is
            handling the event.
            (-[WebHTMLView mouseDown:]):
            don't start the autoscroll timer here.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1ea08e1..71c3878 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-12-17  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3512801>: REGRESSION (Safari 100-116): 
+        Mike Hay's Magic 8-ball game ignores slow clicks
+
+        Reviewed by Darin.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _handleAutoscrollForMouseDragged:]):
+        start the autoscroll timer here, so the timer only runs when KHTML is
+        handling the event.
+        (-[WebHTMLView mouseDown:]):
+        don't start the autoscroll timer here.
+
 2003-12-16  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 7a955d5..cbef044 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -692,8 +692,8 @@ static WebHTMLView *lastHitView = nil;
 
 - (void)_handleAutoscrollForMouseDragged:(NSEvent *)event
 {
-    // FIXME: this really needs to be based on a timer
     [self autoscroll:event];
+    [self _startAutoscrollTimer:event];
 }
 
 - (BOOL)_mayStartDragWithMouseDragged:(NSEvent *)mouseDraggedEvent
@@ -1444,7 +1444,6 @@ static WebHTMLView *lastHitView = nil;
     }
     
     _private->ignoringMouseDraggedEvents = NO;
-    [self _startAutoscrollTimer:event];
     
     // Record the mouse down position so we can determine drag hysteresis.
     [_private->mouseDownEvent release];
@@ -1453,7 +1452,8 @@ static WebHTMLView *lastHitView = nil;
     // Don't do any mouseover while the mouse is down.
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_updateMouseoverWithFakeEvent) object:nil];
 
-    // Let KHTML get a chance to deal with the event.
+    // Let KHTML get a chance to deal with the event. This will call back to us
+    // to start the autoscroll timer if appropriate.
     [[self _bridge] mouseDown:event];
 }
 

-- 
WebKit Debian packaging