| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index ef5da3359dcdbb11e1b719f4fa0b30ceeb33d280..338b235e60e45a79ea2ef55f97b5b45dc3e13adc 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -23,6 +23,7 @@
|
| #include "cc/base/region.h"
|
| #include "cc/debug/frame_timing_request.h"
|
| #include "cc/debug/micro_benchmark.h"
|
| +#include "cc/layers/event_listener_properties.h"
|
| #include "cc/layers/layer_lists.h"
|
| #include "cc/layers/layer_position_constraint.h"
|
| #include "cc/layers/paint_properties.h"
|
| @@ -281,8 +282,15 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| return should_scroll_on_main_thread_;
|
| }
|
|
|
| - void SetHaveWheelEventHandlers(bool have_wheel_event_handlers);
|
| - bool have_wheel_event_handlers() const { return have_wheel_event_handlers_; }
|
| + void SetTouchEventProperties(EventListenerProperties touch_event_properties);
|
| + EventListenerProperties touch_event_properties() const {
|
| + return touch_event_properties_;
|
| + }
|
| +
|
| + void SetWheelEventProperties(EventListenerProperties wheel_event_properties);
|
| + EventListenerProperties wheel_event_properties() const {
|
| + return wheel_event_properties_;
|
| + }
|
|
|
| void SetHaveScrollEventHandlers(bool have_scroll_event_handlers);
|
| bool have_scroll_event_handlers() const {
|
| @@ -725,7 +733,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| gfx::Vector2dF offset_to_transform_parent_;
|
| bool should_flatten_transform_from_property_tree_ : 1;
|
| bool should_scroll_on_main_thread_ : 1;
|
| - bool have_wheel_event_handlers_ : 1;
|
| bool have_scroll_event_handlers_ : 1;
|
| bool user_scrollable_horizontal_ : 1;
|
| bool user_scrollable_vertical_ : 1;
|
| @@ -743,6 +750,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| bool transform_is_invertible_ : 1;
|
| bool has_render_surface_ : 1;
|
| ScrollBlocksOn scroll_blocks_on_ : 3;
|
| + EventListenerProperties touch_event_properties_;
|
| + EventListenerProperties wheel_event_properties_;
|
| Region non_fast_scrollable_region_;
|
| Region touch_event_handler_region_;
|
| gfx::PointF position_;
|
|
|