| 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/layers/painted_scrollbar_layer_impl.h" | 7 #include "cc/layers/painted_scrollbar_layer_impl.h" |
| 8 #include "cc/output/filter_operation.h" | 8 #include "cc/output/filter_operation.h" |
| 9 #include "cc/output/filter_operations.h" | 9 #include "cc/output/filter_operations.h" |
| 10 #include "cc/test/fake_impl_proxy.h" | 10 #include "cc/test/fake_impl_proxy.h" |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset()); | 490 EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->TotalScrollOffset()); |
| 491 | 491 |
| 492 EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, | 492 EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, |
| 493 layer()->ScrollDelta()), | 493 layer()->ScrollDelta()), |
| 494 layer()->TotalScrollOffset()); | 494 layer()->TotalScrollOffset()); |
| 495 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 495 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 496 } | 496 } |
| 497 | 497 |
| 498 class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate { | 498 class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate { |
| 499 public: | 499 public: |
| 500 virtual void SetTotalScrollOffset( | 500 void SetTotalScrollOffset(const gfx::ScrollOffset& new_value) override {} |
| 501 const gfx::ScrollOffset& new_value) override {} | 501 gfx::ScrollOffset GetTotalScrollOffset() override { |
| 502 virtual gfx::ScrollOffset GetTotalScrollOffset() override { | |
| 503 return gfx::ScrollOffset(fixed_offset_); | 502 return gfx::ScrollOffset(fixed_offset_); |
| 504 } | 503 } |
| 505 virtual bool IsExternalFlingActive() const override { return false; } | 504 bool IsExternalFlingActive() const override { return false; } |
| 506 | 505 |
| 507 void set_fixed_offset(const gfx::Vector2dF& fixed_offset) { | 506 void set_fixed_offset(const gfx::Vector2dF& fixed_offset) { |
| 508 fixed_offset_ = fixed_offset; | 507 fixed_offset_ = fixed_offset; |
| 509 } | 508 } |
| 510 | 509 |
| 511 private: | 510 private: |
| 512 gfx::Vector2dF fixed_offset_; | 511 gfx::Vector2dF fixed_offset_; |
| 513 }; | 512 }; |
| 514 | 513 |
| 515 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) { | 514 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 540 | 539 |
| 541 gfx::Vector2dF scroll_delta(1, 1); | 540 gfx::Vector2dF scroll_delta(1, 1); |
| 542 layer()->ScrollBy(scroll_delta); | 541 layer()->ScrollBy(scroll_delta); |
| 543 | 542 |
| 544 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); | 543 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 545 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 544 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 546 } | 545 } |
| 547 | 546 |
| 548 class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate { | 547 class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate { |
| 549 public: | 548 public: |
| 550 virtual void SetTotalScrollOffset( | 549 void SetTotalScrollOffset(const gfx::ScrollOffset& new_value) override { |
| 551 const gfx::ScrollOffset& new_value) override { | |
| 552 current_offset_ = new_value; | 550 current_offset_ = new_value; |
| 553 } | 551 } |
| 554 virtual gfx::ScrollOffset GetTotalScrollOffset() override { | 552 gfx::ScrollOffset GetTotalScrollOffset() override { return current_offset_; } |
| 555 return current_offset_; | 553 bool IsExternalFlingActive() const override { return false; } |
| 556 } | |
| 557 virtual bool IsExternalFlingActive() const override { return false; } | |
| 558 | 554 |
| 559 private: | 555 private: |
| 560 gfx::ScrollOffset current_offset_; | 556 gfx::ScrollOffset current_offset_; |
| 561 }; | 557 }; |
| 562 | 558 |
| 563 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) { | 559 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) { |
| 564 gfx::ScrollOffset scroll_offset(10, 5); | 560 gfx::ScrollOffset scroll_offset(10, 5); |
| 565 layer()->SetScrollOffset(scroll_offset); | 561 layer()->SetScrollOffset(scroll_offset); |
| 566 | 562 |
| 567 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset()); | 563 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset()); |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 layer()->id(), tree()->root_layer()->id()); | 693 layer()->id(), tree()->root_layer()->id()); |
| 698 | 694 |
| 699 int expected_horizontal_maximum = | 695 int expected_horizontal_maximum = |
| 700 layer()->bounds().width() - tree()->root_layer()->bounds().width(); | 696 layer()->bounds().width() - tree()->root_layer()->bounds().width(); |
| 701 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum()); | 697 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum()); |
| 702 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos()); | 698 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos()); |
| 703 } | 699 } |
| 704 | 700 |
| 705 } // namespace | 701 } // namespace |
| 706 } // namespace cc | 702 } // namespace cc |
| OLD | NEW |