Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 365008b8cbe727feeb35c6e6c9f0014554a08328..d7916ee690add6a2b8848f402e64963f8e9ddfe1 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -446,6 +446,9 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) { |
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( |
@@ -1531,6 +1534,9 @@ void LayerTreeHost::ToProtobufForCommit(proto::LayerTreeHost* proto) { |
event_listener_properties(EventListenerClass::kMouseWheel))); |
proto->set_touch_event_listener_properties(static_cast<uint32_t>( |
event_listener_properties(EventListenerClass::kTouch))); |
+ 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_); |
@@ -1602,6 +1608,10 @@ void LayerTreeHost::FromProtobufForCommit(const proto::LayerTreeHost& proto) { |
event_listener_properties_[static_cast<size_t>(EventListenerClass::kTouch)] = |
static_cast<EventListenerProperties>( |
proto.touch_event_listener_properties()); |
+ event_listener_properties_[static_cast<size_t>( |
+ EventListenerClass::kTouchEndOrCancel)] = |
+ static_cast<EventListenerProperties>( |
+ 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(); |