Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 7882bef408b54201144db7be7f935cea134e197d..3f0d58c5039ec493a169616ed8299d4e3f436ca0 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -441,11 +441,14 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) { |
sync_tree->set_has_transparent_background(has_transparent_background_); |
sync_tree->set_have_scroll_event_handlers(have_scroll_event_handlers_); |
sync_tree->set_event_listener_properties( |
- EventListenerClass::kTouch, |
- event_listener_properties(EventListenerClass::kTouch)); |
+ EventListenerClass::kTouchStartOrMove, |
+ event_listener_properties(EventListenerClass::kTouchStartOrMove)); |
sync_tree->set_event_listener_properties( |
EventListenerClass::kMouseWheel, |
event_listener_properties(EventListenerClass::kMouseWheel)); |
+ sync_tree->set_event_listener_properties( |
+ EventListenerClass::kTouchEndOrCancel, |
+ event_listener_properties(EventListenerClass::kTouchEndOrCancel)); |
if (page_scale_layer_.get() && inner_viewport_scroll_layer_.get()) { |
sync_tree->SetViewportLayersFromIds( |
@@ -1527,8 +1530,12 @@ void LayerTreeHost::ToProtobufForCommit(proto::LayerTreeHost* proto) { |
proto->set_have_scroll_event_handlers(have_scroll_event_handlers_); |
proto->set_wheel_event_listener_properties(static_cast<uint32_t>( |
event_listener_properties(EventListenerClass::kMouseWheel))); |
- proto->set_touch_event_listener_properties(static_cast<uint32_t>( |
- event_listener_properties(EventListenerClass::kTouch))); |
+ proto->set_touch_start_or_move_event_listener_properties( |
+ static_cast<uint32_t>( |
+ event_listener_properties(EventListenerClass::kTouchStartOrMove))); |
+ proto->set_touch_end_or_cancel_event_listener_properties( |
+ static_cast<uint32_t>( |
+ event_listener_properties(EventListenerClass::kTouchEndOrCancel))); |
proto->set_in_paint_layer_contents(in_paint_layer_contents_); |
proto->set_id(id_); |
proto->set_next_commit_forces_redraw(next_commit_forces_redraw_); |
@@ -1597,9 +1604,14 @@ void LayerTreeHost::FromProtobufForCommit(const proto::LayerTreeHost& proto) { |
EventListenerClass::kMouseWheel)] = |
static_cast<EventListenerProperties>( |
proto.wheel_event_listener_properties()); |
- event_listener_properties_[static_cast<size_t>(EventListenerClass::kTouch)] = |
+ event_listener_properties_[static_cast<size_t>( |
+ EventListenerClass::kTouchStartOrMove)] = |
+ static_cast<EventListenerProperties>( |
+ proto.touch_start_or_move_event_listener_properties()); |
+ event_listener_properties_[static_cast<size_t>( |
+ EventListenerClass::kTouchEndOrCancel)] = |
static_cast<EventListenerProperties>( |
- proto.touch_event_listener_properties()); |
+ proto.touch_end_or_cancel_event_listener_properties()); |
in_paint_layer_contents_ = proto.in_paint_layer_contents(); |
id_ = proto.id(); |
next_commit_forces_redraw_ = proto.next_commit_forces_redraw(); |