Changeset 64643 in webkit

Timestamp:

Aug 4, 2010 5:38:33 AM (14 years ago)

Author:

morrita@google.com

Message:

2010-08-03 MORITA Hajime <​morrita@google.com>

Reviewed by Tony Chang.

[DRT] Assertion failed when drag and move a draggable element.
​https://bugs.webkit.org/show_bug.cgi?id=41695

• fast/events/dragging-mouse-moves-expected.txt: Added.
• fast/events/dragging-mouse-moves.html: Added.

2010-08-03 MORITA Hajime <​morrita@google.com>

Reviewed by Tony Chang.

[DRT] Assertion failed when drag and move a draggable element.
​https://bugs.webkit.org/show_bug.cgi?id=41695

mouseMoveToX() did call [WebHTMLView mouseDragged] even if dragging started.
But Cocoa doesn't call mouseDragged() until dragging is done.
Other part of DumpRenderTree also assumes Cocoa behavior and an assertion
on UIDelegate failed when mouseDragged() is called during dragging.
This change eliminated the mouseDragged() call when dragging begins,
which is implicated by draggingInfo instance.

• DumpRenderTree/mac/EventSendingController.mm: (-[EventSendingController mouseMoveToX:Y:]):

Test: fast/events/dragging-mouse-moves.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/dragging-mouse-moves-expected.txt (added)
• LayoutTests/fast/events/dragging-mouse-moves.html (added)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/EventSendingController.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-03  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Tony Chang.
+
+        [DRT] Assertion failed when drag and move a draggable element.
+        https://bugs.webkit.org/show_bug.cgi?id=41695
+
+        * fast/events/dragging-mouse-moves-expected.txt: Added.
+        * fast/events/dragging-mouse-moves.html: Added.
+
 2010-08-04  Steve Block  <steveblock@google.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-03  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Tony Chang.
+
+        [DRT] Assertion failed when drag and move a draggable element.
+        https://bugs.webkit.org/show_bug.cgi?id=41695
+
+        mouseMoveToX() did call [WebHTMLView mouseDragged] even if dragging started.
+        But Cocoa doesn't call mouseDragged() until dragging is done.
+        Other part of DumpRenderTree also assumes Cocoa behavior and an assertion
+        on UIDelegate failed when mouseDragged() is called during dragging.
+        This change eliminated the mouseDragged() call when dragging begins,
+        which is implicated by draggingInfo instance.
+        
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (-[EventSendingController mouseMoveToX:Y:]):
+
+        Test: fast/events/dragging-mouse-moves.html
+        
 2010-08-02  Steve Block  <steveblock@google.com>
 

trunk/WebKitTools/DumpRenderTree/mac/EventSendingController.mm

@@ -450 +450 @@
     if (subView) {
         if (leftMouseButtonDown) {
-            [subView mouseDragged:event];
             if (draggingInfo) {
                 // Per NSDragging.h: draggingSources may not implement draggedImage:movedTo:
@@ -456 +455 @@
                     [[draggingInfo draggingSource] draggedImage:[draggingInfo draggedImage] movedTo:lastMousePosition];
                 [[mainFrame webView] draggingUpdated:draggingInfo];
-            }
+            } else
+                [subView mouseDragged:event];
         } else
             [subView mouseMoved:event];