Title: [121637] branches/safari-536-branch/Source/WebKit2
Diff
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (121636 => 121637)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-07-01 21:30:26 UTC (rev 121636)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-07-01 22:34:57 UTC (rev 121637)
@@ -1,5 +1,10 @@
2012-06-25 Lucas Forschler <[email protected]>
+ Rollout 121168 from branch.
+ This is 121138 from trunk.
+
+2012-06-25 Lucas Forschler <[email protected]>
+
Merge 121138
2012-06-24 Andreas Kling <[email protected]>
Modified: branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (121636 => 121637)
--- branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-07-01 21:30:26 UTC (rev 121636)
+++ branches/safari-536-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-07-01 22:34:57 UTC (rev 121637)
@@ -1115,7 +1115,7 @@
if (m_shouldSendEventsSynchronously) {
bool handled = false;
process()->sendSync(Messages::WebPage::KeyEventSyncForTesting(event), Messages::WebPage::KeyEventSyncForTesting::Reply(handled), m_pageID);
- didReceiveKeyEvent(event.type(), handled);
+ didReceiveEvent(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::didReceiveKeyEvent: %s", webKeyboardEventTypeString(type));
+ LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %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
