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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 318d219a59884b5d58308229304cffd32b2c5503
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 15 07:01:25 2004 +0000

    	3692690 - REGRESSION: canceling drag from WebView cause link to load
    	Just need to take extra care to cancel any click handling in
    	all cases once we're committed to doing the drag.
    
            Reviewed by Darin.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::khtmlMouseMoveEvent):  Call invalidateClick once
    	we're past the hysteresis point, and definitely going to try
    	to start a drag and drop.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6842 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a30ca0d..577eeeb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2004-06-14  Trey Matteson  <trey at apple.com>
+
+	3692690 - REGRESSION: canceling drag from WebView cause link to load
+	Just need to take extra care to cancel any click handling in
+	all cases once we're committed to doing the drag.
+
+        Reviewed by Darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::khtmlMouseMoveEvent):  Call invalidateClick once
+	we're past the hysteresis point, and definitely going to try
+	to start a drag and drop.
+
 2004-06-14  Darin Adler  <darin at apple.com>
 
         - fixed crash on boot
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index a15a908..de53d7b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1974,6 +1974,10 @@ void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
             
             NSPoint dragLocation = [_currentEvent locationInWindow];
             if (dragHysteresisExceeded(dragLocation.x, dragLocation.y)) {
+                
+                // Once we're past the hysteresis point, we don't want to treat this gesture as a click
+                d->m_view->invalidateClick();
+
                 NSImage *dragImage = nil;       // we use these values if WC is out of the loop
                 NSPoint dragLoc = NSZeroPoint;
                 NSDragOperation srcOp = NSDragOperationNone;                
@@ -2021,10 +2025,8 @@ void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
                 }
                 
                 if (_mouseDownMayStartDrag) {
-                    if ([_bridge startDraggingImage:dragImage at:dragLoc operation:srcOp event:_currentEvent sourceIsDHTML:_dragSrcIsDHTML DHTMLWroteData:wcWrotePasteboard]) {
-                        // Prevent click handling from taking place once we start dragging.
-                        d->m_view->invalidateClick();
-                    } else if (_dragSrcMayBeDHTML) {
+                    BOOL startedDrag = [_bridge startDraggingImage:dragImage at:dragLoc operation:srcOp event:_currentEvent sourceIsDHTML:_dragSrcIsDHTML DHTMLWroteData:wcWrotePasteboard];
+                    if (!startedDrag && _dragSrcMayBeDHTML) {
                         // WebKit canned the drag at the last minute - we owe _dragSrc a DRAGEND event
                         dispatchDragSrcEvent(EventImpl::DRAGEND_EVENT, QPoint(dragLocation));
                         _mouseDownMayStartDrag = false;

-- 
WebKit Debian packaging