| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 9 #include "cc/layers/layer_impl.h" | 9 #include "cc/layers/layer_impl.h" |
| 10 #include "cc/layers/picture_layer.h" | 10 #include "cc/layers/picture_layer.h" |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 | 422 |
| 423 // Check that a fractional scroll delta is correctly accumulated over | 423 // Check that a fractional scroll delta is correctly accumulated over |
| 424 // multiple commits. | 424 // multiple commits. |
| 425 switch (impl->active_tree()->source_frame_number()) { | 425 switch (impl->active_tree()->source_frame_number()) { |
| 426 case 0: | 426 case 0: |
| 427 EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), gfx::Vector2d(0, 0)); | 427 EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), gfx::Vector2d(0, 0)); |
| 428 EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2d(0, 0)); | 428 EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2d(0, 0)); |
| 429 PostSetNeedsCommitToMainThread(); | 429 PostSetNeedsCommitToMainThread(); |
| 430 break; | 430 break; |
| 431 case 1: | 431 case 1: |
| 432 EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), scroll_amount_); | 432 EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), |
| 433 EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF()); | 433 gfx::ToFlooredVector2d(scroll_amount_)); |
| 434 EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), |
| 435 gfx::Vector2dF(fmod(scroll_amount_.x(), 1.0f), 0.0f)); |
| 434 PostSetNeedsCommitToMainThread(); | 436 PostSetNeedsCommitToMainThread(); |
| 435 break; | 437 break; |
| 436 case 2: | 438 case 2: |
| 437 EXPECT_VECTOR_EQ(scroll_layer->BaseScrollOffset(), | 439 EXPECT_VECTOR_EQ( |
| 438 (scroll_amount_ + scroll_amount_)); | 440 scroll_layer->BaseScrollOffset(), |
| 439 EXPECT_VECTOR_EQ(scroll_layer->ScrollDelta(), gfx::Vector2dF()); | 441 gfx::ToFlooredVector2d(scroll_amount_ + scroll_amount_)); |
| 442 EXPECT_VECTOR_EQ( |
| 443 scroll_layer->ScrollDelta(), |
| 444 gfx::Vector2dF(fmod(2.0f * scroll_amount_.x(), 1.0f), 0.0f)); |
| 440 EndTest(); | 445 EndTest(); |
| 441 break; | 446 break; |
| 442 } | 447 } |
| 443 scroll_layer->ScrollBy(scroll_amount_); | 448 scroll_layer->ScrollBy(scroll_amount_); |
| 444 } | 449 } |
| 445 | 450 |
| 446 void AfterTest() override {} | 451 void AfterTest() override {} |
| 447 | 452 |
| 448 private: | 453 private: |
| 449 gfx::Vector2dF scroll_amount_; | 454 gfx::Vector2dF scroll_amount_; |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1229 RunTest(true, false, true); | 1234 RunTest(true, false, true); |
| 1230 } | 1235 } |
| 1231 | 1236 |
| 1232 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1237 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
| 1233 scroll_destroy_whole_tree_ = true; | 1238 scroll_destroy_whole_tree_ = true; |
| 1234 RunTest(true, false, true); | 1239 RunTest(true, false, true); |
| 1235 } | 1240 } |
| 1236 | 1241 |
| 1237 } // namespace | 1242 } // namespace |
| 1238 } // namespace cc | 1243 } // namespace cc |
| OLD | NEW |