Revert of Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/painted_scrollbar_layer.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.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
@@ skipping 10 matching lines @@
 namespace cc {
 
 scoped_ptr<LayerImpl> PaintedScrollbarLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return PaintedScrollbarLayerImpl::Create(
       tree_impl, id(), scrollbar_->Orientation()).PassAs<LayerImpl>();
 }
 
 scoped_refptr<PaintedScrollbarLayer> PaintedScrollbarLayer::Create(
     scoped_ptr<Scrollbar> scrollbar,
-    Layer* scroll_layer) {
+    int scroll_layer_id) {
   return make_scoped_refptr(
-      new PaintedScrollbarLayer(scrollbar.Pass(), scroll_layer));
+      new PaintedScrollbarLayer(scrollbar.Pass(), scroll_layer_id));
 }
 
 PaintedScrollbarLayer::PaintedScrollbarLayer(
     scoped_ptr<Scrollbar> scrollbar,
-    Layer* scroll_layer)
+    int scroll_layer_id)
     : scrollbar_(scrollbar.Pass()),
-      scroll_layer_(scroll_layer),
-      clip_layer_(NULL),
+      scroll_layer_id_(scroll_layer_id),
       thumb_thickness_(scrollbar_->ThumbThickness()),
       thumb_length_(scrollbar_->ThumbLength()),
       is_overlay_(scrollbar_->IsOverlay()),
       has_thumb_(scrollbar_->HasThumb()) {
   if (!scrollbar_->IsOverlay())
     SetShouldScrollOnMainThread(true);
 }
 
 PaintedScrollbarLayer::~PaintedScrollbarLayer() {}
 
 int PaintedScrollbarLayer::ScrollLayerId() const {
-  return scroll_layer_->id();
+  return scroll_layer_id_;
 }
 
-void PaintedScrollbarLayer::SetScrollLayer(scoped_refptr<Layer> layer) {
-  if (layer == scroll_layer_)
+void PaintedScrollbarLayer::SetScrollLayerId(int id) {
+  if (id == scroll_layer_id_)
     return;
 
-  scroll_layer_ = layer;
+  scroll_layer_id_ = id;
   SetNeedsFullTreeSync();
 }
 
-void PaintedScrollbarLayer::SetClipLayer(scoped_refptr<Layer> layer) {
-  if (layer == clip_layer_)
-    return;
-
-  clip_layer_ = layer;
-  SetNeedsFullTreeSync();
-}
-
 bool PaintedScrollbarLayer::OpacityCanAnimateOnImplThread() const {
   return scrollbar_->IsOverlay();
 }
 
 ScrollbarOrientation PaintedScrollbarLayer::orientation() const {
   return scrollbar_->Orientation();
 }
 
 int PaintedScrollbarLayer::MaxTextureSize() {
   DCHECK(layer_tree_host());
@@ skipping 29 matching lines @@
       page_scale_factor,
       animating_transform_to_screen,
       contents_scale_x,
       contents_scale_y,
       content_bounds);
 }
 
 void PaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
   ContentsScalingLayer::PushPropertiesTo(layer);
 
-  PushScrollClipPropertiesTo(layer);
-
   PaintedScrollbarLayerImpl* scrollbar_layer =
       static_cast<PaintedScrollbarLayerImpl*>(layer);
 
   scrollbar_layer->SetThumbThickness(thumb_thickness_);
   scrollbar_layer->SetThumbLength(thumb_length_);
   if (orientation() == HORIZONTAL) {
     scrollbar_layer->SetTrackStart(
         track_rect_.x() - location_.x());
     scrollbar_layer->SetTrackLength(track_rect_.width());
   } else {
     scrollbar_layer->SetTrackStart(
         track_rect_.y() - location_.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(is_overlay_);
 }
 
 ScrollbarLayerInterface* PaintedScrollbarLayer::ToScrollbarLayer() {
   return this;
 }
 
-void PaintedScrollbarLayer::PushScrollClipPropertiesTo(LayerImpl* layer) {
-  PaintedScrollbarLayerImpl* scrollbar_layer =
-      static_cast<PaintedScrollbarLayerImpl*>(layer);
-
-  scrollbar_layer->SetScrollLayerById(scroll_layer_ ? scroll_layer_->id()
-                                                    : Layer::INVALID_ID);
-  scrollbar_layer->SetClipLayerById(clip_layer_ ? clip_layer_->id()
-                                                : Layer::INVALID_ID);
-}
-
 void PaintedScrollbarLayer::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);
 }
@@ skipping 92 matching lines @@
 
   scrollbar_->PaintPart(&skcanvas, part, layer_rect);
   // Make sure that the pixels are no longer mutable to unavoid unnecessary
   // allocation and copying.
   skbitmap.setImmutable();
 
   return UIResourceBitmap(skbitmap);
 }
 
 }  // namespace cc