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

cc/layers/layer_impl.h

 // Copyright 2011 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 24 matching lines @@
 #include "ui/gfx/transform.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace cc {
 
 class LayerTreeHostImpl;
 class LayerTreeImpl;
-class PaintedScrollbarLayerImpl;
 class QuadSink;
 class Renderer;
 class ScrollbarAnimationController;
+class ScrollbarLayerImplBase;
 class Layer;
 
 struct AppendQuadsData;
 
 enum DrawMode {
   DRAW_MODE_NONE,
   DRAW_MODE_HARDWARE,
   DRAW_MODE_SOFTWARE,
   DRAW_MODE_RESOURCELESS_SOFTWARE
 };
@@ skipping 95 matching lines @@
 
   virtual ResourceProvider::ResourceId ContentsResourceId() const;
 
   virtual bool HasDelegatedContent() const;
   virtual bool HasContributingDelegatedRenderPasses() const;
   virtual RenderPass::Id FirstContributingRenderPassId() const;
   virtual RenderPass::Id NextContributingRenderPassId(RenderPass::Id id) const;
 
   virtual void UpdateTilePriorities() {}
 
-  virtual PaintedScrollbarLayerImpl* ToScrollbarLayer();
+  virtual ScrollbarLayerImplBase* ToScrollbarLayer();
 
   // Returns true if this layer has content to draw.
   void SetDrawsContent(bool draws_content);
   bool DrawsContent() const { return draws_content_; }
 
   void SetHideLayerAndSubtree(bool hide);
   bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
 
   bool force_render_surface() const { return force_render_surface_; }
   void SetForceRenderSurface(bool force) { force_render_surface_ = force; }
@@ skipping 269 matching lines @@
   // was lost and that a new one has been created. Won't be called
   // until the new surface has been created successfully.
   virtual void DidLoseOutputSurface();
 
   ScrollbarAnimationController* scrollbar_animation_controller() const {
     return scrollbar_animation_controller_.get();
   }
 
   void SetScrollbarOpacity(float opacity);
 
-  void SetHorizontalScrollbarLayer(PaintedScrollbarLayerImpl* scrollbar_layer);
-  PaintedScrollbarLayerImpl* horizontal_scrollbar_layer() {
+  void SetHorizontalScrollbarLayer(ScrollbarLayerImplBase* scrollbar_layer);
+  ScrollbarLayerImplBase* horizontal_scrollbar_layer() {
     return horizontal_scrollbar_layer_;
   }
 
-  void SetVerticalScrollbarLayer(PaintedScrollbarLayerImpl* scrollbar_layer);
-  PaintedScrollbarLayerImpl* vertical_scrollbar_layer() {
+  void SetVerticalScrollbarLayer(ScrollbarLayerImplBase* scrollbar_layer);
+  ScrollbarLayerImplBase* vertical_scrollbar_layer() {
     return vertical_scrollbar_layer_;
   }
 
   gfx::Rect LayerRectToContentRect(const gfx::RectF& layer_rect) const;
 
   virtual skia::RefPtr<SkPicture> GetPicture();
 
   virtual bool CanClipSelf() const;
 
   virtual bool AreVisibleResourcesReady() const;
@@ skipping 137 matching lines @@
   gfx::RectF update_rect_;
 
   // Manages animations for this layer.
   scoped_refptr<LayerAnimationController> layer_animation_controller_;
 
   // Manages scrollbars for this layer
   scoped_ptr<ScrollbarAnimationController> scrollbar_animation_controller_;
 
   // Weak pointers to this layer's scrollbars, if it has them. Updated during
   // tree synchronization.
-  PaintedScrollbarLayerImpl* horizontal_scrollbar_layer_;
-  PaintedScrollbarLayerImpl* vertical_scrollbar_layer_;
+  ScrollbarLayerImplBase* horizontal_scrollbar_layer_;
+  ScrollbarLayerImplBase* vertical_scrollbar_layer_;
 
   ScopedPtrVector<CopyOutputRequest> copy_requests_;
 
   // Group of properties that need to be computed based on the layer tree
   // hierarchy before layers can be drawn.
   DrawProperties<LayerImpl, RenderSurfaceImpl> draw_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_