[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
morrita at google.com
morrita at google.com
Wed Dec 22 11:42:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c56fc40285c743af7ae728109aa030ef82683f1c
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 4 12:38:33 2010 +0000
2010-08-03 MORITA Hajime <morrita at 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 at 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
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64643 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 26b805e..d99245d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-03 MORITA Hajime <morrita at 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 at google.com>
Unreviewed build fix.
diff --git a/LayoutTests/fast/dom/beforeload/image-object-before-load-expected.txt b/LayoutTests/fast/events/dragging-mouse-moves-expected.txt
similarity index 100%
copy from LayoutTests/fast/dom/beforeload/image-object-before-load-expected.txt
copy to LayoutTests/fast/events/dragging-mouse-moves-expected.txt
diff --git a/LayoutTests/fast/events/dragging-mouse-moves.html b/LayoutTests/fast/events/dragging-mouse-moves.html
new file mode 100644
index 0000000..4171412
--- /dev/null
+++ b/LayoutTests/fast/events/dragging-mouse-moves.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+ <head>
+ <style> * { margin: 0px; padding: 0px; } </style>
+ <script>
+function log(msg)
+{
+ document.getElementById('console').appendChild(document.createTextNode(msg + '\n'));
+}
+
+function test()
+{
+ if (window.layoutTestController) {
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
+ testDragAndMove();
+ } else
+ log("layoutTestController is not available");
+
+}
+
+function testDragAndMove()
+{
+ var draggable = document.getElementById("draggableForDiv");
+
+ var startX = draggable.offsetLeft + 5;
+ var startY = draggable.offsetTop + 5;
+
+ eventSender.dragMode = false;
+
+ // Grab the draggable node
+ eventSender.mouseMoveTo(startX,startY);
+ eventSender.mouseDown();
+ // Then drag it. OK not to crash.
+ eventSender.mouseMoveTo(startX + 10, startY + 10);
+ eventSender.mouseMoveTo(startX + 20, startY + 20);
+ eventSender.mouseUp();
+ document.getElementById("test").style.display = "none";
+ log("PASS");
+ layoutTestController.notifyDone();
+ }
+ </script>
+ </head>
+<body onload="test()">
+ <div id="test">
+ <p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=41695">Bug 41695</a>. It is OK not to crash</p>
+ <b draggable="true" id="draggableForDiv">dragme</b>
+ </div>
+ <pre id="console"></pre>
+</body>
+</html>
+
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e8b6568..ebbf08b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-03 MORITA Hajime <morrita at 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 at google.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebKitTools/DumpRenderTree/mac/EventSendingController.mm b/WebKitTools/DumpRenderTree/mac/EventSendingController.mm
index 77999bd..9031c63 100644
--- a/WebKitTools/DumpRenderTree/mac/EventSendingController.mm
+++ b/WebKitTools/DumpRenderTree/mac/EventSendingController.mm
@@ -449,13 +449,13 @@ static int buildModifierFlags(const WebScriptObject* modifiers)
NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
if (subView) {
if (leftMouseButtonDown) {
- [subView mouseDragged:event];
if (draggingInfo) {
// Per NSDragging.h: draggingSources may not implement draggedImage:movedTo:
if ([[draggingInfo draggingSource] respondsToSelector:@selector(draggedImage:movedTo:)])
[[draggingInfo draggingSource] draggedImage:[draggingInfo draggedImage] movedTo:lastMousePosition];
[[mainFrame webView] draggingUpdated:draggingInfo];
- }
+ } else
+ [subView mouseDragged:event];
} else
[subView mouseMoved:event];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list