Refactor cc scrollbar layers to separate solid-color vs desktop.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 248 matching lines @@
 
   settings.strict_layer_property_change_checking =
       cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking);
 
   settings.use_map_image = cmd->HasSwitch(cc::switches::kUseMapImage);
 
 #if defined(OS_ANDROID)
   // TODO(danakj): Move these to the android code.
   settings.can_use_lcd_text = false;
   settings.max_partial_texture_updates = 0;
-  settings.use_linear_fade_scrollbar_animator = true;
-  settings.solid_color_scrollbars = true;
   settings.solid_color_scrollbar_color =

[aelias_OOO_until_Jul13, 2013/08/14 21:26:08]

This will fail to compile.  Android WebView needs a way to hide scrollbars.

[wjmaclean, 2013/08/15 20:09:40]

OK. I've fixed this by re-implementing the --solid-color-scrollbar-color switch
we considered adding in the other patch, and removing the --hide-scrollbars
switch.

       cmd->HasSwitch(switches::kHideScrollbars)
           ? SK_ColorTRANSPARENT
           : SkColorSetARGB(128, 128, 128, 128);
-  settings.solid_color_scrollbar_thickness_dip = 3;
   settings.highp_threshold_min = 2048;
   // Android WebView handles root layer flings itself.
   settings.ignore_root_layer_flings =
       widget->UsingSynchronousRendererCompositor();
 #elif !defined(OS_MACOSX)

[wjmaclean, 2013/08/14 20:48:27]

This should be a separate #if instead of an #elif now.

[wjmaclean, 2013/08/15 20:09:40]

Done.

-  if (cmd->HasSwitch(switches::kEnableOverlayScrollbars)) {
+  if (cmd->HasSwitch(cc::switches::kEnableOverlayScrollbars)) {
     settings.use_linear_fade_scrollbar_animator = true;
     settings.solid_color_scrollbars = true;
-    settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
-    settings.solid_color_scrollbar_thickness_dip = 3;
   }
 #endif
 
   if (!compositor->initialize(settings))
     return scoped_ptr<RenderWidgetCompositor>();
 
   return compositor.Pass();
 }
 
 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget,
@@ skipping 287 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content