| 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 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 layer()->SetScrollOffsetDelegate(&delegate); | 520 layer()->SetScrollOffsetDelegate(&delegate); |
| 521 | 521 |
| 522 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); | 522 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); |
| 523 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 523 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 524 | 524 |
| 525 layer()->ScrollBy(gfx::Vector2dF(-100, 100)); | 525 layer()->ScrollBy(gfx::Vector2dF(-100, 100)); |
| 526 | 526 |
| 527 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); | 527 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); |
| 528 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 528 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 529 | 529 |
| 530 layer()->SetScrollOffsetDelegate(NULL); | 530 layer()->SetScrollOffsetDelegate(nullptr); |
| 531 | 531 |
| 532 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); | 532 EXPECT_VECTOR_EQ(fixed_offset, layer()->TotalScrollOffset()); |
| 533 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 533 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 534 | 534 |
| 535 gfx::Vector2dF scroll_delta(1, 1); | 535 gfx::Vector2dF scroll_delta(1, 1); |
| 536 layer()->ScrollBy(scroll_delta); | 536 layer()->ScrollBy(scroll_delta); |
| 537 | 537 |
| 538 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); | 538 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 539 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 539 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 540 } | 540 } |
| (...skipping 26 matching lines...) Expand all Loading... |
| 567 | 567 |
| 568 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset()); | 568 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset()); |
| 569 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 569 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 570 EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta()); | 570 EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta()); |
| 571 | 571 |
| 572 layer()->ScrollBy(gfx::Vector2dF(-100, 100)); | 572 layer()->ScrollBy(gfx::Vector2dF(-100, 100)); |
| 573 | 573 |
| 574 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset()); | 574 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset()); |
| 575 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 575 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 576 | 576 |
| 577 layer()->SetScrollOffsetDelegate(NULL); | 577 layer()->SetScrollOffsetDelegate(nullptr); |
| 578 | 578 |
| 579 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset()); | 579 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->TotalScrollOffset()); |
| 580 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 580 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 581 | 581 |
| 582 gfx::Vector2dF scroll_delta(1, 1); | 582 gfx::Vector2dF scroll_delta(1, 1); |
| 583 layer()->ScrollBy(scroll_delta); | 583 layer()->ScrollBy(scroll_delta); |
| 584 | 584 |
| 585 EXPECT_VECTOR_EQ(gfx::Vector2dF(1, 80), layer()->TotalScrollOffset()); | 585 EXPECT_VECTOR_EQ(gfx::Vector2dF(1, 80), layer()->TotalScrollOffset()); |
| 586 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 586 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 587 } | 587 } |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 layer()->id(), tree()->root_layer()->id()); | 693 layer()->id(), tree()->root_layer()->id()); |
| 694 | 694 |
| 695 int expected_horizontal_maximum = | 695 int expected_horizontal_maximum = |
| 696 layer()->bounds().width() - tree()->root_layer()->bounds().width(); | 696 layer()->bounds().width() - tree()->root_layer()->bounds().width(); |
| 697 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum()); | 697 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum()); |
| 698 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos()); | 698 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos()); |
| 699 } | 699 } |
| 700 | 700 |
| 701 } // namespace | 701 } // namespace |
| 702 } // namespace cc | 702 } // namespace cc |
| OLD | NEW |