Title: [121168] branches/safari-536-branch/Source/WebKit2
- Revision
- 121168
- Author
- [email protected]
- Date
- 2012-06-25 10:43:36 -0700 (Mon, 25 Jun 2012)
Log Message
Merged r121138 -> <rdar://problem/11686974>
Modified Paths
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (121167 => 121168)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-25 17:41:53 UTC (rev 121167)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-06-25 17:43:36 UTC (rev 121168)
@@ -1,5 +1,22 @@
2012-06-25 Lucas Forschler <[email protected]>
+ Merge 121138
+
+ 2012-06-24 Andreas Kling <[email protected]>
+
+ REGRESSION(r120329): Intermittent WebProcess shutdowns due to out-of-line DidReceiveEvent messages.
+ <rdar://problem/11686974>
+ <http://webkit.org/b/89659>
+
+ Unreviewed tests assertion fix, handleKeyboardEvent() should call didReceiveKeyEvent()
+ rather than didReceiveEvent().
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::handleKeyboardEvent):
+ (WebKit::WebPageProxy::didReceiveKeyEvent):
+
+2012-06-25 Lucas Forschler <[email protected]>
+
Merge 121113
2012-06-24 Andreas Kling <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (121167 => 121168)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-06-25 17:41:53 UTC (rev 121167)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-06-25 17:43:36 UTC (rev 121168)
@@ -1115,7 +1115,7 @@
if (m_shouldSendEventsSynchronously) {
bool handled = false;
process()->sendSync(Messages::WebPage::KeyEventSyncForTesting(event), Messages::WebPage::KeyEventSyncForTesting::Reply(handled), m_pageID);
- didReceiveEvent(event.type(), handled);
+ didReceiveKeyEvent(event.type(), handled);
} else
process()->send(Messages::WebPage::KeyEvent(event), m_pageID);
}
@@ -3074,7 +3074,7 @@
case WebEvent::KeyUp:
case WebEvent::RawKeyDown:
case WebEvent::Char: {
- LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
+ LOG(KeyHandling, "WebPageProxy::didReceiveKeyEvent: %s", webKeyboardEventTypeString(type));
NativeWebKeyboardEvent event = m_keyEventQueue.first();
MESSAGE_CHECK(type == event.type());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
