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

cc/layers/scrollbar_layer_impl.cc

Index: cc/layers/scrollbar_layer_impl.cc
diff --git a/cc/layers/scrollbar_layer_impl.cc b/cc/layers/scrollbar_layer_impl.cc
index 0dcfcdec74114860caf02f5064b3cc972d118ba5..3cf692ce6325cbf0ead4aaba76f16f881553c193 100644
--- a/cc/layers/scrollbar_layer_impl.cc
+++ b/cc/layers/scrollbar_layer_impl.cc
@@ -30,11 +30,9 @@ ScrollbarLayerImpl::ScrollbarLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     ScrollbarOrientation orientation)
-    : LayerImpl(tree_impl, id),
+    : ScrollbarLayerImplBase(tree_impl, id, orientation),
       track_resource_id_(0),
       thumb_resource_id_(0),
-      current_pos_(0.f),
-      maximum_(0),
       thumb_thickness_(0),
       thumb_length_(0),
       track_start_(0),
@@ -42,24 +40,19 @@ ScrollbarLayerImpl::ScrollbarLayerImpl(
       orientation_(orientation),
       vertical_adjust_(0.f),
       visible_to_total_length_ratio_(1.f),
-      scroll_layer_id_(Layer::INVALID_ID),
-      is_overlay_scrollbar_(false) {}
+      scroll_layer_id_(Layer::INVALID_ID) {}
 
 ScrollbarLayerImpl::~ScrollbarLayerImpl() {}
 
-ScrollbarLayerImpl* ScrollbarLayerImpl::ToScrollbarLayer() {
-  return this;
-}
-
 scoped_ptr<LayerImpl> ScrollbarLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return ScrollbarLayerImpl::Create(tree_impl,
                                     id(),
-                                    orientation_).PassAs<LayerImpl>();
+                                    orientation()).PassAs<LayerImpl>();
 }
 
 void ScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
-  LayerImpl::PushPropertiesTo(layer);
+  ScrollbarLayerImplBase::PushPropertiesTo(layer);
 
   ScrollbarLayerImpl* scrollbar_layer = static_cast<ScrollbarLayerImpl*>(layer);
 
@@ -67,7 +60,6 @@ void ScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   scrollbar_layer->set_thumb_length(thumb_length_);
   scrollbar_layer->set_track_start(track_start_);
   scrollbar_layer->set_track_length(track_length_);
-  scrollbar_layer->set_is_overlay_scrollbar(is_overlay_scrollbar_);
 
   scrollbar_layer->set_track_resource_id(track_resource_id_);
   scrollbar_layer->set_thumb_resource_id(thumb_resource_id_);
@@ -75,8 +67,7 @@ void ScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
 
 bool ScrollbarLayerImpl::WillDraw(DrawMode draw_mode,
                                   ResourceProvider* resource_provider) {
-  if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE &&
-      !layer_tree_impl()->settings().solid_color_scrollbars)
+  if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)

[aelias_OOO_until_Jul13, 2013/08/14 21:26:08]

This "resourceless software" mode only arises in Android WebView which should
always fall into solid color scrollbar forcing, so let's delete this early out
entirely.

[danakj, 2013/08/14 21:31:30]

Maybe DCHECK it?

[wjmaclean, 2013/08/15 20:09:40]

Done.

[wjmaclean, 2013/08/15 20:09:40]

Done.

     return false;
   return LayerImpl::WillDraw(draw_mode, resource_provider);
 }
@@ -96,16 +87,6 @@ void ScrollbarLayerImpl::AppendQuads(QuadSink* quad_sink,
 
   gfx::Rect thumb_quad_rect = ComputeThumbQuadRect();
 
-  if (layer_tree_impl()->settings().solid_color_scrollbars) {
-    scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
-    quad->SetNew(shared_quad_state,
-                 thumb_quad_rect,
-                 layer_tree_impl()->settings().solid_color_scrollbar_color,
-                 false);
-    quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
-    return;
-  }
-
   if (thumb_resource_id_ && !thumb_quad_rect.IsEmpty()) {
     gfx::Rect opaque_rect;
     const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
@@ -148,126 +129,29 @@ void ScrollbarLayerImpl::AppendQuads(QuadSink* quad_sink,
   }
 }
 
-ScrollbarOrientation ScrollbarLayerImpl::Orientation() const {
-  return orientation_;
-}
-
-float ScrollbarLayerImpl::CurrentPos() const {
-  return current_pos_;
+void ScrollbarLayerImpl::DidLoseOutputSurface() {
+  track_resource_id_ = 0;
+  thumb_resource_id_ = 0;
 }
 
-int ScrollbarLayerImpl::Maximum() const {
-  return maximum_;
+const char* ScrollbarLayerImpl::LayerTypeAsString() const {
+  return "cc::ScrollbarLayerImpl";
 }
 
-gfx::Rect ScrollbarLayerImpl::ScrollbarLayerRectToContentRect(
-    gfx::RectF layer_rect) const {
-  // Don't intersect with the bounds as in layerRectToContentRect() because
-  // layer_rect here might be in coordinates of the containing layer.
-  gfx::RectF content_rect = gfx::ScaleRect(layer_rect,
-                                           contents_scale_x(),
-                                           contents_scale_y());
-  return gfx::ToEnclosingRect(content_rect);
+int ScrollbarLayerImpl::ThumbThickness() const {
+  return thumb_thickness_;
 }
 
-gfx::Rect ScrollbarLayerImpl::ComputeThumbQuadRect() const {
-  // Thumb extent is the length of the thumb in the scrolling direction, thumb
-  // thickness is in the perpendicular direction. Here's an example of a
-  // horizontal scrollbar - inputs are above the scrollbar, computed values
-  // below:
-  //
-  //    |<------------------- track_length_ ------------------->|
-  //
-  // |--| <-- start_offset
-  //
-  // +--+----------------------------+------------------+-------+--+
-  // |<||                            |##################|       ||>|
-  // +--+----------------------------+------------------+-------+--+
-  //
-  //                                 |<- thumb_length ->|
-  //
-  // |<------- thumb_offset -------->|
-  //
-  // For painted, scrollbars, the length is fixed. For solid color scrollbars we
-  // have to compute it. The ratio of the thumb's length to the track's length
-  // is the same as that of the visible viewport to the total viewport, unless
-  // that would make the thumb's length less than its thickness.
-  //
-  // vertical_adjust_ is used when the layer geometry from the main thread is
-  // not in sync with what the user sees. For instance on Android scrolling the
-  // top bar controls out of view reveals more of the page content. We want the
-  // root layer scrollbars to reflect what the user sees even if we haven't
-  // received new layer geometry from the main thread.  If the user has scrolled
-  // down by 50px and the initial viewport size was 950px the geometry would
-  // look something like this:
-  //
-  // vertical_adjust_ = 50, scroll position 0, visible ratios 99%
-  // Layer geometry:             Desired thumb positions:
-  // +--------------------+-+   +----------------------+   <-- 0px
-  // |                    |v|   |                     #|
-  // |                    |e|   |                     #|
-  // |                    |r|   |                     #|
-  // |                    |t|   |                     #|
-  // |                    |i|   |                     #|
-  // |                    |c|   |                     #|
-  // |                    |a|   |                     #|
-  // |                    |l|   |                     #|
-  // |                    | |   |                     #|
-  // |                    |l|   |                     #|
-  // |                    |a|   |                     #|
-  // |                    |y|   |                     #|
-  // |                    |e|   |                     #|
-  // |                    |r|   |                     #|
-  // +--------------------+-+   |                     #|
-  // | horizontal  layer  | |   |                     #|
-  // +--------------------+-+   |                     #|  <-- 950px
-  // |                      |   |                     #|
-  // |                      |   |##################### |
-  // +----------------------+   +----------------------+  <-- 1000px
-  //
-  // The layer geometry is set up for a 950px tall viewport, but the user can
-  // actually see down to 1000px. Thus we have to move the quad for the
-  // horizontal scrollbar down by the vertical_adjust_ factor and lay the
-  // vertical thumb out on a track lengthed by the vertical_adjust_ factor. This
-  // means the quads may extend outside the layer's bounds.
-
-  int thumb_length = thumb_length_;
-  float track_length = track_length_;
-  if (orientation_ == VERTICAL)
-    track_length += vertical_adjust_;
-
-  if (layer_tree_impl()->settings().solid_color_scrollbars) {
-    thumb_length = std::max(
-        static_cast<int>(visible_to_total_length_ratio_ * track_length),
-        thumb_thickness_);
-  }
-
-  // With the length known, we can compute the thumb's position.
-  float clamped_current_pos =
-      std::min(std::max(current_pos_, 0.f), static_cast<float>(maximum_));
-  float ratio = clamped_current_pos / maximum_;
-  float max_offset = track_length - thumb_length;
-  int thumb_offset = static_cast<int>(ratio * max_offset) + track_start_;
-
-  gfx::RectF thumb_rect;
-  if (orientation_ == HORIZONTAL) {
-    thumb_rect = gfx::RectF(thumb_offset, vertical_adjust_,
-                            thumb_length, thumb_thickness_);
-  } else {
-    thumb_rect = gfx::RectF(0.f, thumb_offset,
-                            thumb_thickness_, thumb_length);
-  }
-
-  return ScrollbarLayerRectToContentRect(thumb_rect);
+int ScrollbarLayerImpl::ThumbLength() const {
+  return thumb_length_;
 }
 
-void ScrollbarLayerImpl::DidLoseOutputSurface() {
-  track_resource_id_ = 0;
-  thumb_resource_id_ = 0;
+float ScrollbarLayerImpl::TrackLength() const {
+  return track_length_ + (orientation() == VERTICAL ? vertical_adjust() : 0);
 }
 
-const char* ScrollbarLayerImpl::LayerTypeAsString() const {
-  return "cc::ScrollbarLayerImpl";
+int ScrollbarLayerImpl::TrackStart() const {
+  return track_start_;
 }
 
 }  // namespace cc