Title: [121639] branches/safari-536-branch/Source/WebKit2
Revision
121639
Author
[email protected]
Date
2012-07-01 15:40:49 -0700 (Sun, 01 Jul 2012)

Log Message

Merged r120377

Modified Paths

Diff

Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (121638 => 121639)


--- branches/safari-536-branch/Source/WebKit2/ChangeLog	2012-07-01 22:37:19 UTC (rev 121638)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog	2012-07-01 22:40:49 UTC (rev 121639)
@@ -1,5 +1,10 @@
 2012-06-25  Lucas Forschler  <[email protected]>
 
+    Rollout 120377 from branch.
+    This was 120329 on trunk.
+
+2012-06-25  Lucas Forschler  <[email protected]>
+
     Rollout 121167 from branch.
     This is 121113 on trunk.
 

Modified: branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (121638 => 121639)


--- branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-07-01 22:37:19 UTC (rev 121638)
+++ branches/safari-536-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-07-01 22:40:49 UTC (rev 121639)
@@ -1411,9 +1411,7 @@
     if (!handled)
         handled = performDefaultBehaviorForKeyEvent(keyboardEvent);
 
-    // The receiving end relies on DidReceiveEvent and InterpretQueuedKeyEvent arriving in the same order they are sent
-    // (for keyboard events.) We set the DispatchMessageEvenWhenWaitingForSyncReply flag to ensure consistent ordering.
-    connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled), m_pageID, CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
+    send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(keyboardEvent.type()), handled));
 }
 
 void WebPage::keyEventSyncForTesting(const WebKeyboardEvent& keyboardEvent, bool& handled)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to