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"
@@ skipping 16 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),
+      orientation_(scrollbar->Orientation()),
+      scrollbar_(scrollbar.Pass()),
       texture_format_(GL_INVALID_ENUM) {
   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::scroll_layer_id() const {
+  return scroll_layer_id_;
+}
+
+ScrollbarOrientation ScrollbarLayer::orientation() const {
+  return orientation_;

[enne (OOO), 2013/08/14 21:01:09]

Does this need a separate variable? What about just scrollbar_->Orientation()?

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

Done.

+}
+
 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->set_thumb_thickness(thickness_override);
-    } else {
-      if (Orientation() == HORIZONTAL)
-        scrollbar_layer->set_thumb_thickness(bounds().height());
-      else
-        scrollbar_layer->set_thumb_thickness(bounds().width());
-    }
-  } else {
-    scrollbar_layer->set_thumb_thickness(thumb_thickness_);
-  }
+  scrollbar_layer->set_thumb_thickness(thumb_thickness_);
   scrollbar_layer->set_thumb_length(thumb_length_);
-  if (Orientation() == HORIZONTAL) {
+  if (orientation() == HORIZONTAL) {
     scrollbar_layer->set_track_start(track_rect_.x());
     scrollbar_layer->set_track_length(track_rect_.width());
   } else {
     scrollbar_layer->set_track_start(track_rect_.y());
     scrollbar_layer->set_track_length(track_rect_.height());
   }
 
   if (track_ && track_->texture()->have_backing_texture())
     scrollbar_layer->set_track_resource_id(track_->texture()->resource_id());
   else
     scrollbar_layer->set_track_resource_id(0);
 
   if (thumb_ && thumb_->texture()->have_backing_texture())
     scrollbar_layer->set_thumb_resource_id(thumb_->texture()->resource_id());
   else
     scrollbar_layer->set_thumb_resource_id(0);
 
   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) {
   if (!host || host != layer_tree_host()) {
     track_updater_ = NULL;
     track_.reset();
     thumb_updater_ = NULL;
     thumb_.reset();
   }
 
   ContentsScalingLayer::SetLayerTreeHost(host);
 }
@@ skipping 11 matching lines @@
                      gfx::RectF* opaque) OVERRIDE {
     scrollbar_->PaintPart(canvas, part_, content_rect);
   }
 
  private:
   Scrollbar* scrollbar_;
   ScrollbarPart part_;
 };
 
 void ScrollbarLayer::CreateUpdaterIfNeeded() {
-  if (layer_tree_host()->settings().solid_color_scrollbars)
-    return;
-
   texture_format_ =
       layer_tree_host()->GetRendererCapabilities().best_texture_format;
 
   if (!track_updater_.get()) {
     track_updater_ = CachingBitmapContentLayerUpdater::Create(
         scoped_ptr<LayerPainter>(
             new ScrollbarPartPainter(scrollbar_.get(), TRACK))
             .Pass(),
         rendering_stats_instrumentation(),
         id());
@@ skipping 14 matching lines @@
   if (!thumb_ && scrollbar_->HasThumb()) {
     thumb_ = thumb_updater_->CreateResource(
         layer_tree_host()->contents_texture_manager());
   }
 }
 
 bool ScrollbarLayer::UpdatePart(CachingBitmapContentLayerUpdater* painter,
                                 LayerUpdater::Resource* resource,
                                 gfx::Rect rect,
                                 ResourceUpdateQueue* queue) {
-  if (layer_tree_host()->settings().solid_color_scrollbars)
-    return false;
-
   // Skip painting and uploading if there are no invalidations and
   // we already have valid texture data.
   if (resource->texture()->have_backing_texture() &&
       resource->texture()->size() == rect.size() &&
       !is_dirty())
     return false;
 
   // We should always have enough memory for UI.
   DCHECK(resource->texture()->can_acquire_backing_texture());
   if (!resource->texture()->can_acquire_backing_texture())
@@ skipping 32 matching lines @@
       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;
 }
 
 void ScrollbarLayer::SetTexturePriorities(
     const PriorityCalculator& priority_calc) {
-  if (layer_tree_host()->settings().solid_color_scrollbars)
-    return;
-
   if (content_bounds().IsEmpty())
     return;
   DCHECK_LE(content_bounds().width(), MaxTextureSize());
   DCHECK_LE(content_bounds().height(), MaxTextureSize());
 
   CreateUpdaterIfNeeded();
 
   bool draws_to_root = !render_target()->parent();
   if (track_) {
     track_->texture()->SetDimensions(content_bounds(), texture_format_);
     track_->texture()->set_request_priority(
         PriorityCalculator::UIPriority(draws_to_root));
   }
   if (thumb_) {
     gfx::Size thumb_size = OriginThumbRect().size();
     thumb_->texture()->SetDimensions(thumb_size, texture_format_);
     thumb_->texture()->set_request_priority(
         PriorityCalculator::UIPriority(draws_to_root));
   }
 }
 
 bool ScrollbarLayer::Update(ResourceUpdateQueue* queue,
                             const OcclusionTracker* occlusion) {
   track_rect_ = scrollbar_->TrackRect();
 
-  if (layer_tree_host()->settings().solid_color_scrollbars)
-    return false;
-
+  // WJM: is this specific to solid color scrollbars? probably!!

[enne (OOO), 2013/08/14 21:01:09]

This is in ScrollbarLayer, so no longer has anything to do with solid color
scrollbars?

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

Yeah, picked this one off in a recent rebase ... gone!

   bool updated = false;
 
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
     updated = ContentsScalingLayer::Update(queue, occlusion);
   }
 
   dirty_rect_.Union(update_rect_);
   if (content_bounds().IsEmpty())
@@ skipping 17 matching lines @@
                             origin_thumb_rect, queue);
     }
   }
 
   dirty_rect_ = gfx::RectF();
   return updated;
 }
 
 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));
 }
 
 }  // namespace cc