Index: cc/trees/layer_tree_host_impl_unittest.cc |
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc |
index 8fa0ac3a1c3b10dc753efe590013cd7b896a2bb7..aae70017d30e93f901b4fab934212f63d9ccc923 100644 |
--- a/cc/trees/layer_tree_host_impl_unittest.cc |
+++ b/cc/trees/layer_tree_host_impl_unittest.cc |
@@ -686,7 +686,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnWheelEventHandlers) { |
// With registered event handlers, wheel scrolls don't necessarily |
// have to go to the main thread. |
- root->SetHaveWheelEventHandlers(true); |
+ root->SetWheelEventProperties(EventListenerProperties::BLOCKING); |
EXPECT_EQ(InputHandler::SCROLL_STARTED, |
host_impl_->ScrollBegin(gfx::Point(), InputHandler::WHEEL)); |
host_impl_->ScrollEnd(); |
@@ -704,7 +704,7 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnWheelEventHandlers) { |
// And if the handlers go away, wheel scrolls can again be processed |
// on impl (despite the scroll-blocks-on mode). |
- root->SetHaveWheelEventHandlers(false); |
+ root->SetWheelEventProperties(EventListenerProperties::NONE); |
EXPECT_EQ(InputHandler::SCROLL_STARTED, |
host_impl_->ScrollBegin(gfx::Point(), InputHandler::WHEEL)); |
host_impl_->ScrollEnd(); |
@@ -804,7 +804,8 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnLayerTopology) { |
7, gfx::Size(10, 10), scrollable_child_clip_1.get()); |
child1 = scrollable_child_1.get(); |
scrollable_child_1->SetPosition(gfx::PointF(5.f, 5.f)); |
- scrollable_child_1->SetHaveWheelEventHandlers(true); |
+ scrollable_child_1->SetWheelEventProperties( |
+ EventListenerProperties::BLOCKING); |
scrollable_child_1->SetHaveScrollEventHandlers(true); |
scrollable_child_clip_1->AddChild(std::move(scrollable_child_1)); |
root_child->AddChild(std::move(scrollable_child_clip_1)); |
@@ -819,7 +820,8 @@ TEST_F(LayerTreeHostImplTest, ScrollBlocksOnLayerTopology) { |
9, gfx::Size(10, 10), scrollable_child_clip_2.get()); |
child2 = scrollable_child_2.get(); |
scrollable_child_2->SetPosition(gfx::PointF(5.f, 20.f)); |
- scrollable_child_2->SetHaveWheelEventHandlers(true); |
+ scrollable_child_2->SetWheelEventProperties( |
+ EventListenerProperties::BLOCKING); |
scrollable_child_2->SetHaveScrollEventHandlers(true); |
scrollable_child_clip_2->AddChild(std::move(scrollable_child_2)); |
root_child->AddChild(std::move(scrollable_child_clip_2)); |