Changeset 112127 in webkit

Timestamp:

Mar 26, 2012 10:52:44 AM (12 years ago)

Author:

wjmaclean@chromium.org

Message:

[chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
​https://bugs.webkit.org/show_bug.cgi?id=82133

Reviewed by James Robinson.

Source/WebCore:

Covered by existing unit tests.

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

(WebCore::CCLayerTreeHostImpl::scrollBegin):

Source/WebKit/chromium:

• src/WebCompositorInputHandlerImpl.cpp:

(WebKit::WebCompositorInputHandlerImpl::handleGestureFling):

• tests/CCLayerTreeHostImplTest.cpp:

(WebKitTests::TEST_F):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp (modified) (1 diff)
• WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  W. James MacLean  <wjmaclean@chromium.org>
+
+        [chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
+        https://bugs.webkit.org/show_bug.cgi?id=82133
+
+        Reviewed by James Robinson.
+
+        Covered by existing unit tests.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::scrollBegin):
+
 2012-03-26  Mike Lawther  <mikelawther@chromium.org>
 

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

@@ -620 +620 @@
     }
 
-    if ((type == CCInputHandlerClient::Wheel || type == CCInputHandlerClient::Gesture) && m_scrollLayerImpl->haveWheelEventHandlers()) {
+    if (type == CCInputHandlerClient::Wheel && m_scrollLayerImpl->haveWheelEventHandlers()) {
         TRACE_EVENT("scrollBegin Failed wheelEventHandlers", this, 0);
         return ScrollFailed;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-26  W. James MacLean  <wjmaclean@chromium.org>
+
+        [chromium] Change handleGestureFling() to use CCInputHandlerClient::Wheel.
+        https://bugs.webkit.org/show_bug.cgi?id=82133
+
+        Reviewed by James Robinson.
+
+        * src/WebCompositorInputHandlerImpl.cpp:
+        (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+        * tests/CCLayerTreeHostImplTest.cpp:
+        (WebKitTests::TEST_F):
+
 2012-03-26  Terry Anderson  <tdanderson@chromium.org>
 

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

@@ -263 +263 @@
 WebCompositorInputHandlerImpl::EventDisposition WebCompositorInputHandlerImpl::handleGestureFling(const WebGestureEvent& gestureEvent)
 {
-    CCInputHandlerClient::ScrollStatus scrollStatus = m_inputHandlerClient->scrollBegin(IntPoint(gestureEvent.x, gestureEvent.y), CCInputHandlerClient::Gesture);
+    CCInputHandlerClient::ScrollStatus scrollStatus = m_inputHandlerClient->scrollBegin(IntPoint(gestureEvent.x, gestureEvent.y), CCInputHandlerClient::Wheel);
     switch (scrollStatus) {
     case CCInputHandlerClient::ScrollStarted: {

trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp

@@ -204 +204 @@
 
     root->setHaveWheelEventHandlers(true);
-    // With registered event handlers, wheel and gesture scrolls have to go to the main thread.
+    // With registered event handlers, wheel scrolls have to go to the main thread.
     EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Wheel), CCInputHandlerClient::ScrollFailed);
-    EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Gesture), CCInputHandlerClient::ScrollFailed);
+
+    // But gesture scrolls can still be handled.
+    EXPECT_EQ(m_hostImpl->scrollBegin(IntPoint(0, 0), CCInputHandlerClient::Gesture), CCInputHandlerClient::ScrollStarted);
 }