Changeset 98778 in webkit

Timestamp:

Oct 28, 2011, 4:30:07 PM (15 years ago)

Author:

jamesr@google.com

Message:

[chromium] Track wheel event handler registration and pass to input filter
​https://bugs.webkit.org/show_bug.cgi?id=71078

Reviewed by Kenneth Russell.

Source/WebCore:

This propagates mouse wheel registration notifications to the compositor input filter. If there are any handlers
registered, which includes JS handlers and scrollable areas other than the main view, the input filter will pass
mouse wheel events to the widget. Otherwise when threaded compositing is enabled the input filter translates
wheel events into root layer scrolling.

Only changes behavior with an off-by-default flag enabled, so no tests.

• platform/graphics/chromium/cc/CCLayerTreeHost.cpp:

(WebCore::CCLayerTreeHost::CCLayerTreeHost):
(WebCore::CCLayerTreeHost::finishCommitOnImplThread):
(WebCore::CCLayerTreeHost::setHaveWheelEventHandlers):

• platform/graphics/chromium/cc/CCLayerTreeHost.h:
• platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:

(WebCore::CCLayerTreeHostImpl::CCLayerTreeHostImpl):
(WebCore::CCLayerTreeHostImpl::haveWheelEventHandlers):

• platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:

(WebCore::CCLayerTreeHostImpl::setHaveWheelEventHandlers):

• platform/graphics/chromium/cc/CCScrollController.h:

Source/WebKit/chromium:

Pushes mouse wheel event handler notifications to CCLayerTreeHost when compositing.

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::numWheelEventHandlersChanged):

• src/WebCompositorImpl.cpp:

(WebKit::WebCompositorImpl::handleInputEvent):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::numberOfWheelEventHandlersChanged):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

• src/WebViewImpl.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (modified) (3 diffs)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (modified) (3 diffs)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (modified) (3 diffs)
• WebCore/platform/graphics/chromium/cc/CCScrollController.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebCompositorImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebViewImpl.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Track wheel event handler registration and pass to input filter
+        https://bugs.webkit.org/show_bug.cgi?id=71078
+
+        Reviewed by Kenneth Russell.
+
+        This propagates mouse wheel registration notifications to the compositor input filter. If there are any handlers
+        registered, which includes JS handlers and scrollable areas other than the main view, the input filter will pass
+        mouse wheel events to the widget. Otherwise when threaded compositing is enabled the input filter translates
+        wheel events into root layer scrolling.
+
+        Only changes behavior with an off-by-default flag enabled, so no tests.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::CCLayerTreeHost):
+        (WebCore::CCLayerTreeHost::finishCommitOnImplThread):
+        (WebCore::CCLayerTreeHost::setHaveWheelEventHandlers):
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::CCLayerTreeHostImpl):
+        (WebCore::CCLayerTreeHostImpl::haveWheelEventHandlers):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+        (WebCore::CCLayerTreeHostImpl::setHaveWheelEventHandlers):
+        * platform/graphics/chromium/cc/CCScrollController.h:
+
 2011-10-28  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

@@ -57 +57 @@
     , m_settings(settings)
     , m_visible(true)
+    , m_haveWheelEventHandlers(false)
 {
     CCMainThread::initialize();
@@ -129 +130 @@
     hostImpl->setSourceFrameNumber(frameNumber());
     hostImpl->setVisible(m_visible);
+    hostImpl->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
     hostImpl->setZoomAnimatorTransform(m_zoomAnimatorTransform);
     hostImpl->setViewport(viewportSize());
@@ -236 +238 @@
     }
 }
+
+void CCLayerTreeHost::setHaveWheelEventHandlers(bool haveWheelEventHandlers)
+{
+    if (m_haveWheelEventHandlers == haveWheelEventHandlers)
+        return;
+    m_haveWheelEventHandlers = haveWheelEventHandlers;
+    m_proxy->setNeedsCommit();
+}
+
 
 void CCLayerTreeHost::loseCompositorContext(int numTimes)

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

@@ -158 +158 @@
 
     void setVisible(bool);
+    void setHaveWheelEventHandlers(bool);
 
     void updateLayers();
@@ -165 +166 @@
     void startRateLimiter(GraphicsContext3D*);
     void stopRateLimiter(GraphicsContext3D*);
+
 protected:
     CCLayerTreeHost(CCLayerTreeHostClient*, PassRefPtr<LayerChromium> rootLayer, const CCSettings&);
@@ -199 +201 @@
     TransformationMatrix m_zoomAnimatorTransform;
     bool m_visible;
+    bool m_haveWheelEventHandlers;
     typedef HashMap<GraphicsContext3D*, RefPtr<RateLimiter> > RateLimiterMap;
     RateLimiterMap m_rateLimiters;

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

@@ -50 +50 @@
     , m_settings(settings)
     , m_visible(true)
+    , m_haveWheelEventHandlers(false)
 {
     ASSERT(CCProxy::isImplThread());
@@ -180 +181 @@
     m_client->setNeedsCommitOnImplThread();
     m_client->setNeedsRedrawOnImplThread();
+}
+
+bool CCLayerTreeHostImpl::haveWheelEventHandlers()
+{
+    return m_haveWheelEventHandlers;
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h

@@ -61 +61 @@
     // CCScrollController implementation
     virtual void scrollRootLayer(const IntSize&);
+    virtual bool haveWheelEventHandlers();
 
     // Virtual for testing
@@ -87 +88 @@
 
     void setVisible(bool);
+    void setHaveWheelEventHandlers(bool haveWheelEventHandlers) { m_haveWheelEventHandlers = haveWheelEventHandlers; }
 
     int sourceFrameNumber() const { return m_sourceFrameNumber; }
@@ -111 +113 @@
     IntSize m_viewportSize;
     bool m_visible;
+    bool m_haveWheelEventHandlers;
 };
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCScrollController.h

@@ -36 +36 @@
 public:
     virtual void scrollRootLayer(const IntSize&) = 0;
+    virtual bool haveWheelEventHandlers() = 0;
 
 protected:

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-10-28  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Track wheel event handler registration and pass to input filter
+        https://bugs.webkit.org/show_bug.cgi?id=71078
+
+        Reviewed by Kenneth Russell.
+
+        Pushes mouse wheel event handler notifications to CCLayerTreeHost when compositing.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::numWheelEventHandlersChanged):
+        * src/WebCompositorImpl.cpp:
+        (WebKit::WebCompositorImpl::handleInputEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::numberOfWheelEventHandlersChanged):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        * src/WebViewImpl.h:
+
 2011-10-28  Jochen Eisinger  <jochen@chromium.org>
 

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

@@ -1000 +1000 @@
 void ChromeClientImpl::numWheelEventHandlersChanged(unsigned numberOfWheelHandlers)
 {
-    if (m_webView->client())
-        m_webView->client()->numberOfWheelEventHandlersChanged(numberOfWheelHandlers);
+    m_webView->numberOfWheelEventHandlersChanged(numberOfWheelHandlers);
 }
 

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

@@ -117 +117 @@
     ASSERT(CCProxy::isImplThread());
     ASSERT(m_client);
-    // FIXME: Do something interesting with this input event like inform our m_scrollController.
+
+    if (event.type == WebInputEvent::MouseWheel && !m_scrollController->haveWheelEventHandlers()) {
+        const WebMouseWheelEvent& wheelEvent = *static_cast<const WebMouseWheelEvent*>(&event);
+        m_scrollController->scrollRootLayer(IntSize(-wheelEvent.deltaX, -wheelEvent.deltaY));
+        m_client->didHandleInputEvent();
+        return;
+    }
     m_client->didNotHandleInputEvent(true /* sendToWidget */);
 }

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

@@ -782 +782 @@
 #endif
 
+void WebViewImpl::numberOfWheelEventHandlersChanged(unsigned numberOfWheelHandlers)
+{
+    m_haveWheelEventHandlers = numberOfWheelHandlers > 0;
+    if (m_client)
+        m_client->numberOfWheelEventHandlersChanged(numberOfWheelHandlers);
+#if USE(ACCELERATED_COMPOSITING)
+    if (m_layerTreeHost)
+        m_layerTreeHost->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
+#endif
+}
+
 #if !OS(DARWIN)
 // Mac has no way to open a context menu based on a keyboard event.
@@ -2613 +2624 @@
         m_layerTreeHost = CCLayerTreeHost::create(this, m_nonCompositedContentHost->topLevelRootLayer()->platformLayer(), ccSettings);
         if (m_layerTreeHost) {
+            m_layerTreeHost->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
             updateLayerTreeViewport();
             m_client->didActivateCompositor(m_layerTreeHost->compositorIdentifier());

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -295 +295 @@
     bool touchEvent(const WebTouchEvent&);
 
+    void numberOfWheelEventHandlersChanged(unsigned);
+
     // Handles context menu events orignated via the the keyboard. These
     // include the VK_APPS virtual key and the Shift+F10 combine. Code is
@@ -579 +581 @@
     bool m_recreatingGraphicsContext;
 #endif
+    bool m_haveWheelEventHandlers;
     static const WebInputEvent* m_currentInputEvent;