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

content/renderer/gpu/render_widget_compositor.cc

Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index c3becc8fe33556d0334937f6f5f18bffa367e25b..b77a866dbe4e0ce914ac8c550d1076f2079b5ed1 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -266,23 +266,18 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
   // 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