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

Unified Diff: cc/trees/layer_tree_host.cc

Issue 210543002: Removed pinch viewport scroll offset distribution (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_unittest_pinch_zoom.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index f4bfada437edcb82f37eb32196d1fb574d13bcd8..21772804c95e0b2e5192cf63bb9e83c930ea4c43 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -1059,50 +1059,6 @@ void LayerTreeHost::ApplyScrollAndScale(const ScrollAndScaleSet& info) {
}
}
-gfx::Vector2d LayerTreeHost::DistributeScrollOffsetToViewports(
- const gfx::Vector2d offset,
- Layer* layer) {
- DCHECK(layer);
- if (layer != outer_viewport_scroll_layer_.get())
- return offset;
-
- gfx::Vector2d inner_viewport_offset =
- inner_viewport_scroll_layer_->scroll_offset();
- gfx::Vector2d outer_viewport_offset =
- outer_viewport_scroll_layer_->scroll_offset();
-
- if (offset == inner_viewport_offset + outer_viewport_offset) {
- // In this case, nothing should change, so we just return to the outer
- // viewport the offset is already has.
- return outer_viewport_offset;
- }
-
- // In the spirit of document-scrolls-first, we always want any change to
- // go to the outer viewport first.
- gfx::Vector2d max_outer_viewport_scroll_offset =
- outer_viewport_scroll_layer_->MaxScrollOffset();
- gfx::Vector2d max_inner_viewport_scroll_offset =
- inner_viewport_scroll_layer_->MaxScrollOffset();
-
- // TODO(bokan): This trips on zoom-out due to how Blink orders scale-scroll.
- // Disabled until that's sorted out: crbug.com/336574
- // gfx::Vector2d total_max_scroll_offset =
- // max_outer_viewport_scroll_offset + max_inner_viewport_scroll_offset;
- // DCHECK(total_max_scroll_offset.x() >= offset.x() &&
- // total_max_scroll_offset.y() >= offset.y());
-
- outer_viewport_offset = offset - inner_viewport_offset;
- outer_viewport_offset.SetToMin(max_outer_viewport_scroll_offset);
- outer_viewport_offset.SetToMax(gfx::Vector2d());
-
- inner_viewport_offset = offset - outer_viewport_offset;
- inner_viewport_offset.SetToMin(max_inner_viewport_scroll_offset);
- inner_viewport_offset.SetToMax(gfx::Vector2d());
- inner_viewport_scroll_layer_->SetScrollOffset(inner_viewport_offset);
-
- return outer_viewport_offset;
-}
-
void LayerTreeHost::StartRateLimiter() {
if (animating_)
return;
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_unittest_pinch_zoom.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698