summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 20:11:02 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 20:11:02 +0000
commita97109682bce86ab91f99ab6bb4ab79b3df72820 (patch)
treece6f72de444fe15daa350d75710f0cdfa3e75973 /webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
parenta2ac2864d48491b47068d5c30922329dfd135d0c (diff)
downloadchromium_src-a97109682bce86ab91f99ab6bb4ab79b3df72820.zip
chromium_src-a97109682bce86ab91f99ab6bb4ab79b3df72820.tar.gz
chromium_src-a97109682bce86ab91f99ab6bb4ab79b3df72820.tar.bz2
cc: Return whether any layer was scrolled from InputHandlerClient::scrollBy.
BUG=none Review URL: https://codereview.chromium.org/11365238 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc')
-rw-r--r--webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
index 9d68cf3..30d105a 100644
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
@@ -47,9 +47,14 @@ public:
return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type)));
}
- virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
+ virtual void scrollBy(WebPoint point, WebSize offset)
{
- m_client->scrollBy(point, offset);
+ scrollByIfPossible(point, offset);
+ }
+
+ virtual bool scrollByIfPossible(WebPoint point, WebSize offset)
+ {
+ return m_client->scrollBy(point, offset);
}
virtual void scrollEnd() OVERRIDE