Communicate whether passive event listeners exist to cc.

cc/layers/layer_unittest.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/layers/layer.h"
 
 #include <stddef.h>
 
 #include "base/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
@@ skipping 115 matching lines @@
     EXPECT_EQ(src->clip_tree_index_, dest->clip_tree_index_);
     EXPECT_EQ(src->offset_to_transform_parent_,
               dest->offset_to_transform_parent_);
     EXPECT_EQ(src->double_sided_, dest->double_sided_);
     EXPECT_EQ(src->draws_content_, dest->draws_content_);
     EXPECT_EQ(src->hide_layer_and_subtree_, dest->hide_layer_and_subtree_);
     EXPECT_EQ(src->has_render_surface_, dest->has_render_surface_);
     EXPECT_EQ(src->masks_to_bounds_, dest->masks_to_bounds_);
     EXPECT_EQ(src->should_scroll_on_main_thread_,
               dest->should_scroll_on_main_thread_);
-    EXPECT_EQ(src->have_wheel_event_handlers_,
-              dest->have_wheel_event_handlers_);
+    EXPECT_EQ(src->touch_event_properties_, dest->touch_event_properties_);
+    EXPECT_EQ(src->wheel_event_properties_, dest->wheel_event_properties_);
     EXPECT_EQ(src->have_scroll_event_handlers_,
               dest->have_scroll_event_handlers_);
     EXPECT_EQ(src->non_fast_scrollable_region_,
               dest->non_fast_scrollable_region_);
     EXPECT_EQ(src->touch_event_handler_region_,
               dest->touch_event_handler_region_);
     EXPECT_EQ(src->scroll_blocks_on_, dest->scroll_blocks_on_);
     EXPECT_EQ(src->contents_opaque_, dest->contents_opaque_);
     EXPECT_EQ(src->opacity_, dest->opacity_);
     EXPECT_EQ(src->blend_mode_, dest->blend_mode_);
@@ skipping 95 matching lines @@
     layer->transform_tree_index_ = -1;
     layer->effect_tree_index_ = -1;
     layer->clip_tree_index_ = 71;
     layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f);
     layer->double_sided_ = true;
     layer->draws_content_ = true;
     layer->hide_layer_and_subtree_ = false;
     layer->has_render_surface_ = false;
     layer->masks_to_bounds_ = true;
     layer->should_scroll_on_main_thread_ = false;
-    layer->have_wheel_event_handlers_ = true;
+    layer->touch_event_properties_ = EventListenerProperties::PASSIVE;
+    layer->wheel_event_properties_ = EventListenerProperties::BLOCKING;
     layer->have_scroll_event_handlers_ = false;
     layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
     layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
     layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_NONE;
     layer->contents_opaque_ = true;
     layer->opacity_ = 1.f;
     layer->blend_mode_ = SkXfermode::kSrcOver_Mode;
     layer->is_root_for_isolated_group_ = true;
     layer->position_ = gfx::PointF(3.14f, 6.28f);
     layer->is_container_for_fixed_position_layers_ = true;
@@ skipping 30 matching lines @@
     layer->effect_tree_index_ = 17;
     layer->clip_tree_index_ = 71;
     layer->offset_to_transform_parent_ = gfx::Vector2dF(3.14f, 1.618f);
     layer->double_sided_ = !layer->double_sided_;
     layer->draws_content_ = !layer->draws_content_;
     layer->hide_layer_and_subtree_ = !layer->hide_layer_and_subtree_;
     layer->has_render_surface_ = !layer->has_render_surface_;
     layer->masks_to_bounds_ = !layer->masks_to_bounds_;
     layer->should_scroll_on_main_thread_ =
         !layer->should_scroll_on_main_thread_;
-    layer->have_wheel_event_handlers_ = !layer->have_wheel_event_handlers_;
+    layer->touch_event_properties_ = EventListenerProperties::NONE;
+    layer->wheel_event_properties_ = EventListenerProperties::PASSIVE;
     layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_;
     layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
     layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
     layer->scroll_blocks_on_ = SCROLL_BLOCKS_ON_WHEEL_EVENT;
     layer->contents_opaque_ = !layer->contents_opaque_;
     layer->opacity_ = 3.14f;
     layer->blend_mode_ = SkXfermode::kSrcIn_Mode;
     layer->is_root_for_isolated_group_ = !layer->is_root_for_isolated_group_;
     layer->position_ = gfx::PointF(3.14f, 6.28f);
     layer->is_container_for_fixed_position_layers_ =
@@ skipping 648 matching lines @@
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetPosition(gfx::PointF(4.f, 9.f)));
   // We can use any layer pointer here since we aren't syncing for real.
   EXPECT_SET_NEEDS_COMMIT(1,
                           test_layer->SetScrollClipLayerId(test_layer->id()));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetUserScrollable(true, false));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetScrollOffset(
       gfx::ScrollOffset(10, 10)));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetShouldScrollOnMainThread(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion(
       Region(gfx::Rect(1, 1, 2, 2))));
-  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveWheelEventHandlers(true));
+  EXPECT_SET_NEEDS_COMMIT(
+      1, test_layer->SetTouchEventProperties(EventListenerProperties::PASSIVE));
+  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetWheelEventProperties(
+                                 EventListenerProperties::BLOCKING));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveScrollEventHandlers(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform(
       gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetDoubleSided(false));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTouchEventHandlerRegion(
       gfx::Rect(10, 10)));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetForceRenderSurface(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHideLayerAndSubtree(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetElementId(2));
   EXPECT_SET_NEEDS_COMMIT(
@@ skipping 1144 matching lines @@
   EXPECT_EQ(kMutablePropertyNone, impl_layer->mutable_properties());
 
   test_layer->PushPropertiesTo(impl_layer.get());
 
   EXPECT_EQ(2lu, impl_layer->element_id());
   EXPECT_EQ(kMutablePropertyTransform, impl_layer->mutable_properties());
 }
 
 }  // namespace
 }  // namespace cc