cc: SolidColorQuad-based scrollbars for Android [M25]

cc/scrollbar_layer_impl.cc

Index: cc/scrollbar_layer_impl.cc
diff --git a/cc/scrollbar_layer_impl.cc b/cc/scrollbar_layer_impl.cc
index f0b5f7f0d2cd916a24da8e61df15e447b4652247..0343cda0a588b40bed9af3f8113dc12f923a579c 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/scrollbar_layer_impl.cc
@@ -5,8 +5,10 @@
 #include "cc/scrollbar_layer_impl.h"
 
 #include "cc/layer_tree_impl.h"
+#include "cc/layer_tree_settings.h"
 #include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
+#include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "ui/gfx/rect_conversions.h"
 
@@ -151,6 +153,18 @@ void ScrollbarLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& append
     if (!m_geometry->hasThumb(&m_scrollbar))
         thumbRect = WebRect();
 
+    if (layerTreeImpl()->settings().solidColorScrollbars) {
+        if (m_scrollbar.orientation() == WebScrollbar::Horizontal)
+            thumbRect.height -= layerTreeImpl()->settings().solidColorScrollbarMargin;
+        else
+            thumbRect.width -= layerTreeImpl()->settings().solidColorScrollbarMargin;
+        gfx::Rect quadRect(scrollbarLayerRectToContentRect(thumbRect));
+        scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
+        quad->SetNew(sharedQuadState, quadRect, layerTreeImpl()->settings().solidColorScrollbarColor);
+        quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        return;
+    }
+
     if (m_thumbResourceId && !thumbRect.isEmpty()) {
         gfx::Rect quadRect(scrollbarLayerRectToContentRect(thumbRect));
         gfx::Rect opaqueRect;