Title: [176728] trunk
- Revision
- 176728
- Author
- [email protected]
- Date
- 2014-12-03 11:08:53 -0800 (Wed, 03 Dec 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (176727 => 176728)
--- trunk/LayoutTests/ChangeLog 2014-12-03 18:56:41 UTC (rev 176727)
+++ trunk/LayoutTests/ChangeLog 2014-12-03 19:08:53 UTC (rev 176728)
@@ -1,3 +1,12 @@
+2014-12-03 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Gardening: updating some tests as skips instead of crashes.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (176727 => 176728)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2014-12-03 18:56:41 UTC (rev 176727)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2014-12-03 19:08:53 UTC (rev 176728)
@@ -223,15 +223,6 @@
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
########################################
Modified: trunk/Source/WebKit2/ChangeLog (176727 => 176728)
--- trunk/Source/WebKit2/ChangeLog 2014-12-03 18:56:41 UTC (rev 176727)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-03 19:08:53 UTC (rev 176728)
@@ -1,3 +1,14 @@
+2014-12-03 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
[GTK] outdated comment
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (176727 => 176728)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-03 18:56:41 UTC (rev 176727)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-03 19:08:53 UTC (rev 176728)
@@ -1955,6 +1955,11 @@
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)
if (!handled && m_headerBanner)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
