From 05dfe4f67e3bc8a6da03ed672a9892e08e1d4ca8 Mon Sep 17 00:00:00 2001 From: "wjmaclean@chromium.org" Date: Thu, 27 Feb 2014 19:52:50 +0000 Subject: Use UnscaledScrollableViewportSize() for clip layer size. Fix setting of InnerViewportContainerLayer bounds so that non-overlay scrollbars, when present, are accounted for. TBR=aelias@chromium.org BUG=347491 Review URL: https://codereview.chromium.org/183383002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253909 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/trees/layer_tree_host_impl.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cc') diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index ad93047..990bf01 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1501,7 +1501,10 @@ void LayerTreeHostImpl::UpdateInnerViewportContainerSize() { if (!container_layer) return; - container_layer->SetTemporaryImplBounds(ComputeInnerViewportContainerSize()); + // We pass the value returned from UnscaledScrollableViewportSize() here as + // it accounts for scrollbar dimensions when + // container_layer->masks_to_bounds() is set. + container_layer->SetTemporaryImplBounds(UnscaledScrollableViewportSize()); } gfx::SizeF LayerTreeHostImpl::UnscaledScrollableViewportSize() const { -- cgit v1.1