Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/scrollbar_layer_impl_base.cc

Index: cc/layers/scrollbar_layer_impl_base.cc
diff --git a/cc/layers/scrollbar_layer_impl_base.cc b/cc/layers/scrollbar_layer_impl_base.cc
index c1e7126ff52d847922c8a018a3fceebad4584f34..c941262941c98a2a4adeeafb22748d93c7dabec5 100644
--- a/cc/layers/scrollbar_layer_impl_base.cc
+++ b/cc/layers/scrollbar_layer_impl_base.cc
@@ -5,7 +5,7 @@
 #include "cc/layers/scrollbar_layer_impl_base.h"
 
 #include <algorithm>
-#include "cc/layers/layer.h"
+#include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
@@ -16,7 +16,8 @@ ScrollbarLayerImplBase::ScrollbarLayerImplBase(
     ScrollbarOrientation orientation,
     bool is_left_side_vertical_scrollbar)
     : LayerImpl(tree_impl, id),
-      scroll_layer_id_(Layer::INVALID_ID),
+      scroll_layer_(NULL),
+      clip_layer_(NULL),
       is_overlay_scrollbar_(false),
       thumb_thickness_scale_factor_(1.f),
       current_pos_(0.f),
@@ -24,16 +25,48 @@ ScrollbarLayerImplBase::ScrollbarLayerImplBase(
       orientation_(orientation),
       is_left_side_vertical_scrollbar_(is_left_side_vertical_scrollbar),
       vertical_adjust_(0.f),
-      visible_to_total_length_ratio_(1.f) {}
+      visible_to_total_length_ratio_(1.f),
+      opacity_can_animate_(false) {}
+
+ScrollbarLayerImplBase::~ScrollbarLayerImplBase() {
+}
 
 void ScrollbarLayerImplBase::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
+
+  DCHECK(layer->ToScrollbarLayer());
+  layer->ToScrollbarLayer()->SetScrollLayerById(ScrollLayerId());
+  layer->ToScrollbarLayer()->SetClipLayerById(ClipLayerId());
 }
 
 ScrollbarLayerImplBase* ScrollbarLayerImplBase::ToScrollbarLayer() {
   return this;
 }
 
+void ScrollbarLayerImplBase::SetScrollLayerById(int id) {
+  LayerImpl* scroll_layer = layer_tree_impl()->LayerById(id);
+  if (scroll_layer_ == scroll_layer)
+    return;
+
+  if (scroll_layer_)
+    scroll_layer_->RemoveScrollbar(this);
+  scroll_layer_ = scroll_layer;
+  if (scroll_layer_)
+    scroll_layer_->AddScrollbar(this);
+}
+
+void ScrollbarLayerImplBase::SetClipLayerById(int id) {
+  LayerImpl* clip_layer = layer_tree_impl()->LayerById(id);
+  if (clip_layer_ == clip_layer)
+    return;
+
+  if (clip_layer_)
+    clip_layer_->RemoveScrollbar(this);
+  clip_layer_ = clip_layer;
+  if (clip_layer_)
+    clip_layer_->AddScrollbar(this);
+}
+
 gfx::Rect ScrollbarLayerImplBase::ScrollbarLayerRectToContentRect(
     gfx::RectF layer_rect) const {
   // Don't intersect with the bounds as in LayerRectToContentRect() because
@@ -167,4 +200,11 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const {
   return ScrollbarLayerRectToContentRect(thumb_rect);
 }
 
+void ScrollbarLayerImplBase::ScrollbarParametersDidChange() {
+  if (!clip_layer_ || !scroll_layer_)
+    return;
+
+  scroll_layer_->SetScrollbarPosition(this, clip_layer_);
+}
+
 }  // namespace cc