Revert of 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 c15cb23f833e88858401c76bcadcf7f0752aa633..5f9caf6eef0d2c236b3cfccbc73aabf8a9b08c08 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -269,10 +269,11 @@
   gfx::Vector2d scroll_offset() const { return scroll_offset_; }
   void SetScrollOffsetFromImplSide(gfx::Vector2d scroll_offset);
 
-  gfx::Vector2d MaxScrollOffset() const;
-
-  void SetScrollClipLayer(Layer* clip_layer);
-  bool scrollable() const { return !!scroll_clip_layer_; }
+  void SetMaxScrollOffset(gfx::Vector2d max_scroll_offset);
+  gfx::Vector2d max_scroll_offset() const { return max_scroll_offset_; }
+
+  void SetScrollable(bool scrollable);
+  bool scrollable() const { return scrollable_; }
 
   void SetUserScrollable(bool horizontal, bool vertical);
   bool user_scrollable_horizontal() const {
@@ -568,10 +569,7 @@
   gfx::Size bounds_;
 
   gfx::Vector2d scroll_offset_;
-  // This variable indicates which ancestor layer (if any) whose size,
-  // transformed relative to this layer, defines the maximum scroll offset for
-  // this layer.
-  Layer* scroll_clip_layer_;
+  gfx::Vector2d max_scroll_offset_;
   bool scrollable_ : 1;
   bool should_scroll_on_main_thread_ : 1;
   bool have_wheel_event_handlers_ : 1;