| 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..7f94244e57e4a408a54526ab59f2d5a6bb0f4fd8 100644
|
| --- a/cc/trees/layer_tree_host_unittest_scroll.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
|
| @@ -429,19 +429,14 @@ class LayerTreeHostScrollTestFractionalScroll : public LayerTreeHostScrollTest {
|
| PostSetNeedsCommitToMainThread();
|
| break;
|
| case 1:
|
| - 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));
|
| + EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), scroll_amount_);
|
| + EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF());
|
| PostSetNeedsCommitToMainThread();
|
| break;
|
| case 2:
|
| - 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));
|
| + EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(),
|
| + (scroll_amount_ + scroll_amount_));
|
| + EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF());
|
| EndTest();
|
| break;
|
| }
|
|
|