| Index: cc/trees/layer_tree_host_common_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
|
| index 495b4c8ebdd56697dd730292647df03c1598781b..e746ad85f13368969aec7b950f49a4efd05041f6 100644
|
| --- a/cc/trees/layer_tree_host_common_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_common_unittest.cc
|
| @@ -8881,11 +8881,20 @@ TEST_F(LayerTreeHostCommonTest, InputHandlersRecursiveUpdateTest) {
|
|
|
| EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
|
|
|
| - child->SetHaveWheelEventHandlers(true);
|
| + child->SetWheelEventProperties(EventListenerProperties::BLOCKING);
|
| ExecuteCalculateDrawProperties(root);
|
| EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
|
|
|
| - child->SetHaveWheelEventHandlers(false);
|
| + child->SetWheelEventProperties(EventListenerProperties::PASSIVE);
|
| + ExecuteCalculateDrawProperties(root);
|
| + EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
|
| +
|
| + child->SetWheelEventProperties(EventListenerProperties::BLOCKING |
|
| + EventListenerProperties::PASSIVE);
|
| + ExecuteCalculateDrawProperties(root);
|
| + EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
|
| +
|
| + child->SetWheelEventProperties(EventListenerProperties::NONE);
|
| ExecuteCalculateDrawProperties(root);
|
| EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
|
| }
|
| @@ -9381,7 +9390,7 @@ TEST_F(LayerTreeHostCommonTest, LayerWithInputHandlerAndZeroOpacity) {
|
| render_surface->SetMasksToBounds(true);
|
| test_layer->SetDrawsContent(true);
|
| test_layer->SetOpacity(0);
|
| - test_layer->SetHaveWheelEventHandlers(true);
|
| + test_layer->SetWheelEventProperties(EventListenerProperties::BLOCKING);
|
|
|
| ExecuteCalculateDrawProperties(root);
|
| EXPECT_EQ(gfx::Rect(20, 20), test_layer->drawable_content_rect());
|
|
|