Changeset 96557 in webkit

Timestamp:

Oct 3, 2011 4:54:26 PM (13 years ago)

Author:

jamesr@google.com

Message:

[chromium] Tweak WebCompositor API for input event handling to express three possible states
​https://bugs.webkit.org/show_bug.cgi?id=69304

Reviewed by Darin Fisher.

• public/WebCompositorClient.h:
• src/WebCompositorImpl.cpp:

(WebKit::WebCompositorImpl::~WebCompositorImpl):
(WebKit::WebCompositorImpl::handleInputEvent):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebCompositorClient.h (modified) (1 diff)
• src/WebCompositorImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-10-03  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Tweak WebCompositor API for input event handling to express three possible states
+        https://bugs.webkit.org/show_bug.cgi?id=69304
+
+        Reviewed by Darin Fisher.
+
+        * public/WebCompositorClient.h:
+        * src/WebCompositorImpl.cpp:
+        (WebKit::WebCompositorImpl::~WebCompositorImpl):
+        (WebKit::WebCompositorImpl::handleInputEvent):
+
 2011-10-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/chromium/public/WebCompositorClient.h

@@ -33 +33 @@
     // Callbacks invoked from the compositor thread.
     virtual void willShutdown() = 0;
-    virtual void didHandleInputEvent(bool processed) = 0;
+
+    // Exactly one of the following two callbacks will be invoked after every call to WebCompositor::handleInputEvent():
+
+    // Called when the WebCompositor handled the input event and no further processing is required.
+    virtual void didHandleInputEvent() = 0;
+
+    // Called when the WebCompositor did not handle the input event. If sendToWidget is true, the input event
+    // should be forwarded to the WebWidget associated with this compositor for further processing.
+    virtual void didNotHandleInputEvent(bool sendToWidget) = 0;
 
 protected:

trunk/Source/WebKit/chromium/src/WebCompositorImpl.cpp

@@ -90 +90 @@
 WebCompositorImpl::~WebCompositorImpl()
 {
+    if (m_client)
+        m_client->willShutdown();
+
     ASSERT(s_compositorsLock);
     MutexLocker lock(*s_compositorsLock);
@@ -111 +114 @@
     ASSERT(CCProxy::isImplThread());
     // FIXME: Do something interesting with the event here.
-    m_client->didHandleInputEvent(false);
+    m_client->didNotHandleInputEvent(true /* sendToWidget */);
 }