Make IsSolidColor() a property on CC scrollbar layers.

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
@@ skipping 1243 matching lines @@
   return device_scale_factor_;
 }
 
 gfx::SizeF LayerTreeHostImpl::VisibleViewportSize() const {
   gfx::SizeF dip_size =
       gfx::ScaleSize(device_viewport_size(), 1.f / device_scale_factor());
 
   // 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();
 
   float top_offset =
       top_controls_manager_ ? top_controls_manager_->content_top_offset() : 0.f;
   return gfx::SizeF(dip_size.width(),
                     dip_size.height() - top_offset - overdraw_bottom_height_);
 }
 
 const LayerTreeSettings& LayerTreeHostImpl::Settings() const {
@@ skipping 287 matching lines @@
   if (pending_tree_)
     pending_tree_->set_needs_update_draw_properties();
 
   return true;
 }
 
 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();
   renderer_.reset();
   resource_provider_->Reinitialize(settings_.highp_threshold_min);
   CreateAndSetRenderer(output_surface_.get(), resource_provider_.get());
 
   bool success = !!renderer_.get();
   client_->DidTryInitializeRendererOnImplThread(success,
                                                 offscreen_context_provider);
@@ skipping 761 matching lines @@
 }
 
 void LayerTreeHostImpl::SetDebugState(const LayerTreeDebugState& debug_state) {
   if (debug_state_.continuous_painting != debug_state.continuous_painting)
     paint_time_counter_->ClearHistory();
 
   debug_state_ = debug_state;
 }
 
 }  // namespace cc