Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7099)

Unified Diff: cc/layers/layer.h

Issue 30793002: cc: Do not allow gesture-scrolling 'overflow[-{x|y}]:hidden' layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/layers/layer.cc » ('j') | cc/layers/layer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | cc/layers/layer.cc » ('j') | cc/layers/layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698