| Index: cc/proto/layer.proto
|
| diff --git a/cc/proto/layer.proto b/cc/proto/layer.proto
|
| index 41b3f2d8086e319e7672214fa9500e90bb84cefd..7418a5e56d7970e96ee712cc1c91d9d71133370d 100644
|
| --- a/cc/proto/layer.proto
|
| +++ b/cc/proto/layer.proto
|
| @@ -85,7 +85,7 @@ message BaseLayerProperties {
|
| // repeated FilterOperation background_filters = 13;
|
| optional bool masks_to_bounds = 14;
|
| optional bool should_scroll_on_main_thread = 15;
|
| - optional bool have_wheel_event_handlers = 16;
|
| + optional int32 wheel_event_properties = 16;
|
| optional bool have_scroll_event_handlers = 17;
|
| optional Region non_fast_scrollable_region = 18;
|
| optional Region touch_event_handler_region = 19;
|
| @@ -123,11 +123,13 @@ message BaseLayerProperties {
|
| optional Rect update_rect = 46;
|
| optional bool stacking_order_changed = 47;
|
|
|
| + optional int32 touch_event_properties = 48;
|
| +
|
| // TODO(nyquist): Figure out what to do with LayerAnimationController.
|
| - // optional LayerAnimationController layer_animation_controller = 48;
|
| + // optional LayerAnimationController layer_animation_controller = 49;
|
|
|
| // TODO(nyquist): Figure out what to do with FrameTimingRequests.
|
| - // repeated FrameTimingRequest frame_timing_requests = 49;
|
| + // repeated FrameTimingRequest frame_timing_requests = 50;
|
| }
|
|
|
| message PictureLayerProperties {
|
|
|