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

cc/layers/scrollbar_layer.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/layers/scrollbar_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "cc/layers/scrollbar_layer_impl.h"
@@ skipping 18 matching lines @@
 scoped_refptr<ScrollbarLayer> ScrollbarLayer::Create(
     scoped_ptr<Scrollbar> scrollbar,
     int scroll_layer_id) {
   return make_scoped_refptr(
       new ScrollbarLayer(scrollbar.Pass(), scroll_layer_id));
 }
 
 ScrollbarLayer::ScrollbarLayer(
     scoped_ptr<Scrollbar> scrollbar,
     int scroll_layer_id)
-    : scrollbar_(scrollbar.Pass()),
-      scroll_layer_id_(scroll_layer_id) {
+    : scroll_layer_id_(scroll_layer_id),
+      scrollbar_(scrollbar.Pass()) {
   if (!scrollbar_->IsOverlay())
     SetShouldScrollOnMainThread(true);
 }
 
 ScrollbarLayer::~ScrollbarLayer() {}
 
 void ScrollbarLayer::SetScrollLayerId(int id) {
   if (id == scroll_layer_id_)
     return;
 
   scroll_layer_id_ = id;
   SetNeedsFullTreeSync();
 }
 
 bool ScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return scrollbar_->IsOverlay();
 }
 
-ScrollbarOrientation ScrollbarLayer::Orientation() const {
-  return scrollbar_->Orientation();
+ScrollbarLayerInterface* ScrollbarLayer::ToScrollbarLayer() {
+  return this;
 }
 
 int ScrollbarLayer::MaxTextureSize() {
   DCHECK(layer_tree_host());
   return layer_tree_host()->GetRendererCapabilities().max_texture_size;
 }
 
+int ScrollbarLayer::ScrollLayerId() const {
+  return scroll_layer_id_;
+}
+
+ScrollbarOrientation ScrollbarLayer::orientation() const {
+  return scrollbar_->Orientation();
+}
+
 float ScrollbarLayer::ClampScaleToMaxTextureSize(float scale) {
-  if (layer_tree_host()->settings().solid_color_scrollbars)
-    return scale;
-
   // If the scaled content_bounds() is bigger than the max texture size of the
   // device, we need to clamp it by rescaling, since content_bounds() is used
   // below to set the texture size.
   gfx::Size scaled_bounds = ComputeContentBoundsForScale(scale, scale);
   if (scaled_bounds.width() > MaxTextureSize() ||
       scaled_bounds.height() > MaxTextureSize()) {
     if (scaled_bounds.width() > scaled_bounds.height())
       return (MaxTextureSize() - 1) / static_cast<float>(bounds().width());
     else
       return (MaxTextureSize() - 1) / static_cast<float>(bounds().height());
@@ skipping 16 matching lines @@
       contents_scale_x,
       contents_scale_y,
       content_bounds);
 }
 
 void ScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
   ContentsScalingLayer::PushPropertiesTo(layer);
 
   ScrollbarLayerImpl* scrollbar_layer = static_cast<ScrollbarLayerImpl*>(layer);
 
-  if (layer_tree_host() &&
-      layer_tree_host()->settings().solid_color_scrollbars) {
-    int thickness_override =
-        layer_tree_host()->settings().solid_color_scrollbar_thickness_dip;
-    if (thickness_override != -1) {
-      scrollbar_layer->SetThumbThickness(thickness_override);
-    } else {
-      if (Orientation() == HORIZONTAL)
-        scrollbar_layer->SetThumbThickness(bounds().height());
-      else
-        scrollbar_layer->SetThumbThickness(bounds().width());
-    }
-  } else {
-    scrollbar_layer->SetThumbThickness(thumb_thickness_);
-  }
+  scrollbar_layer->SetThumbThickness(thumb_thickness_);
   scrollbar_layer->SetThumbLength(thumb_length_);
-  if (Orientation() == HORIZONTAL) {
+  if (orientation() == HORIZONTAL) {
     scrollbar_layer->SetTrackStart(track_rect_.x());
     scrollbar_layer->SetTrackLength(track_rect_.width());
   } else {
     scrollbar_layer->SetTrackStart(track_rect_.y());
     scrollbar_layer->SetTrackLength(track_rect_.height());
   }
 
   if (track_resource_.get())
     scrollbar_layer->set_track_ui_resource_id(track_resource_->id());
   if (thumb_resource_.get())
     scrollbar_layer->set_thumb_ui_resource_id(thumb_resource_->id());
 
   scrollbar_layer->set_is_overlay_scrollbar(scrollbar_->IsOverlay());
 
   // ScrollbarLayer must push properties every frame. crbug.com/259095
   needs_push_properties_ = true;
 }
 
-ScrollbarLayer* ScrollbarLayer::ToScrollbarLayer() {
-  return this;
-}
-
 void ScrollbarLayer::SetLayerTreeHost(LayerTreeHost* host) {
   // When the LTH is set to null or has changed, then this layer should remove
   // all of its associated resources.
   if (!host || host != layer_tree_host()) {
     track_resource_.reset();
     thumb_resource_.reset();
   }
 
   ContentsScalingLayer::SetLayerTreeHost(host);
 }
 
 gfx::Rect ScrollbarLayer::ScrollbarLayerRectToContentRect(
     gfx::Rect 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::Rect expanded_rect = gfx::ScaleToEnclosingRect(
       layer_rect, contents_scale_y(), contents_scale_y());
   // We should never return a rect bigger than the content_bounds().
   gfx::Size clamped_size = expanded_rect.size();
   clamped_size.SetToMin(content_bounds());
   expanded_rect.set_size(clamped_size);
   return expanded_rect;
 }
 
 gfx::Rect ScrollbarLayer::OriginThumbRect() const {
   gfx::Size thumb_size;
-  if (Orientation() == HORIZONTAL) {
+  if (orientation() == HORIZONTAL) {
     thumb_size =
         gfx::Size(scrollbar_->ThumbLength(), scrollbar_->ThumbThickness());
   } else {
     thumb_size =
         gfx::Size(scrollbar_->ThumbThickness(), scrollbar_->ThumbLength());
   }
   return ScrollbarLayerRectToContentRect(gfx::Rect(thumb_size));
 }
 
 bool ScrollbarLayer::Update(ResourceUpdateQueue* queue,
                             const OcclusionTracker* occlusion) {
   track_rect_ = scrollbar_->TrackRect();
   gfx::Rect scaled_track_rect = ScrollbarLayerRectToContentRect(
       gfx::Rect(scrollbar_->Location(), bounds()));
 
-  if (layer_tree_host()->settings().solid_color_scrollbars ||
-      track_rect_.IsEmpty() || scaled_track_rect.IsEmpty())
+  if (track_rect_.IsEmpty() || scaled_track_rect.IsEmpty())
     return false;
 
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
     ContentsScalingLayer::Update(queue, occlusion);
   }
 
   track_resource_ = ScopedUIResource::Create(
       layer_tree_host(), RasterizeScrollbarPart(scaled_track_rect, TRACK));
   gfx::Rect thumb_rect = OriginThumbRect();
 
   if (scrollbar_->HasThumb() && !thumb_rect.IsEmpty()) {
     thumb_thickness_ = scrollbar_->ThumbThickness();
     thumb_length_ = scrollbar_->ThumbLength();
     thumb_resource_ = ScopedUIResource::Create(
         layer_tree_host(), RasterizeScrollbarPart(thumb_rect, THUMB));
   }
 
   return true;
 }
 
 scoped_refptr<UIResourceBitmap> ScrollbarLayer::RasterizeScrollbarPart(
     gfx::Rect rect,
     ScrollbarPart part) {
-  DCHECK(!layer_tree_host()->settings().solid_color_scrollbars);
   DCHECK(!rect.size().IsEmpty());
 
   scoped_refptr<UIResourceBitmap> bitmap =
       UIResourceBitmap::Create(new uint8_t[rect.width() * rect.height() * 4],
                                UIResourceBitmap::RGBA8,
                                rect.size());
 
   SkBitmap skbitmap;
   skbitmap.setConfig(SkBitmap::kARGB_8888_Config, rect.width(), rect.height());
   skbitmap.setPixels(bitmap->GetPixels());
@@ skipping 11 matching lines @@
   paint.setXfermodeMode(SkXfermode::kClear_Mode);
   skcanvas.drawRect(layer_skrect, paint);
   skcanvas.clipRect(layer_skrect);
 
   scrollbar_->PaintPart(&skcanvas, part, layer_rect);
 
   return bitmap;
 }
 
 }  // namespace cc