Diff
Modified: trunk/LayoutTests/ChangeLog (113003 => 113004)
--- trunk/LayoutTests/ChangeLog 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/LayoutTests/ChangeLog 2012-04-03 09:57:19 UTC (rev 113004)
@@ -1,3 +1,18 @@
+2012-04-03 Alexander Pavlov <[email protected]>
+
+ Unreviewed, rolling out r112954 and r112969.
+ http://trac.webkit.org/changeset/112954
+ http://trac.webkit.org/changeset/112969
+ https://bugs.webkit.org/show_bug.cgi?id=79172
+
+ Hits "ASSERTION FAILED: !m_isHandlingDrag" in DnD-related
+ tests on Debug bots
+
+ * fast/events/drag-dataTransferItemList.html:
+ * fast/events/drop-handler-should-not-stop-navigate-expected.txt: Removed.
+ * fast/events/drop-handler-should-not-stop-navigate.html: Removed.
+ * http/tests/security/clipboard/clipboard-file-access.html:
+
2012-04-03 Nikolas Zimmermann <[email protected]>
Enable animVal support for SVGAnimatedEnumeration
Modified: trunk/LayoutTests/fast/events/drag-dataTransferItemList.html (113003 => 113004)
--- trunk/LayoutTests/fast/events/drag-dataTransferItemList.html 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/LayoutTests/fast/events/drag-dataTransferItemList.html 2012-04-03 09:57:19 UTC (rev 113004)
@@ -131,7 +131,6 @@
legacyDrop(event.dataTransfer);
else if (dropMethod.selectedIndex == 1)
itemListDrop(event.dataTransfer);
- event.preventDefault();
}
function runTest(dragMethodIndex, dropMethodIndex)
Deleted: trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt (113003 => 113004)
--- trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt 2012-04-03 09:57:19 UTC (rev 113004)
@@ -1,7 +0,0 @@
-This tests that a drop handler's default action must be prevented in order to stop navigation. Otherwise, if event.preventDefault() is not called, navigation should occur. To test manually, simply drag and drop another link or HTML file on this page. If navigation occurs, then the test passed.
-
-Starting test
-Cancelling dragenter
-Cancelling dragover
-Not preventing default event on drop.
-PASS
Deleted: trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html (113003 => 113004)
--- trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html 2012-04-03 09:57:19 UTC (rev 113004)
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div>This tests that a drop handler's default action must be prevented in order to stop navigation.
-Otherwise, if event.preventDefault() is not called, navigation should occur. To test manually,
-simply drag and drop another link or HTML file on this page. If navigation occurs, then the test
-passed.</div>
-<script>
-function log(text)
-{
- document.body.appendChild(document.createElement('br'));
- document.body.appendChild(document.createElement('div').appendChild(document.createTextNode(text)));
-}
-window.addEventListener('beforeunload', function ()
-{
- log('PASS');
- layoutTestController.notifyDone();
-});
-document.body.addEventListener('dragenter', function (event)
-{
- log('Cancelling dragenter');
- event.preventDefault();
-});
-document.body.addEventListener('dragover', function (event)
-{
- log('Cancelling dragover');
- event.preventDefault();
-});
-document.body.addEventListener('drop', function (event)
-{
- log('Not preventing default event on drop.');
-});
-(function ()
-{
- if (!window.layoutTestController)
- return;
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- log('Starting test');
- eventSender.beginDragWithFiles(['DRTFakeFile']);
- eventSender.mouseMoveTo(document.body.offsetLeft + 10, document.body.offsetTop + 10);
- eventSender.mouseUp();
- log('FAIL');
- layoutTestController.notifyDone();
-})();
-</script>
-</body>
-</html>
Modified: trunk/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html (113003 => 113004)
--- trunk/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html 2012-04-03 09:57:19 UTC (rev 113004)
@@ -55,7 +55,7 @@
// Some tests don't end up dropping the draggee over the drag target. Catch any
// leftover drop events bubbling up through the tree so they don't cause page
// navigation.
-document.body.addEventListener("drop", function() {
+document.body.addEventListener("dragover", function() {
event.preventDefault();
});
Modified: trunk/Source/WebCore/ChangeLog (113003 => 113004)
--- trunk/Source/WebCore/ChangeLog 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/Source/WebCore/ChangeLog 2012-04-03 09:57:19 UTC (rev 113004)
@@ -1,3 +1,16 @@
+2012-04-03 Alexander Pavlov <[email protected]>
+
+ Unreviewed, rolling out r112954 and r112969.
+ http://trac.webkit.org/changeset/112954
+ http://trac.webkit.org/changeset/112969
+ https://bugs.webkit.org/show_bug.cgi?id=79172
+
+ Hits "ASSERTION FAILED: !m_isHandlingDrag" in DnD-related
+ tests on Debug bots
+
+ * page/DragController.cpp:
+ (WebCore::DragController::performDrag):
+
2012-04-03 Nikolas Zimmermann <[email protected]>
Enable animVal support for SVGAnimatedEnumeration
Modified: trunk/Source/WebCore/page/DragController.cpp (113003 => 113004)
--- trunk/Source/WebCore/page/DragController.cpp 2012-04-03 09:39:17 UTC (rev 113003)
+++ trunk/Source/WebCore/page/DragController.cpp 2012-04-03 09:57:19 UTC (rev 113004)
@@ -212,7 +212,7 @@
preventedDefault = mainFrame->eventHandler()->performDragAndDrop(createMouseEvent(dragData), clipboard.get());
clipboard->setAccessPolicy(ClipboardNumb); // Invalidate clipboard here for security
}
- if (preventedDefault) {
+ if (m_isHandlingDrag || preventedDefault) {
m_documentUnderMouse = 0;
return true;
}
