| 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 303e92496b4d39551075827a01b34f0af87f19c8..bd14a13c77d738c97edb02e4f9f4071fa508f4f6 100644
|
| --- a/cc/trees/layer_tree_host_unittest_scroll.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| @@ -846,15 +846,21 @@ class LayerTreeHostScrollTestScrollZeroMaxScrollOffset
|
|
|
| root->SetMaxScrollOffset(gfx::Vector2d(100, 100));
|
| EXPECT_EQ(InputHandler::ScrollStarted,
|
| - root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
|
| + root->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| + InputHandler::Gesture,
|
| + true));
|
|
|
| root->SetMaxScrollOffset(gfx::Vector2d(0, 0));
|
| EXPECT_EQ(InputHandler::ScrollIgnored,
|
| - root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
|
| + root->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| + InputHandler::Gesture,
|
| + true));
|
|
|
| root->SetMaxScrollOffset(gfx::Vector2d(-100, -100));
|
| EXPECT_EQ(InputHandler::ScrollIgnored,
|
| - root->TryScroll(gfx::PointF(0.0f, 1.0f), InputHandler::Gesture));
|
| + root->TryScroll(gfx::PointF(0.0f, 1.0f),
|
| + InputHandler::Gesture,
|
| + true));
|
|
|
| EndTest();
|
| }
|
|
|