Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 889e09ba0bbec7ef01e77d1afd7603aef1c14596..50fe93e873174d9cc08d7e780bd5a839800473a9 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -245,11 +245,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   gfx::Vector2d scroll_offset() const { return scroll_offset_; }
   void SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset);
 
-  void SetMaxScrollOffset(gfx::Vector2d max_scroll_offset);
-  gfx::Vector2d max_scroll_offset() const { return max_scroll_offset_; }
+  gfx::Vector2d MaxScrollOffset() const;
+  gfx::Vector2d TotalViewportScrollOffset() const;
 
-  void SetScrollable(bool scrollable);
-  bool scrollable() const { return scrollable_; }
+  void SetScrollable(Layer* clip_layer);
+  bool scrollable() const { return clip_layer_; }
 
   void SetUserScrollable(bool horizontal, bool vertical);
   bool user_scrollable_horizontal() const {
@@ -538,8 +538,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   gfx::Size bounds_;
 
   gfx::Vector2d scroll_offset_;
-  gfx::Vector2d max_scroll_offset_;
-  bool scrollable_;
+  Layer* clip_layer_;
   bool should_scroll_on_main_thread_;
   bool have_wheel_event_handlers_;
   bool user_scrollable_horizontal_;