Unreviewed, rolling out r112954 and r112969.
authorapavlov@chromium.org <apavlov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Apr 2012 09:57:19 +0000 (09:57 +0000)
committerapavlov@chromium.org <apavlov@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Apr 2012 09:57:19 +0000 (09:57 +0000)
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

Source/WebCore:

* page/DragController.cpp:
(WebCore::DragController::performDrag):

LayoutTests:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@113004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/events/drag-dataTransferItemList.html
LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt [deleted file]
LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html [deleted file]
LayoutTests/http/tests/security/clipboard/clipboard-file-access.html
Source/WebCore/ChangeLog
Source/WebCore/page/DragController.cpp

index ccea7e7..dcdbf1d 100644 (file)
@@ -1,3 +1,18 @@
+2012-04-03  Alexander Pavlov  <apavlov@chromium.org>
+
+        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  <nzimmermann@rim.com>
 
         Enable animVal support for SVGAnimatedEnumeration
index 17f0855..bc332e9 100644 (file)
@@ -131,7 +131,6 @@ function drop(event)
         legacyDrop(event.dataTransfer);
     else if (dropMethod.selectedIndex == 1)
         itemListDrop(event.dataTransfer);
-    event.preventDefault();
 }
 
 function runTest(dragMethodIndex, dropMethodIndex)
diff --git a/LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt b/LayoutTests/fast/events/drop-handler-should-not-stop-navigate-expected.txt
deleted file mode 100644 (file)
index b311908..0000000
+++ /dev/null
@@ -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
diff --git a/LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html b/LayoutTests/fast/events/drop-handler-should-not-stop-navigate.html
deleted file mode 100644 (file)
index 9b5889d..0000000
+++ /dev/null
@@ -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>
index 1d23d59..9801223 100644 (file)
@@ -55,7 +55,7 @@ dragTarget.addEventListener("drop", function() {
 // 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();
 });
 
index 128efea..2150c93 100644 (file)
@@ -1,3 +1,16 @@
+2012-04-03  Alexander Pavlov  <apavlov@chromium.org>
+
+        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  <nzimmermann@rim.com>
 
         Enable animVal support for SVGAnimatedEnumeration
index 3ed90b1..dfeb529 100644 (file)
@@ -212,7 +212,7 @@ bool DragController::performDrag(DragData* dragData)
             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;
         }