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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 641873003: Made top controls work with virtual viewport pinch-to-zoom. (Chromium) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added warning in comment about lossy bounds. Created 6 years, 2 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_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 172e16f9ad3c88e85cd67a9cdb03954a91966f17..33c380c2f36fee10c41c890b54462a1f3d48a868 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -265,6 +265,12 @@ LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const {
: NULL;
}
+LayerImpl* LayerTreeImpl::OuterViewportContainerLayer() const {
+ return outer_viewport_scroll_layer_
+ ? outer_viewport_scroll_layer_->scroll_clip_layer()
+ : NULL;
+}
+
LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const {
DCHECK(IsActiveTree());
return currently_scrolling_layer_;
@@ -366,7 +372,7 @@ gfx::SizeF LayerTreeImpl::ScrollableViewportSize() const {
if (!InnerViewportContainerLayer())
return gfx::SizeF();
- return gfx::ScaleSize(InnerViewportContainerLayer()->bounds(),
+ return gfx::ScaleSize(InnerViewportContainerLayer()->BoundsForScrolling(),
1.0f / total_page_scale_factor());
}
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698