Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 990a3848748d6970788038ee0d15f95b8d448c2f..41f6d0e5eccd07f920df39667e77ef48e44874e4 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -27,6 +27,7 @@ |
#include "cc/debug/frame_timing_request.h" |
#include "cc/input/input_handler.h" |
#include "cc/layers/draw_properties.h" |
+#include "cc/layers/event_listener_properties.h" |
#include "cc/layers/layer_lists.h" |
#include "cc/layers/layer_position_constraint.h" |
#include "cc/layers/performance_properties.h" |
@@ -496,10 +497,19 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
return should_scroll_on_main_thread_; |
} |
- void SetHaveWheelEventHandlers(bool have_wheel_event_handlers) { |
- have_wheel_event_handlers_ = have_wheel_event_handlers; |
+ void SetWheelEventProperties(EventListenerProperties wheel_event_properties) { |
+ wheel_event_properties_ = wheel_event_properties; |
+ } |
+ EventListenerProperties wheel_event_properties() const { |
+ return wheel_event_properties_; |
+ } |
+ |
+ void SetTouchEventProperties(EventListenerProperties touch_event_properties) { |
+ touch_event_properties_ = touch_event_properties; |
+ } |
+ EventListenerProperties touch_event_properties() const { |
+ return touch_event_properties_; |
} |
- bool have_wheel_event_handlers() const { return have_wheel_event_handlers_; } |
void SetHaveScrollEventHandlers(bool have_scroll_event_handlers) { |
have_scroll_event_handlers_ = have_scroll_event_handlers; |
@@ -772,7 +782,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
gfx::Vector2dF offset_to_transform_parent_; |
bool should_scroll_on_main_thread_ : 1; |
- bool have_wheel_event_handlers_ : 1; |
bool have_scroll_event_handlers_ : 1; |
static_assert(SCROLL_BLOCKS_ON_MAX < (1 << 3), "ScrollBlocksOn too big"); |
@@ -808,6 +817,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// (all content was complete). |
bool was_ever_ready_since_last_transform_animation_ : 1; |
+ EventListenerProperties touch_event_properties_; |
+ EventListenerProperties wheel_event_properties_; |
+ |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
SkColor background_color_; |