Index: cc/layers/layer.h |
diff --git a/cc/layers/layer.h b/cc/layers/layer.h |
index e1bed9b54598040f9e0291183ec4b7b123dbb947..036212cba09024d163722315ece36e23dfc2ef1a 100644 |
--- a/cc/layers/layer.h |
+++ b/cc/layers/layer.h |
@@ -251,6 +251,15 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
void SetScrollable(bool scrollable); |
bool scrollable() const { return scrollable_; } |
+ void SetUserScrollable(bool horizontal, bool vertical) { |
+ user_scrollable_horizontal_ = horizontal; |
+ user_scrollable_vertical_ = vertical; |
danakj
2013/10/21 22:34:41
This doesn't need to SetNeedsCommit()?
sadrul
2013/10/21 23:11:17
It probably does! Done.
danakj
2013/10/21 23:30:09
Ok, can you add it to layer_unittest.cc then?
sadrul
2013/10/21 23:33:22
Done.
|
+ } |
+ bool user_scrollable_horizontal() const { |
+ return user_scrollable_horizontal_; |
+ } |
+ bool user_scrollable_vertical() const { return user_scrollable_vertical_; } |
+ |
void SetShouldScrollOnMainThread(bool should_scroll_on_main_thread); |
bool should_scroll_on_main_thread() const { |
return should_scroll_on_main_thread_; |
@@ -539,6 +548,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
bool scrollable_; |
bool should_scroll_on_main_thread_; |
bool have_wheel_event_handlers_; |
+ bool user_scrollable_horizontal_; |
+ bool user_scrollable_vertical_; |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
gfx::PointF position_; |