Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 12ee4c0b7e76227d49a67e3120bf9cf1e5fb314b..78c39955b5804f4ab27e8cde32969502e58dccab 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -500,10 +500,15 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
return !!main_thread_scrolling_reasons_; |
} |
- void SetHaveWheelEventHandlers(bool have_wheel_event_handlers) { |
- have_wheel_event_handlers_ = have_wheel_event_handlers; |
+ void SetWheelEventProperties(uint32_t wheel_event_properties) { |
+ wheel_event_properties_ = wheel_event_properties; |
} |
- bool have_wheel_event_handlers() const { return have_wheel_event_handlers_; } |
+ uint32_t wheel_event_properties() const { return wheel_event_properties_; } |
+ |
+ void SetTouchEventProperties(uint32_t touch_event_properties) { |
+ touch_event_properties_ = touch_event_properties; |
+ } |
+ uint32_t touch_event_properties() const { return touch_event_properties_; } |
void SetHaveScrollEventHandlers(bool have_scroll_event_handlers) { |
have_scroll_event_handlers_ = have_scroll_event_handlers; |
@@ -775,7 +780,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
gfx::Vector2dF offset_to_transform_parent_; |
uint32_t main_thread_scrolling_reasons_; |
- bool have_wheel_event_handlers_ : 1; |
bool have_scroll_event_handlers_ : 1; |
static_assert(SCROLL_BLOCKS_ON_MAX < (1 << 3), "ScrollBlocksOn too big"); |
@@ -811,6 +815,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// (all content was complete). |
bool was_ever_ready_since_last_transform_animation_ : 1; |
+ uint32_t touch_event_properties_; |
+ uint32_t wheel_event_properties_; |
+ |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
SkColor background_color_; |