| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 3905e8ea4a846fca366c90ba1ec5068f208cd97e..ba164ff7d8afc772339ef97da1f40eb2d5292a4d 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1263,7 +1263,7 @@ gfx::SizeF LayerTreeHostImpl::VisibleViewportSize() const {
|
| // The clip layer should be used if non-overlay scrollbars may exist since
|
| // it adjusts for them.
|
| LayerImpl* clip_layer = active_tree_->RootClipLayer();
|
| - if (!Settings().solid_color_scrollbars && clip_layer &&
|
| + if (!settings().force_solid_color_scrollbars && clip_layer &&
|
| clip_layer->masks_to_bounds())
|
| dip_size = clip_layer->bounds();
|
|
|
| @@ -1571,7 +1571,7 @@ bool LayerTreeHostImpl::DeferredInitialize(
|
| scoped_refptr<ContextProvider> offscreen_context_provider) {
|
| DCHECK(output_surface_->capabilities().deferred_gl_initialization);
|
| DCHECK(settings_.impl_side_painting);
|
| - DCHECK(settings_.solid_color_scrollbars);
|
| + DCHECK(settings_.force_solid_color_scrollbars);
|
| DCHECK(output_surface_->context3d());
|
|
|
| ReleaseTreeResources();
|
|
|