Changeset 176728 in webkit

Timestamp:

Dec 3, 2014 11:08:53 AM (9 years ago)

Author:

mitz@apple.com

Message:

REGRESSION(r176687): Caused webkit2 test assertion failure crashes in WebKit::WebPage::willStartDrag()
​https://bugs.webkit.org/show_bug.cgi?id=139224

Reviewed by Alexey Proskuryakov.

Source/WebKit2:

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mouseEventSyncForTesting): Wait for the UI process to start dragging if
needed before handling the event.

LayoutTests:

• platform/wk2/TestExpectations: Unskip the tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-12-03  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION(r176687): Caused webkit2 test assertion failure crashes in WebKit::WebPage::willStartDrag()
+        https://bugs.webkit.org/show_bug.cgi?id=139224
+
+        Reviewed by Alexey Proskuryakov.
+
+        * platform/wk2/TestExpectations: Unskip the tests.
+
 2014-12-03  Mark Lam  <mark.lam@apple.com>
 

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -223 +223 @@
 
 webkit.org/b/132297 svg/custom/bug79798.html [ Skip ]
-
-# These tests started crashing with assertion failures only on debug builds after r176687:
-webkit.org/b/139224 [ Debug ] fast/events/clear-drag-state.html  [ Skip ]
-webkit.org/b/139224 [ Debug ] fast/css/user-drag-none.html  [ Skip ]
-webkit.org/b/139224 [ Debug ] editing/pasteboard/dataTransfer-setData-getData.html [ Skip ]
-webkit.org/b/139224 [ Debug ] editing/pasteboard/drop-text-events-sideeffect-crash.html [ Skip ]
-webkit.org/b/139224 [ Debug ] editing/pasteboard/drag-drop-iframe-refresh-crash.html [ Skip ]
-webkit.org/b/139224 [ Debug ] editing/pasteboard/drop-text-events-sideeffect.html [ Skip ]
-webkit.org/b/139224 [ Debug ] editing/selection/user-drag-element-and-user-select-none.html [ Skip ]
 
 ### END OF (1) Classified failures with bug reports

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-03  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION(r176687): Caused webkit2 test assertion failure crashes in WebKit::WebPage::willStartDrag()
+        https://bugs.webkit.org/show_bug.cgi?id=139224
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::mouseEventSyncForTesting): Wait for the UI process to start dragging if
+        needed before handling the event.
+
 2014-12-03  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1956 +1956 @@
 void WebPage::mouseEventSyncForTesting(const WebMouseEvent& mouseEvent, bool& handled)
 {
+#if ENABLE(DRAG_SUPPORT)
+    if (m_isStartingDrag)
+        messageSenderConnection()->waitForAndDispatchImmediately<Messages::WebPage::DidStartDrag>(messageSenderDestinationID(), std::chrono::seconds(60));
+#endif
+
     handled = false;
 #if !PLATFORM(IOS)