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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 1143233003: Fix viewport scroll bubbling of wheel events in CC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index f75077da63a2f4824a17d6d37a44f078f784be5c..90f8cd83806a91c881fb5d2c190323766ba61f61 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2584,7 +2584,10 @@ static gfx::Vector2dF ScrollLayerWithLocalDelta(
layer_impl->ScrollBy(delta);
gfx::ScrollOffset scrolled =
layer_impl->CurrentScrollOffset() - previous_offset;
- return gfx::Vector2dF(scrolled.x(), scrolled.y());
+ gfx::Vector2dF consumed_scroll(scrolled.x(), scrolled.y());
+ consumed_scroll.Scale(page_scale_factor);
+
+ return consumed_scroll;
}
gfx::Vector2dF LayerTreeHostImpl::ScrollLayer(LayerImpl* layer_impl,
« no previous file with comments | « no previous file | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698