Changeset 128199 in webkit

Timestamp:

Sep 11, 2012 9:59:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Fix double call to scrollBegin() when handling scroll gesture
​https://bugs.webkit.org/show_bug.cgi?id=95322

Patch by Iain Merrick <​husky@chromium.org> on 2012-09-11
Reviewed by James Robinson.

WebCompositorInputHandlerImpl::handleGestureFling() calls scrollBegin() on its
client, then if the result is ScrollStarted, it creates a PlatformGestureCurve
object to handle the fling animation. This patch adds a matching scrollEnd()
before the animation starts.

Now using strict mocks in WebCompositorInputHandlerImplTest, which turns all
unexpected calls into test failures. This ensures that scrollBegin / scrollEnd
happen exactly when we want and at no other times.

• src/WebCompositorInputHandlerImpl.cpp:

(WebKit::WebCompositorInputHandlerImpl::handleGestureFling):

• tests/WebCompositorInputHandlerImplTest.cpp:

(WebCompositorInputHandlerImplTest):
(WebKit::TEST_F):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebCompositorInputHandlerImpl.cpp (modified) (1 diff)
• tests/WebCompositorInputHandlerImplTest.cpp (modified) (5 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-11  Iain Merrick  <husky@chromium.org>
+
+        [chromium] Fix double call to scrollBegin() when handling scroll gesture
+        https://bugs.webkit.org/show_bug.cgi?id=95322
+
+        Reviewed by James Robinson.
+
+        WebCompositorInputHandlerImpl::handleGestureFling() calls scrollBegin() on its
+        client, then if the result is ScrollStarted, it creates a PlatformGestureCurve
+        object to handle the fling animation. This patch adds a matching scrollEnd()
+        before the animation starts.
+
+        Now using strict mocks in WebCompositorInputHandlerImplTest, which turns all
+        unexpected calls into test failures. This ensures that scrollBegin / scrollEnd
+        happen exactly when we want and at no other times.
+
+        * src/WebCompositorInputHandlerImpl.cpp:
+        (WebKit::WebCompositorInputHandlerImpl::handleGestureFling):
+        * tests/WebCompositorInputHandlerImplTest.cpp:
+        (WebCompositorInputHandlerImplTest):
+        (WebKit::TEST_F):
+
 2012-09-11  Peter Beverloo  <peter@chromium.org>
 

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

@@ -206 +206 @@
     switch (scrollStatus) {
     case WebInputHandlerClient::ScrollStatusStarted: {
+        m_inputHandlerClient->scrollEnd();
         m_wheelFlingCurve = PlatformGestureCurveFactory::get()->createCurve(gestureEvent.data.flingStart.sourceDevice, FloatPoint(gestureEvent.data.flingStart.velocityX, gestureEvent.data.flingStart.velocityY));
         TRACE_EVENT_ASYNC_BEGIN1("cc", "WebCompositorInputHandlerImpl::handleGestureFling::started", this, "curve", m_wheelFlingCurve->debugName());

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

@@ -134 +134 @@
 
 protected:
-    MockWebInputHandlerClient m_mockInputHandlerClient;
+    testing::StrictMock<MockWebInputHandlerClient> m_mockInputHandlerClient;
     OwnPtr<WebCompositorInputHandlerImpl> m_inputHandler;
-    MockWebCompositorInputHandlerClient m_mockClient;
+    testing::StrictMock<MockWebCompositorInputHandlerClient> m_mockClient;
     WebGestureEvent gesture;
     WebKitTests::WebCompositorInitializer m_initializer;
@@ -256 +256 @@
     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
+    EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
+    EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
 
     gesture.type = WebInputEvent::GestureFlingStart;
     gesture.data.flingStart.velocityX = 10;
-    EXPECT_CALL(m_mockInputHandlerClient, scheduleAnimation());
     m_inputHandler->handleInputEvent(gesture);
 
@@ -329 +330 @@
     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
+    EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
     m_inputHandler->handleInputEvent(gesture);
 
@@ -413 +415 @@
     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
+    EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
     m_inputHandler->handleInputEvent(gesture);
 
@@ -492 +495 @@
     EXPECT_CALL(m_mockInputHandlerClient, scrollBegin(testing::_, testing::_))
         .WillOnce(testing::Return(WebInputHandlerClient::ScrollStatusStarted));
+    EXPECT_CALL(m_mockInputHandlerClient, scrollEnd());
     m_inputHandler->handleInputEvent(gesture);