diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 03:21:01 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 03:21:01 +0000 |
| commit | c4d467a16bac8e6f2f7bf84d6e7f449200504d75 (patch) | |
| tree | 9e17f15152bdc7453a22dd6aa9b4a3fee673b332 | |
| parent | 10162ad19beb8c6cdd225e5d40e9db3ca0ad42e5 (diff) | |
| download | chromium_src-c4d467a16bac8e6f2f7bf84d6e7f449200504d75.zip chromium_src-c4d467a16bac8e6f2f7bf84d6e7f449200504d75.tar.gz chromium_src-c4d467a16bac8e6f2f7bf84d6e7f449200504d75.tar.bz2 | |
Unbreak max scroll offset in threaded compositing mode.
This was broken by a cleanup in
https://src.chromium.org/viewvc/chrome?view=rev&revision=177847.
Reverting that part of the patch.
TBR=enne
NOTRY=true
BUG=171188
Review URL: https://chromiumcodereview.appspot.com/12034003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177886 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/layer_tree_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layer_tree_impl.cc b/cc/layer_tree_impl.cc index bfdcf50..9f9588b 100644 --- a/cc/layer_tree_impl.cc +++ b/cc/layer_tree_impl.cc @@ -188,9 +188,9 @@ const LayerTreeImpl::LayerList& LayerTreeImpl::RenderSurfaceLayerList() const { } gfx::Size LayerTreeImpl::ContentSize() const { - if (!root_scroll_layer_) + if (!root_scroll_layer_ || root_scroll_layer_->children().empty()) return gfx::Size(); - return root_scroll_layer_->bounds(); + return root_scroll_layer_->children()[0]->bounds(); } LayerImpl* LayerTreeImpl::LayerById(int id) { |