| 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 |
| 403 private: | 404 private: |
| (...skipping 30 matching lines...) Expand all Loading... |
| 434 | 435 |
| 435 gfx::Vector2dF scroll_delta(1, 1); | 436 gfx::Vector2dF scroll_delta(1, 1); |
| 436 layer()->ScrollBy(scroll_delta); | 437 layer()->ScrollBy(scroll_delta); |
| 437 | 438 |
| 438 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); | 439 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 439 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 440 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
| 440 } | 441 } |
| 441 | 442 |
| 442 class ScrollDelegateAccept : public LayerScrollOffsetDelegate { | 443 class ScrollDelegateAccept : public LayerScrollOffsetDelegate { |
| 443 public: | 444 public: |
| 445 virtual void SetMaxScrollOffset(gfx::Vector2dF max_scroll_offset) OVERRIDE {} |
| 444 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE { | 446 virtual void SetTotalScrollOffset(gfx::Vector2dF new_value) OVERRIDE { |
| 445 current_offset_ = new_value; | 447 current_offset_ = new_value; |
| 446 } | 448 } |
| 447 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { | 449 virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE { |
| 448 return current_offset_; | 450 return current_offset_; |
| 449 } | 451 } |
| 450 | 452 |
| 451 private: | 453 private: |
| 452 gfx::Vector2dF current_offset_; | 454 gfx::Vector2dF current_offset_; |
| 453 }; | 455 }; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 | 555 |
| 554 layer()->ApplySentScrollDeltasFromAbortedCommit(); | 556 layer()->ApplySentScrollDeltasFromAbortedCommit(); |
| 555 | 557 |
| 556 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); | 558 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); |
| 557 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); | 559 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); |
| 558 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); | 560 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); |
| 559 } | 561 } |
| 560 | 562 |
| 561 } // namespace | 563 } // namespace |
| 562 } // namespace cc | 564 } // namespace cc |
| OLD | NEW |