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 f0bca17f47c4b50885199d8baba41b2578ce0b16..01366c6d8421c00b2d75a810491eb76718565047 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -268,13 +268,13 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
   void SetScrollOffset(gfx::Vector2d scroll_offset);
   gfx::Vector2d scroll_offset() const { return scroll_offset_; }
+  gfx::Vector2d BlinkScrollOffset() const;
   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;
 
-  void SetScrollable(bool scrollable);
-  bool scrollable() const { return scrollable_; }
+  void SetScrollClipLayer(Layer* clip_layer);
+  bool scrollable() const { return clip_layer_; }
 
   void SetUserScrollable(bool horizontal, bool vertical);
   bool user_scrollable_horizontal() const {
@@ -572,7 +572,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   gfx::Size bounds_;
 
   gfx::Vector2d scroll_offset_;
-  gfx::Vector2d max_scroll_offset_;
+  Layer* clip_layer_;

[enne (OOO), 2014/01/02 19:28:17]

Sorry for all the naming quibbles, but could you call this clip_layer_viewport_
or scroll_clip_layer_ to make it more clear what this variable is used for? 
Layer already has clip parents and clip children, so "clip layer" is a bit
ambiguous.

Could you also leave a comment about what this variable means?

[wjmaclean, 2014/01/03 21:57:12]

No problem, done. I've renamed the corresponding vars in LayerImpl as well.

   bool scrollable_ : 1;
   bool should_scroll_on_main_thread_ : 1;
   bool have_wheel_event_handlers_ : 1;