| 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 547ece77c2094128d56a6513eab8a54d588b0fe8..fce09d4e146f68b97ec07f5cca2b32a55daefde3 100644
|
| --- a/cc/trees/layer_tree_host_unittest_scroll.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| @@ -429,14 +429,19 @@ class LayerTreeHostScrollTestFractionalScroll : public LayerTreeHostScrollTest {
|
| PostSetNeedsCommitToMainThread();
|
| break;
|
| case 1:
|
| - EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), scroll_amount_);
|
| - EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF());
|
| + EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(),
|
| + gfx::ToFlooredVector2d(scroll_amount_));
|
| + EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(),
|
| + gfx::Vector2dF(fmod(scroll_amount_.x(), 1.0f), 0.0f));
|
| PostSetNeedsCommitToMainThread();
|
| break;
|
| case 2:
|
| - EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(),
|
| - (scroll_amount_ + scroll_amount_));
|
| - EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF());
|
| + EXPECT_VECTOR_EQ(
|
| + scroll_layer->BaseScrollOffset(),
|
| + gfx::ToFlooredVector2d(scroll_amount_ + scroll_amount_));
|
| + EXPECT_VECTOR_EQ(
|
| + scroll_layer->ScrollDelta(),
|
| + gfx::Vector2dF(fmod(2.0f * scroll_amount_.x(), 1.0f), 0.0f));
|
| EndTest();
|
| break;
|
| }
|
|
|