[webkit-changes] [121665] trunk/Source/WebKit2

Mon, 02 Jul 2012 02:31:32 -0700

Title: [121665] trunk/Source/WebKit2
Revision
121665
Author
[email protected]
Date
2012-07-02 02:31:11 -0700 (Mon, 02 Jul 2012)

Log Message

Unreviewed, rolling out r120329, r121113, and r121138.
http://trac.webkit.org/changeset/120329
http://trac.webkit.org/changeset/121113
http://trac.webkit.org/changeset/121138
https://bugs.webkit.org/show_bug.cgi?id=90368

Introduced noticeable keyboard-related spins due to
synchronous IPC. (Requested by kling on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-07-02

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::handleKeyboardEvent):
(WebKit::WebPageProxy::didReceiveEvent):
* UIProcess/WebPageProxy.h:
(WebPageProxy):
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::keyEvent):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (121664 => 121665)


--- trunk/Source/WebKit2/ChangeLog	2012-07-02 09:07:56 UTC (rev 121664)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-02 09:31:11 UTC (rev 121665)
@@ -1,3 +1,23 @@
+2012-07-02  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r120329, r121113, and r121138.
+        http://trac.webkit.org/changeset/120329
+        http://trac.webkit.org/changeset/121113
+        http://trac.webkit.org/changeset/121138
+        https://bugs.webkit.org/show_bug.cgi?id=90368
+
+        Introduced noticeable keyboard-related spins due to
+        synchronous IPC. (Requested by kling on #webkit).
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::handleKeyboardEvent):
+        (WebKit::WebPageProxy::didReceiveEvent):
+        * UIProcess/WebPageProxy.h:
+        (WebPageProxy):
+        * UIProcess/WebPageProxy.messages.in:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::keyEvent):
+
 2012-07-01  Christophe Dumez  <[email protected]>
 
         [EFL][WK2] Add API to inspect a Web Intent

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (121664 => 121665)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-07-02 09:07:56 UTC (rev 121664)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2012-07-02 09:31:11 UTC (rev 121665)
@@ -1135,7 +1135,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);
 }
@@ -3159,42 +3159,6 @@
     m_pageClient->setCursorHiddenUntilMouseMoves(hiddenUntilMouseMoves);
 }
 
-void WebPageProxy::didReceiveKeyEvent(uint32_t opaqueType, bool handled)
-{
-    process()->responsivenessTimer()->stop();
-
-    WebEvent::Type type = static_cast<WebEvent::Type>(opaqueType);
-
-    switch (type) {
-    case WebEvent::KeyDown:
-    case WebEvent::KeyUp:
-    case WebEvent::RawKeyDown:
-    case WebEvent::Char: {
-        LOG(KeyHandling, "WebPageProxy::didReceiveKeyEvent: %s", webKeyboardEventTypeString(type));
-
-        NativeWebKeyboardEvent event = m_keyEventQueue.first();
-        MESSAGE_CHECK(type == event.type());
-
-        m_keyEventQueue.removeFirst();
-
-        m_pageClient->doneWithKeyEvent(event, handled);
-
-        if (handled)
-            break;
-
-        if (m_uiClient.implementsDidNotHandleKeyEvent())
-            m_uiClient.didNotHandleKeyEvent(this, event);
-#if PLATFORM(WIN)
-        else
-            ::TranslateMessage(event.nativeEvent());
-#endif
-        break;
-    }
-    default:
-        ASSERT_NOT_REACHED();
-    }
-}
-
 void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
 {
     WebEvent::Type type = static_cast<WebEvent::Type>(opaqueType);
@@ -3207,6 +3171,10 @@
     case WebEvent::MouseDown:
     case WebEvent::MouseUp:
     case WebEvent::Wheel:
+    case WebEvent::KeyDown:
+    case WebEvent::KeyUp:
+    case WebEvent::RawKeyDown:
+    case WebEvent::Char:
 #if ENABLE(GESTURE_EVENTS)
     case WebEvent::GestureScrollBegin:
     case WebEvent::GestureScrollEnd:
@@ -3220,8 +3188,6 @@
 #endif
         process()->responsivenessTimer()->stop();
         break;
-    default:
-        ASSERT_NOT_REACHED();
     }
 
     switch (type) {
@@ -3266,6 +3232,30 @@
         break;
     }
 
+    case WebEvent::KeyDown:
+    case WebEvent::KeyUp:
+    case WebEvent::RawKeyDown:
+    case WebEvent::Char: {
+        LOG(KeyHandling, "WebPageProxy::didReceiveEvent: %s", webKeyboardEventTypeString(type));
+
+        NativeWebKeyboardEvent event = m_keyEventQueue.first();
+        MESSAGE_CHECK(type == event.type());
+
+        m_keyEventQueue.removeFirst();
+
+        m_pageClient->doneWithKeyEvent(event, handled);
+
+        if (handled)
+            break;
+
+        if (m_uiClient.implementsDidNotHandleKeyEvent())
+            m_uiClient.didNotHandleKeyEvent(this, event);
+#if PLATFORM(WIN)
+        else
+            ::TranslateMessage(event.nativeEvent());
+#endif
+        break;
+    }
 #if ENABLE(TOUCH_EVENTS)
     case WebEvent::TouchStart:
     case WebEvent::TouchMove:
@@ -3283,8 +3273,6 @@
         break;
     }
 #endif
-    default:
-        ASSERT_NOT_REACHED();
     }
 }

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (121664 => 121665)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-07-02 09:07:56 UTC (rev 121664)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h	2012-07-02 09:31:11 UTC (rev 121665)
@@ -917,7 +917,6 @@
     void setCursorHiddenUntilMouseMoves(bool);
 
     void didReceiveEvent(uint32_t opaqueType, bool handled);
-    void didReceiveKeyEvent(uint32_t opaqueType, bool handled);
     void stopResponsivenessTimer();
 
     void voidCallback(uint64_t);

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (121664 => 121665)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-07-02 09:07:56 UTC (rev 121664)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in	2012-07-02 09:31:11 UTC (rev 121665)
@@ -33,7 +33,6 @@
     UnavailablePluginButtonClicked(uint32_t pluginUnavailabilityReason, WTF::String mimeType, WTF::String url, WTF::String pluginsPageURL)
     DidChangeViewportProperties(WebCore::ViewportAttributes attributes)
     DidReceiveEvent(uint32_t type, bool handled)
-    DidReceiveKeyEvent(uint32_t type, bool handled) -> ()
     StopResponsivenessTimer()
     SetCursor(WebCore::Cursor cursor)
     SetCursorHiddenUntilMouseMoves(bool hiddenUntilMouseMoves)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (121664 => 121665)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-07-02 09:07:56 UTC (rev 121664)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2012-07-02 09:31:11 UTC (rev 121665)
@@ -1439,7 +1439,7 @@
     if (!handled)
         handled = performDefaultBehaviorForKeyEvent(keyboardEvent);
 
-    sendSync(Messages::WebPageProxy::DidReceiveKeyEvent(static_cast<uint32_t>(keyboardEvent.type()), handled), Messages::WebPageProxy::DidReceiveKeyEvent::Reply());
+    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