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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 476113004: Replace overdraw_bottom_height with top_controls_layout_height. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ScrollViewportRounding test Created 6 years, 4 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') | content/browser/android/content_view_core_impl.h » ('j') | 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 f442ca2d7363376c92e45ed02bfb791be51fe698..0b9b880c2ba3b82c0663007549af7d58fec36ee3 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -272,14 +272,6 @@ void LayerTreeImpl::ClearCurrentlyScrollingLayer() {
scrolling_layer_id_from_previous_tree_ = 0;
}
-float LayerTreeImpl::VerticalAdjust(const int clip_layer_id) const {
- LayerImpl* container_layer = InnerViewportContainerLayer();
- if (!container_layer || clip_layer_id != container_layer->id())
- return 0.f;
-
- return layer_tree_host_impl_->VerticalAdjust();
-}
-
namespace {
void ForceScrollbarParameterUpdateAfterScaleChange(LayerImpl* current_layer) {
@@ -355,12 +347,11 @@ void LayerTreeImpl::SetPageScaleValues(float page_scale_factor,
}
gfx::SizeF LayerTreeImpl::ScrollableViewportSize() const {
- if (outer_viewport_scroll_layer_)
- return layer_tree_host_impl_->UnscaledScrollableViewportSize();
- else
- return gfx::ScaleSize(
- layer_tree_host_impl_->UnscaledScrollableViewportSize(),
- 1.0f / total_page_scale_factor());
+ if (!InnerViewportContainerLayer())
+ return gfx::SizeF();
+
+ return gfx::ScaleSize(InnerViewportContainerLayer()->bounds(),
+ 1.0f / total_page_scale_factor());
}
gfx::Rect LayerTreeImpl::RootScrollLayerDeviceViewportBounds() const {
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | content/browser/android/content_view_core_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698