Changeset 90629 in webkit

Timestamp:

Jul 8, 2011 7:42:27 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

[WK2] Do not forward touch events to the web process when it does not need them
​https://bugs.webkit.org/show_bug.cgi?id=64164

Reviewed by Kenneth Rohde Christiansen.

Source/JavaScriptCore:

Add a convenience function to obtain a reference to the last element of a Deque.

• wtf/Deque.h:

(WTF::Deque::last):

Source/WebKit2:

The call to ChromeClient::needTouchEvent() is now forwarded to the WebPageProxy
to change the way events are delivered.

When the WebPage does not need touch events, and there is no queued touch events,
the incoming events just bounce back through PageClient::doneWithTouchEvent().

In the case when new events come to WebPageProxy and there are still touch events
incoming from the WebProcess, the new events are deferred with the corresponding
pending touch events.
Deferring the new events iafter the corresponding forwarded event ensure
the delivery is always done in order when PageClient::doneWithTouchEvent()
is called.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::handleTouchEvent):
(WebKit::WebPageProxy::needTouchEvents):
(WebKit::WebPageProxy::didReceiveEvent):
(WebKit::WebPageProxy::processDidCrash):

• UIProcess/WebPageProxy.h:

(WebKit::QueuedTouchEvents:::forwardedEvent):

• UIProcess/WebPageProxy.messages.in:
• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::needTouchEvents):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Deque.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• WebKit2/UIProcess/WebPageProxy.h (modified) (5 diffs)
• WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-08  Benjamin Poulain  <benjamin@webkit.org>
+
+        [WK2] Do not forward touch events to the web process when it does not need them
+        https://bugs.webkit.org/show_bug.cgi?id=64164
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add a convenience function to obtain a reference to the last element of a Deque.
+
+        * wtf/Deque.h:
+        (WTF::Deque::last):
+
 2011-07-07  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Deque.h

@@ -79 +79 @@
         PassType takeFirst();
 
+        T& last() { ASSERT(m_start != m_end); return *(--end()); }
+        const T& last() const { ASSERT(m_start != m_end); return *(--end()); }
+
         template<typename U> void append(const U&);
         template<typename U> void prepend(const U&);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-08  Benjamin Poulain  <benjamin@webkit.org>
+
+        [WK2] Do not forward touch events to the web process when it does not need them
+        https://bugs.webkit.org/show_bug.cgi?id=64164
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        The call to ChromeClient::needTouchEvent() is now forwarded to the WebPageProxy
+        to change the way events are delivered.
+
+        When the WebPage does not need touch events, and there is no queued touch events,
+        the incoming events just bounce back through PageClient::doneWithTouchEvent().
+
+        In the case when new events come to WebPageProxy and there are still touch events
+        incoming from the WebProcess, the new events are deferred with the corresponding
+        pending touch events.
+        Deferring the new events iafter the corresponding forwarded event ensure
+        the delivery is always done in order when PageClient::doneWithTouchEvent()
+        is called.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::handleTouchEvent):
+        (WebKit::WebPageProxy::needTouchEvents):
+        (WebKit::WebPageProxy::didReceiveEvent):
+        (WebKit::WebPageProxy::processDidCrash):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::QueuedTouchEvents:::forwardedEvent):
+        * UIProcess/WebPageProxy.messages.in:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::needTouchEvents):
+
 2011-07-08  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -171 +171 @@
     , m_syncNavigationActionPolicyDownloadID(0)
     , m_processingMouseMoveEvent(false)
+#if ENABLE(TOUCH_EVENTS)
+    , m_needTouchEvents(false)
+#endif
     , m_pageID(pageID)
 #if PLATFORM(MAC)
@@ -978 +981 @@
         return;
 
-    m_touchEventQueue.append(event);
-    process()->responsivenessTimer()->start();
-    process()->send(Messages::WebPage::TouchEvent(event), m_pageID); 
+    if (m_needTouchEvents) {
+        m_touchEventQueue.append(event);
+        process()->responsivenessTimer()->start();
+        process()->send(Messages::WebPage::TouchEvent(event), m_pageID);
+    } else {
+        if (m_touchEventQueue.isEmpty()) {
+            bool isEventHandled = false;
+            m_pageClient->doneWithTouchEvent(event, isEventHandled);
+        } else {
+            // We attach the incoming events to the newest queued event so that all
+            // the events are delivered in the correct order when the event is dequed.
+            QueuedTouchEvents& lastEvent = m_touchEventQueue.last();
+            lastEvent.deferredTouchEvents.append(event);
+        }
+    }
 }
 #endif
@@ -2188 +2203 @@
 
     process()->send(Messages::WebPage::FindZoomableAreaForPoint(point), m_pageID);
+}
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+void WebPageProxy::needTouchEvents(bool needTouchEvents)
+{
+    m_needTouchEvents = needTouchEvents;
 }
 #endif
@@ -2794 +2816 @@
     case WebEvent::TouchEnd:
     case WebEvent::TouchCancel: {
-        NativeWebTouchEvent event = m_touchEventQueue.first();
-        MESSAGE_CHECK(type == event.type());
+        QueuedTouchEvents queuedEvents = m_touchEventQueue.first();
+        MESSAGE_CHECK(type == queuedEvents.forwardedEvent.type());
         m_touchEventQueue.removeFirst();
 
-        m_pageClient->doneWithTouchEvent(event, handled);
+        m_pageClient->doneWithTouchEvent(queuedEvents.forwardedEvent, handled);
+        for (size_t i = 0; i < queuedEvents.deferredTouchEvents.size(); ++i) {
+            bool isEventHandled = false;
+            m_pageClient->doneWithTouchEvent(queuedEvents.deferredTouchEvents.at(i), isEventHandled);
+        }
         break;
     }
@@ -3003 +3029 @@
 
     m_processingMouseMoveEvent = false;
+
+#if ENABLE(TOUCH_EVENTS)
+    m_needTouchEvents = false;
+    m_touchEventQueue.clear();
+#endif
 
 #if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -62 +62 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
+#include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 #if PLATFORM(EFL)
@@ -132 +133 @@
 typedef GenericCallback<WKStringRef, StringImpl*> StringCallback;
 typedef GenericCallback<WKSerializedScriptValueRef, WebSerializedScriptValue*> ScriptValueCallback;
+
+#if ENABLE(TOUCH_EVENTS)
+struct QueuedTouchEvents {
+    QueuedTouchEvents(const NativeWebTouchEvent& event)
+        : forwardedEvent(event)
+    {
+    }
+    NativeWebTouchEvent forwardedEvent;
+    Vector<NativeWebTouchEvent> deferredTouchEvents;
+};
+#endif
 
 // FIXME: Make a version of CallbackBase with three arguments, and define ValidateCommandCallback as a specialization.
@@ -652 +664 @@
     void didFindZoomableArea(const WebCore::IntRect&);
 #endif
+#if ENABLE(TOUCH_EVENTS)
+    void needTouchEvents(bool);
+#endif
 
     void editorStateChanged(const EditorState&);
@@ -870 +885 @@
 
     Deque<NativeWebKeyboardEvent> m_keyEventQueue;
-#if ENABLE(TOUCH_EVENTS)
-    Deque<NativeWebTouchEvent> m_touchEventQueue;
-#endif
     Deque<NativeWebWheelEvent> m_wheelEventQueue;
     Vector<NativeWebWheelEvent> m_currentlyProcessedWheelEvents;
@@ -879 +891 @@
     OwnPtr<NativeWebMouseEvent> m_nextMouseMoveEvent;
     OwnPtr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
+
+#if ENABLE(TOUCH_EVENTS)
+    bool m_needTouchEvents;
+    Deque<QueuedTouchEvents> m_touchEventQueue;
+#endif
 
     uint64_t m_pageID;

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

@@ -74 +74 @@
     DidFindZoomableArea(WebCore::IntRect area)
 #endif
+#if ENABLE(TOUCH_EVENTS)
+    NeedTouchEvents(bool needTouchEvents)
+#endif
 
     # Policy messages

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -730 +730 @@
 
 #if ENABLE(TOUCH_EVENTS)
-void WebChromeClient::needTouchEvents(bool)
-{
+void WebChromeClient::needTouchEvents(bool needTouchEvents)
+{
+    m_page->send(Messages::WebPageProxy::NeedTouchEvents(needTouchEvents));
 }
 #endif