Changeset 121665 in webkit

Timestamp:

Jul 2, 2012 2:31:11 AM (12 years ago)

Author:

commit-queue@webkit.org

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 <​webkit.review.bot@gmail.com> 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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (6 diffs)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-02  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1136 +1136 @@
         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);
@@ -3160 +3160 @@
 }
 
-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)
 {
@@ -3208 +3172 @@
     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:
@@ -3221 +3189 @@
         process()->responsivenessTimer()->stop();
         break;
-    default:
-        ASSERT_NOT_REACHED();
     }
 
@@ -3267 +3233 @@
     }
 
+    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:
@@ -3284 +3274 @@
     }
 #endif
-    default:
-        ASSERT_NOT_REACHED();
     }
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -918 +918 @@
 
     void didReceiveEvent(uint32_t opaqueType, bool handled);
-    void didReceiveKeyEvent(uint32_t opaqueType, bool handled);
     void stopResponsivenessTimer();
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -34 +34 @@
     DidChangeViewportProperties(WebCore::ViewportAttributes attributes)
     DidReceiveEvent(uint32_t type, bool handled)
-    DidReceiveKeyEvent(uint32_t type, bool handled) -> ()
     StopResponsivenessTimer()
     SetCursor(WebCore::Cursor cursor)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1440 +1440 @@
         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));
 }