Index: cc/layers/layer.h |
diff --git a/cc/layers/layer.h b/cc/layers/layer.h |
index 94f827139fe9205e7a3df7468287e7b84224e65b..1ebcde8583be3f3b4bc427a63d991d9196400513 100644 |
--- a/cc/layers/layer.h |
+++ b/cc/layers/layer.h |
@@ -283,8 +283,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
return !!main_thread_scrolling_reasons_; |
} |
- void SetHaveWheelEventHandlers(bool have_wheel_event_handlers); |
- bool have_wheel_event_handlers() const { return have_wheel_event_handlers_; } |
+ void SetTouchEventProperties(uint32_t touch_event_properties); |
+ uint32_t touch_event_properties() const { return touch_event_properties_; } |
+ |
+ void SetWheelEventProperties(uint32_t wheel_event_properties); |
+ uint32_t wheel_event_properties() const { return wheel_event_properties_; } |
void SetHaveScrollEventHandlers(bool have_scroll_event_handlers); |
bool have_scroll_event_handlers() const { |
@@ -727,7 +730,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
gfx::Vector2dF offset_to_transform_parent_; |
uint32_t main_thread_scrolling_reasons_; |
bool should_flatten_transform_from_property_tree_ : 1; |
- bool have_wheel_event_handlers_ : 1; |
bool have_scroll_event_handlers_ : 1; |
bool user_scrollable_horizontal_ : 1; |
bool user_scrollable_vertical_ : 1; |
@@ -745,6 +747,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, |
bool transform_is_invertible_ : 1; |
bool has_render_surface_ : 1; |
ScrollBlocksOn scroll_blocks_on_ : 3; |
+ uint32_t touch_event_properties_; |
+ uint32_t wheel_event_properties_; |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
gfx::PointF position_; |