Non passive touch end or touch cancel listeners should not block scroll.

cc/trees/layer_tree_host.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 423 matching lines @@
     LayerImpl* hud_impl = sync_tree->LayerById(hud_layer_->id());
     sync_tree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(hud_impl));
   } else {
     sync_tree->set_hud_layer(NULL);
   }
 
   sync_tree->set_background_color(background_color_);
   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(
         overscroll_elasticity_layer_.get() ? overscroll_elasticity_layer_->id()
                                            : Layer::INVALID_ID,
         page_scale_layer_->id(), inner_viewport_scroll_layer_->id(),
         outer_viewport_scroll_layer_.get() ? outer_viewport_scroll_layer_->id()
                                            : Layer::INVALID_ID);
     DCHECK(inner_viewport_scroll_layer_->IsContainerForFixedPositionLayers());
   } else {
@@ skipping 1063 matching lines @@
   proto->set_max_page_scale_factor(max_page_scale_factor_);
   Vector2dFToProto(elastic_overscroll_, proto->mutable_elastic_overscroll());
   proto->set_has_gpu_rasterization_trigger(has_gpu_rasterization_trigger_);
   proto->set_content_is_suitable_for_gpu_rasterization(
       content_is_suitable_for_gpu_rasterization_);
   proto->set_background_color(background_color_);
   proto->set_has_transparent_background(has_transparent_background_);
   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_);
 
   // Viewport layers.
   proto->set_overscroll_elasticity_layer_id(
       overscroll_elasticity_layer_ ? overscroll_elasticity_layer_->id()
                                    : Layer::INVALID_ID);
   proto->set_page_scale_layer_id(page_scale_layer_ ? page_scale_layer_->id()
                                                    : Layer::INVALID_ID);
@@ skipping 48 matching lines @@
   has_gpu_rasterization_trigger_ = proto.has_gpu_rasterization_trigger();
   content_is_suitable_for_gpu_rasterization_ =
       proto.content_is_suitable_for_gpu_rasterization();
   background_color_ = proto.background_color();
   has_transparent_background_ = proto.has_transparent_background();
   have_scroll_event_handlers_ = proto.have_scroll_event_handlers();
   event_listener_properties_[static_cast<size_t>(
       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_event_listener_properties());
+          proto.touch_start_or_move_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();
 
   hud_layer_ = static_cast<HeadsUpDisplayLayer*>(
       UpdateAndGetLayer(hud_layer_.get(), proto.hud_layer_id(), layer_id_map_));
   overscroll_elasticity_layer_ =
       UpdateAndGetLayer(overscroll_elasticity_layer_.get(),
                         proto.overscroll_elasticity_layer_id(), layer_id_map_);
   page_scale_layer_ = UpdateAndGetLayer(
@@ skipping 22 matching lines @@
       [seq_num](Layer* layer) {
         layer->set_property_tree_sequence_number(seq_num);
       },
       CallFunctionLayerType::ALL_LAYERS);
 
   surface_id_namespace_ = proto.surface_id_namespace();
   next_surface_sequence_ = proto.next_surface_sequence();
 }
 
 }  // namespace cc