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

webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc

Index: webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
index 0529d5c6663350f7484d47388ce27c58f6f8f595..a214c44b920777f780113c69a868da033c9868c3 100644
--- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.cc
@@ -5,11 +5,23 @@
 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
 
 #include "cc/layers/painted_scrollbar_layer.h"
-#include "third_party/WebKit/public/platform/WebScrollbar.h"
+#include "cc/layers/scrollbar_layer_interface.h"
+#include "cc/layers/solid_color_scrollbar_layer.h"
 #include "webkit/renderer/compositor_bindings/scrollbar_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 using cc::PaintedScrollbarLayer;
+using cc::SolidColorScrollbarLayer;
+
+namespace {
+
+cc::ScrollbarOrientation ConvertOrientation(
+    WebKit::WebScrollbar::Orientation orientation) {
+  return orientation == WebKit::WebScrollbar::Horizontal ? cc::HORIZONTAL
+    : cc::VERTICAL;
+}
+
+}  // namespace
 
 namespace webkit {
 
@@ -23,6 +35,14 @@ WebScrollbarLayerImpl::WebScrollbarLayerImpl(
               painter,
               make_scoped_ptr(geometry))).Pass(), 0))) {}
 
+WebScrollbarLayerImpl::WebScrollbarLayerImpl(
+    WebKit::WebScrollbar::Orientation orientation,
+    int thumb_thickness)
+    : layer_(new WebLayerImpl(
+          SolidColorScrollbarLayer::Create(ConvertOrientation(orientation),
+                                           thumb_thickness,
+                                           0))) {}
+
 WebScrollbarLayerImpl::~WebScrollbarLayerImpl() {}
 
 WebKit::WebLayer* WebScrollbarLayerImpl::layer() { return layer_.get(); }