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 56 matching lines @@
       double_value >= min_value && double_value <= max_value) {
     *result = static_cast<float>(double_value);
     return true;
   } else {
     LOG(WARNING) << "Failed to parse switch " << switch_string  << ": " <<
         string_value;
     return false;
   }
 }
 
+bool StringToSkColor(const std::string& str, SkColor& color) {
+  std::string prefix = str.substr(0, 2);
+  int offset = (prefix == "0x" || prefix == "0X") ? 2 : 0;
+
+  std::vector<uint8> values;
+  if (base::HexStringToBytes(str.substr(offset), &values)) {
+    if (values.size() != 4)
+      return false;
+
+    color = SkColorSetARGB(values[0], values[1], values[2], values[3]);
+    return true;
+  }
+
+  return false;
+}
 
 }  // namespace
 
 // static
 scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
     RenderWidget* widget,
     bool threaded) {
   scoped_ptr<RenderWidgetCompositor> compositor(
       new RenderWidgetCompositor(widget, threaded));
 
@@ skipping 168 matching lines @@
       settings.max_unused_resource_memory_percentage =
           max_unused_resource_memory_percentage;
     }
   }
 
   settings.strict_layer_property_change_checking =
       cmd->HasSwitch(cc::switches::kStrictLayerPropertyChangeChecking);
 
   settings.use_map_image = cmd->HasSwitch(cc::switches::kUseMapImage);
 
+  if (cmd->HasSwitch(cc::switches::kSolidColorScrollbarColor)) {
+    std::string str =
+        cmd->GetSwitchValueASCII(cc::switches::kSolidColorScrollbarColor);
+
+    SkColor scrollbar_color;
+    if (StringToSkColor(str, scrollbar_color))
+      settings.solid_color_scrollbar_color = scrollbar_color;
+  }
+
 #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 =
-      cmd->HasSwitch(switches::kHideScrollbars)
-          ? SK_ColorTRANSPARENT
-          : SkColorSetARGB(128, 128, 128, 128);
   settings.highp_threshold_min = 2048;
   // Android WebView handles root layer flings itself.
   settings.ignore_root_layer_flings =
       widget->UsingSynchronousRendererCompositor();
 #elif !defined(OS_MACOSX)
   if (cmd->HasSwitch(switches::kEnableOverlayScrollbars)) {
     settings.use_linear_fade_scrollbar_animator = true;
     settings.solid_color_scrollbars = true;
-    settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
   }
 #endif
 
   if (!compositor->initialize(settings))
     return scoped_ptr<RenderWidgetCompositor>();
 
   return compositor.Pass();
 }
 
 RenderWidgetCompositor::RenderWidgetCompositor(RenderWidget* widget,
@@ skipping 291 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content