cc: Make PaintedScrollbarLayer not use ContentsScalingLayer

cc/layers/painted_scrollbar_layer_impl.cc

 // Copyright 2013 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/painted_scrollbar_layer_impl.h"
 
 #include <algorithm>
 
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/layers/layer.h"
@@ skipping 14 matching lines @@
       new PaintedScrollbarLayerImpl(tree_impl, id, orientation));
 }
 
 PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     ScrollbarOrientation orientation)
     : ScrollbarLayerImplBase(tree_impl, id, orientation, false, false),
       track_ui_resource_id_(0),
       thumb_ui_resource_id_(0),
+      internal_content_scale_(1.f),
       thumb_thickness_(0),
       thumb_length_(0),
       track_start_(0),
       track_length_(0) {
 }
 
 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {}
 
 scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation());
 }
 
 void PaintedScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   ScrollbarLayerImplBase::PushPropertiesTo(layer);
 
   PaintedScrollbarLayerImpl* scrollbar_layer =
       static_cast<PaintedScrollbarLayerImpl*>(layer);
 
+  scrollbar_layer->set_internal_content_scale_and_bounds(
+      internal_content_scale_, internal_content_bounds_);
+
   scrollbar_layer->SetThumbThickness(thumb_thickness_);
   scrollbar_layer->SetThumbLength(thumb_length_);
   scrollbar_layer->SetTrackStart(track_start_);
   scrollbar_layer->SetTrackLength(track_length_);
 
   scrollbar_layer->set_track_ui_resource_id(track_ui_resource_id_);
   scrollbar_layer->set_thumb_ui_resource_id(thumb_ui_resource_id_);
 }
 
 bool PaintedScrollbarLayerImpl::WillDraw(DrawMode draw_mode,
                                   ResourceProvider* resource_provider) {
   DCHECK(draw_mode != DRAW_MODE_RESOURCELESS_SOFTWARE);
   return LayerImpl::WillDraw(draw_mode, resource_provider);
 }
 
 void PaintedScrollbarLayerImpl::AppendQuads(
     RenderPass* render_pass,
     const Occlusion& occlusion_in_content_space,
     AppendQuadsData* append_quads_data) {
   bool premultipled_alpha = true;
   bool flipped = false;
   bool nearest_neighbor = false;
   gfx::PointF uv_top_left(0.f, 0.f);
   gfx::PointF uv_bottom_right(1.f, 1.f);
   gfx::Rect bounds_rect(bounds());
-  gfx::Rect content_bounds_rect(content_bounds());
+  gfx::Rect content_bounds_rect(internal_content_bounds_);
 
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
-  PopulateSharedQuadState(shared_quad_state);
+  PopulateScaledSharedQuadState(shared_quad_state, internal_content_scale_);
 
-  AppendDebugBorderQuad(
-      render_pass, content_bounds(), shared_quad_state, append_quads_data);
+  AppendDebugBorderQuad(render_pass, internal_content_bounds_,
+                        shared_quad_state, append_quads_data);
 
   gfx::Rect thumb_quad_rect = ComputeThumbQuadRect();
   gfx::Rect visible_thumb_quad_rect =
       occlusion_in_content_space.GetUnoccludedContentRect(thumb_quad_rect);

[danakj, 2015/02/12 19:35:43]

The occlusion is in unscaled space (from the draw transform), so does this rect
work with it now?

[enne (OOO), 2015/02/12 21:55:56]

OOPS.

 
   ResourceProvider::ResourceId thumb_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_);
   ResourceProvider::ResourceId track_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_);
 
   if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
     gfx::Rect opaque_rect;
     const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
     TextureDrawQuad* quad =
@@ skipping 76 matching lines @@
 }
 
 float PaintedScrollbarLayerImpl::TrackLength() const {
   return track_length_ + (orientation() == VERTICAL ? vertical_adjust() : 0);
 }
 
 bool PaintedScrollbarLayerImpl::IsThumbResizable() const {
   return false;
 }
 
+gfx::Rect PaintedScrollbarLayerImpl::ComputeThumbQuadRect() const {
+  gfx::Rect thumb_quad_rect = ScrollbarLayerImplBase::ComputeThumbQuadRect();
+  return gfx::ScaleToEnclosingRect(thumb_quad_rect, internal_content_scale_);
+}
+
 const char* PaintedScrollbarLayerImpl::LayerTypeAsString() const {
   return "cc::PaintedScrollbarLayerImpl";
 }
 
 }  // namespace cc