diff options
| author | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:52:50 +0000 |
|---|---|---|
| committer | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:52:50 +0000 |
| commit | 05dfe4f67e3bc8a6da03ed672a9892e08e1d4ca8 (patch) | |
| tree | aef9a055b0d1300f256efb3d5374548427a3697a /cc | |
| parent | a1807a5b53c1551fe4a82beced80af7d27a00adf (diff) | |
| download | chromium_src-05dfe4f67e3bc8a6da03ed672a9892e08e1d4ca8.zip chromium_src-05dfe4f67e3bc8a6da03ed672a9892e08e1d4ca8.tar.gz chromium_src-05dfe4f67e3bc8a6da03ed672a9892e08e1d4ca8.tar.bz2 | |
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
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |