| Index: cc/layer_tree_impl.cc
|
| diff --git a/cc/layer_tree_impl.cc b/cc/layer_tree_impl.cc
|
| index bfdcf50ca8c5e1b318472b3e6a5a390f99e4a012..9f9588b85adfdf276969106f55365069def58362 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) {
|
|
|