Title: [153027] branches/safari-537-branch/Source/WebKit2
- Revision
- 153027
- Author
- [email protected]
- Date
- 2013-07-22 19:08:08 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r152984. <rdar://problem/14155030>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153026 => 153027)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-23 02:04:34 UTC (rev 153026)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-23 02:08:08 UTC (rev 153027)
@@ -1,5 +1,20 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r152984
+
+ 2013-07-22 Alexey Proskuryakov <[email protected]>
+
+ Frequent MESSAGE_CHECK failures in WebPageProxy::didReceiveEvent
+ https://bugs.webkit.org/show_bug.cgi?id=118976
+ <rdar://problem/14155030>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ Clear m_gestureEventQueue, just like we clear all other event queues here.
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152950
2013-07-21 Anders Carlsson <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (153026 => 153027)
--- branches/safari-537-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-07-23 02:04:34 UTC (rev 153026)
+++ branches/safari-537-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-07-23 02:08:08 UTC (rev 153027)
@@ -3936,8 +3936,10 @@
setViewNeedsDisplay(IntRect(IntPoint(), viewSize()));
// Can't expect DidReceiveEvent notifications from a crashed web process.
+#if ENABLE(GESTURE_EVENTS)
+ m_gestureEventQueue.clear();
+#endif
m_keyEventQueue.clear();
-
m_wheelEventQueue.clear();
m_currentlyProcessedWheelEvents.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes