| 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 d5ba0cef9f5a27fbf7c8f9aed06886ac1b4c5717..0ac0a42bf92371538c68240eb020a6df5975e284 100644
|
| --- a/cc/trees/layer_tree_host_common_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_common_unittest.cc
|
| @@ -9104,15 +9104,15 @@ TEST_F(LayerTreeHostCommonTest, InputHandlersRecursiveUpdateTest) {
|
| SetLayerPropertiesForTesting(child, identity, gfx::Point3F(), gfx::PointF(),
|
| gfx::Size(100, 100), true, false, false);
|
|
|
| - EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
|
| + EXPECT_EQ(root->layer_or_descendant_has_touch_handler(), false);
|
|
|
| - child->SetHaveWheelEventHandlers(true);
|
| + child->SetTouchEventHandlerRegion(gfx::Rect(0, 0, 100, 100));
|
| ExecuteCalculateDrawProperties(root);
|
| - EXPECT_EQ(root->layer_or_descendant_has_input_handler(), true);
|
| + EXPECT_EQ(root->layer_or_descendant_has_touch_handler(), true);
|
|
|
| - child->SetHaveWheelEventHandlers(false);
|
| + child->SetTouchEventHandlerRegion(gfx::Rect());
|
| ExecuteCalculateDrawProperties(root);
|
| - EXPECT_EQ(root->layer_or_descendant_has_input_handler(), false);
|
| + EXPECT_EQ(root->layer_or_descendant_has_touch_handler(), false);
|
| }
|
|
|
| TEST_F(LayerTreeHostCommonTest, ResetPropertyTreeIndices) {
|
| @@ -9608,7 +9608,7 @@ TEST_F(LayerTreeHostCommonTest, LayerWithInputHandlerAndZeroOpacity) {
|
| render_surface->SetMasksToBounds(true);
|
| test_layer->SetDrawsContent(true);
|
| test_layer->SetOpacity(0);
|
| - test_layer->SetHaveWheelEventHandlers(true);
|
| + test_layer->SetTouchEventHandlerRegion(gfx::Rect(0, 0, 20, 20));
|
|
|
| ExecuteCalculateDrawProperties(root);
|
| EXPECT_EQ(translation, test_layer->ScreenSpaceTransform());
|
|
|