diff options
author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 23:15:11 +0000 |
---|---|---|
committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 23:15:11 +0000 |
commit | bfb6e2415fc87961baff2557d59ae81f5f5fd035 (patch) | |
tree | 2d91b55696a6a8e229ec111fa71bd5c0e905d8fa /content/renderer/gpu/input_handler_proxy_unittest.cc | |
parent | 5df96abc073fbdcf391dca744947620a9a819922 (diff) | |
download | chromium_src-bfb6e2415fc87961baff2557d59ae81f5f5fd035.zip chromium_src-bfb6e2415fc87961baff2557d59ae81f5f5fd035.tar.gz chromium_src-bfb6e2415fc87961baff2557d59ae81f5f5fd035.tar.bz2 |
Add the current delta to InputHandlerClient::DidOverscroll.
This change adds the value of the latest overscroll delta to the
callback. This is to enable the android_webview overscroll implementation.
BUG=b/6946454
TEST=AndroidWebViewTests
Review URL: https://chromiumcodereview.appspot.com/19246002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/gpu/input_handler_proxy_unittest.cc')
-rw-r--r-- | content/renderer/gpu/input_handler_proxy_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/gpu/input_handler_proxy_unittest.cc b/content/renderer/gpu/input_handler_proxy_unittest.cc index 9485949..ca3e2cf 100644 --- a/content/renderer/gpu/input_handler_proxy_unittest.cc +++ b/content/renderer/gpu/input_handler_proxy_unittest.cc @@ -125,8 +125,7 @@ class MockInputHandlerProxyClient return new FakeWebGestureCurve(velocity, cumulative_scroll); } - virtual void DidOverscroll(gfx::Vector2dF overscroll, - gfx::Vector2dF fling_velocity) {} + virtual void DidOverscroll(const cc::DidOverscrollParams& params) {} private: DISALLOW_COPY_AND_ASSIGN(MockInputHandlerProxyClient); @@ -991,9 +990,10 @@ TEST_F(InputHandlerProxyTest, GestureFlingStopsAtContentEdge) { testing::Mock::VerifyAndClearExpectations(&mock_input_handler_); // Simulate hitting the bottom content edge. - gfx::Vector2dF overscroll_amount(0, 100); - gfx::Vector2dF overscroll_velocity(0, 10); - input_handler_->DidOverscroll(overscroll_amount, overscroll_velocity); + cc::DidOverscrollParams overscroll_params; + overscroll_params.accumulated_overscroll = gfx::Vector2dF(0, 100); + overscroll_params.current_fling_velocity = gfx::Vector2dF(0, 10); + input_handler_->DidOverscroll(overscroll_params); // The next call to animate will no longer scroll vertically. EXPECT_CALL(mock_input_handler_, ScheduleAnimation()); |