| Index: cc/trees/layer_tree_host_unittest_scroll.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| index 1c20b4cff22708655ec66b5f9ad62b76bd42a9a4..8fb5c8b3f30e5d7be045057ac100ec313c1c3885 100644
|
| --- a/cc/trees/layer_tree_host_unittest_scroll.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| @@ -1044,21 +1044,24 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
|
| // Set max_scroll_offset = (100, 100).
|
| scroll_layer->SetBounds(
|
| gfx::Size(root->bounds().width() + 100, root->bounds().height() + 100));
|
| - EXPECT_EQ(InputHandler::ScrollStarted,
|
| - scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| - InputHandler::Gesture));
|
| + EXPECT_EQ(
|
| + InputHandler::ScrollStarted,
|
| + scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture,
|
| + ScrollBlocksOnNone));
|
|
|
| // Set max_scroll_offset = (0, 0).
|
| scroll_layer->SetBounds(root->bounds());
|
| - EXPECT_EQ(InputHandler::ScrollIgnored,
|
| - scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| - InputHandler::Gesture));
|
| + EXPECT_EQ(
|
| + InputHandler::ScrollIgnored,
|
| + scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture,
|
| + ScrollBlocksOnNone));
|
|
|
| // Set max_scroll_offset = (-100, -100).
|
| scroll_layer->SetBounds(gfx::Size());
|
| - EXPECT_EQ(InputHandler::ScrollIgnored,
|
| - scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| - InputHandler::Gesture));
|
| + EXPECT_EQ(
|
| + InputHandler::ScrollIgnored,
|
| + scroll_layer->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture,
|
| + ScrollBlocksOnNone));
|
|
|
| EndTest();
|
| }
|
|
|