Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc

Issue 12090014: Add a bit to not bubble scrolls to parent scrolling layers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/layer_tree_host_impl.cc ('K') | « cc/layer_tree_host_unittest_scroll.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
index 3f23d71172cd36631e2fde5d9a2862004c1ef036..68b3696ef388da1698849080b45e0cd3bdc05be3 100644
--- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
+++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
@@ -49,7 +49,12 @@ public:
virtual bool scrollByIfPossible(WebPoint point, WebSize offset) OVERRIDE
{
- return m_client->scrollBy(point, offset);
+ return m_client->scrollBy(point, offset, true);
+ }
+
+ virtual bool scrollByIfPossible(WebPoint point, WebSize offset, bool shouldBubble) OVERRIDE
+ {
+ return m_client->scrollBy(point, offset, shouldBubble);
}
virtual void scrollEnd() OVERRIDE
« cc/layer_tree_host_impl.cc ('K') | « cc/layer_tree_host_unittest_scroll.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698