cc: SolidColorQuad-based scrollbars for Android [M25]

cc/scrollbar_layer_impl.cc

 // Copyright 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 "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"
 
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
 
 namespace cc {
 
 scoped_ptr<ScrollbarLayerImpl> ScrollbarLayerImpl::create(LayerTreeImpl* treeImpl, int id, scoped_ptr<ScrollbarGeometryFixedThumb> geometry)
 {
@@ skipping 124 matching lines @@
     gfx::Rect contentBoundsRect(gfx::Point(), contentBounds());
 
     SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
 
     WebRect thumbRect, backTrackRect, foreTrackRect;
     m_geometry->splitTrack(&m_scrollbar, m_geometry->trackRect(&m_scrollbar), backTrackRect, thumbRect, foreTrackRect);
     if (!m_geometry->hasThumb(&m_scrollbar))
         thumbRect = WebRect();
 
+    if (layerTreeImpl()->settings().solidColorScrollbars) {
+        int thicknessOverride = layerTreeImpl()->settings().solidColorScrollbarThickness;
+        if (thicknessOverride != -1) {

[jamesr, 2013/02/19 20:21:58]

where does -1 come from? when would it make sense to set solidColorScrollbars
and not specify the thickness?

[aelias_OOO_until_Jul13, 2013/02/20 00:01:16]

It would make sense if you just want to use the default thickness from the
WebKit geometry.  Currently, that would create a scrollbar going up to the edge
of the screen with no margin.

+            if (m_scrollbar.orientation() == WebScrollbar::Vertical)
+                thumbRect.width = thicknessOverride;
+            else
+                thumbRect.height = thicknessOverride;
+        }
+        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;
         const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
         scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
         quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_thumbResourceId, premultipledAlpha, uvTopLeft, uvBottomRight, opacity, flipped);
         quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
     }
 
     if (!m_backTrackResourceId)
@@ skipping 108 matching lines @@
 {
     return m_owner->m_isCustomScrollbar;
 }
 
 const char* ScrollbarLayerImpl::layerTypeAsString() const
 {
     return "ScrollbarLayer";
 }
 
 }  // namespace cc