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

webkit/renderer/compositor_bindings/web_compositor_support_impl.cc

 // Copyright (c) 2012 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 "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/output/output_surface.h"
@@ skipping 60 matching lines @@
 }
 
 WebSolidColorLayer* WebCompositorSupportImpl::createSolidColorLayer() {
   return new WebSolidColorLayerImpl();
 }
 
 WebScrollbarLayer* WebCompositorSupportImpl::createScrollbarLayer(
     WebScrollbar* scrollbar,
     WebScrollbarThemePainter painter,
     WebScrollbarThemeGeometry* geometry) {
+// TODO(wjmaclean) Remove the Android-specific if-clause here once the
+// Blink-side changes are made to call createSolidColorScrollbarLayer()
+// directly.
+#if defined(OS_ANDROID)
+  const int kThumbThickness = 3;
+  return new WebScrollbarLayerImpl(scrollbar->orientation(), kThumbThickness);
+#else
   return new WebScrollbarLayerImpl(scrollbar, painter, geometry);
+#endif
+}
+
+WebScrollbarLayer* WebCompositorSupportImpl::createSolidColorScrollbarLayer(
+      WebKit::WebScrollbar::Orientation orientation, int thumb_thickness) {
+  return new WebScrollbarLayerImpl(orientation, thumb_thickness);
 }
 
 WebAnimation* WebCompositorSupportImpl::createAnimation(
     const WebKit::WebAnimationCurve& curve,
     WebKit::WebAnimation::TargetProperty target,
     int animation_id) {
   return new WebAnimationImpl(curve, target, animation_id, 0);
 }
 
 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
   return new WebFloatAnimationCurveImpl();
 }
 
 WebTransformAnimationCurve*
 WebCompositorSupportImpl::createTransformAnimationCurve() {
   return new WebTransformAnimationCurveImpl();
 }
 
 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
   return new WebTransformOperationsImpl();
 }
 
 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() {
   return new WebFilterOperationsImpl();
 }
 
 }  // namespace webkit