| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
| 6 | 6 |
| 7 #include "cc/output/filter_operation.h" | 7 #include "cc/output/filter_operation.h" |
| 8 #include "cc/output/filter_operations.h" | 8 #include "cc/output/filter_operations.h" |
| 9 #include "cc/test/fake_impl_proxy.h" | 9 #include "cc/test/fake_impl_proxy.h" |
| 10 #include "cc/test/fake_layer_tree_host_impl.h" | 10 #include "cc/test/fake_layer_tree_host_impl.h" |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 layer()->ScrollBy(gfx::Vector2dF(100, -100)); | 384 layer()->ScrollBy(gfx::Vector2dF(100, -100)); |
| 385 EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset()); | 385 EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset()); |
| 386 | 386 |
| 387 EXPECT_VECTOR_EQ(layer()->ScrollDelta() + scroll_offset, | 387 EXPECT_VECTOR_EQ(layer()->ScrollDelta() + scroll_offset, |
| 388 layer()->TotalScrollOffset()); | 388 layer()->TotalScrollOffset()); |
| 389 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 389 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 390 } | 390 } |
| 391 | 391 |
| 392 class ScrollDelegateIgnore : public LayerScrollOffsetDelegate { | 392 class ScrollDelegateIgnore : public LayerScrollOffsetDelegate { |
| 393 public: | 393 public: |
| 394 virtual void SetMaxScrollOffset(gfx::Vector2dF max_scroll_offset) OVERRIDE {} |
| 394 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE {} | 395 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE {} |
| 395 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { | 396 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { |
| 396 return fixed_offset_; | 397 return fixed_offset_; |
| 397 } | 398 } |
| 398 | 399 |
| 399 void set_fixed_offset(gfx::Vector2dF fixed_offset) { | 400 void set_fixed_offset(gfx::Vector2dF fixed_offset) { |
| 400 fixed_offset_ = fixed_offset; | 401 fixed_offset_ = fixed_offset; |
| 401 } | 402 } |
| 402 | 403 |
| 404 virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE {} |
| 405 virtual void SetScrollableSize(gfx::SizeF scrollable_size) OVERRIDE {} |
| 406 |
| 403 private: | 407 private: |
| 404 gfx::Vector2dF fixed_offset_; | 408 gfx::Vector2dF fixed_offset_; |
| 405 }; | 409 }; |
| 406 | 410 |
| 407 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) { | 411 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) { |
| 408 gfx::Vector2d max_scroll_offset(50, 80); | 412 gfx::Vector2d max_scroll_offset(50, 80); |
| 409 gfx::Vector2d scroll_offset(10, 5); | 413 gfx::Vector2d scroll_offset(10, 5); |
| 410 layer()->SetMaxScrollOffset(max_scroll_offset); | 414 layer()->SetMaxScrollOffset(max_scroll_offset); |
| 411 layer()->SetScrollOffset(scroll_offset); | 415 layer()->SetScrollOffset(scroll_offset); |
| 412 | 416 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 434 | 438 |
| 435 gfx::Vector2dF scroll_delta(1, 1); | 439 gfx::Vector2dF scroll_delta(1, 1); |
| 436 layer()->ScrollBy(scroll_delta); | 440 layer()->ScrollBy(scroll_delta); |
| 437 | 441 |
| 438 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); | 442 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 439 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 443 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 440 } | 444 } |
| 441 | 445 |
| 442 class ScrollDelegateAccept : public LayerScrollOffsetDelegate { | 446 class ScrollDelegateAccept : public LayerScrollOffsetDelegate { |
| 443 public: | 447 public: |
| 448 virtual void SetMaxScrollOffset(gfx::Vector2dF max_scroll_offset) OVERRIDE {} |
| 444 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE { | 449 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE { |
| 445 current_offset_ = new_value; | 450 current_offset_ = new_value; |
| 446 } | 451 } |
| 447 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { | 452 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { |
| 448 return current_offset_; | 453 return current_offset_; |
| 449 } | 454 } |
| 455 virtual void SetPageScaleFactor(float page_scale_factor) OVERRIDE {} |
| 456 virtual void SetScrollableSize(gfx::SizeF scrollable_size) OVERRIDE {} |
| 450 | 457 |
| 451 private: | 458 private: |
| 452 gfx::Vector2dF current_offset_; | 459 gfx::Vector2dF current_offset_; |
| 453 }; | 460 }; |
| 454 | 461 |
| 455 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) { | 462 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) { |
| 456 gfx::Vector2d max_scroll_offset(50, 80); | 463 gfx::Vector2d max_scroll_offset(50, 80); |
| 457 gfx::Vector2d scroll_offset(10, 5); | 464 gfx::Vector2d scroll_offset(10, 5); |
| 458 layer()->SetMaxScrollOffset(max_scroll_offset); | 465 layer()->SetMaxScrollOffset(max_scroll_offset); |
| 459 layer()->SetScrollOffset(scroll_offset); | 466 layer()->SetScrollOffset(scroll_offset); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 | 560 |
| 554 layer()->ApplySentScrollDeltasFromAbortedCommit(); | 561 layer()->ApplySentScrollDeltasFromAbortedCommit(); |
| 555 | 562 |
| 556 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); | 563 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 557 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); | 564 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); |
| 558 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); | 565 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); |
| 559 } | 566 } |
| 560 | 567 |
| 561 } // namespace | 568 } // namespace |
| 562 } // namespace cc | 569 } // namespace cc |
| OLD | NEW |