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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); | 540 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); |
541 EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta()); | 541 EXPECT_VECTOR_EQ(sent_scroll_delta, layer()->sent_scroll_delta()); |
542 | 542 |
543 layer()->ApplySentScrollDeltasFromAbortedCommit(); | 543 layer()->ApplySentScrollDeltasFromAbortedCommit(); |
544 | 544 |
545 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); | 545 EXPECT_VECTOR_EQ(scroll_offset + scroll_delta, layer()->TotalScrollOffset()); |
546 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); | 546 EXPECT_VECTOR_EQ(scroll_offset + sent_scroll_delta, layer()->scroll_offset()); |
547 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); | 547 EXPECT_VECTOR_EQ(gfx::Vector2d(), layer()->sent_scroll_delta()); |
548 } | 548 } |
549 | 549 |
550 TEST_F(LayerImplScrollTest, ScrollUserUnscrollableLayer) { | 550 // The user-scrollability breaks for zoomed-in pages. So disable this. |
| 551 // http://crbug.com/322223 |
| 552 TEST_F(LayerImplScrollTest, DISABLED_ScrollUserUnscrollableLayer) { |
551 gfx::Vector2d max_scroll_offset(50, 80); | 553 gfx::Vector2d max_scroll_offset(50, 80); |
552 gfx::Vector2d scroll_offset(10, 5); | 554 gfx::Vector2d scroll_offset(10, 5); |
553 gfx::Vector2dF scroll_delta(20.5f, 8.5f); | 555 gfx::Vector2dF scroll_delta(20.5f, 8.5f); |
554 | 556 |
555 layer()->set_user_scrollable_vertical(false); | 557 layer()->set_user_scrollable_vertical(false); |
556 layer()->SetMaxScrollOffset(max_scroll_offset); | 558 layer()->SetMaxScrollOffset(max_scroll_offset); |
557 layer()->SetScrollOffset(scroll_offset); | 559 layer()->SetScrollOffset(scroll_offset); |
558 gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta); | 560 gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta); |
559 | 561 |
560 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled); | 562 EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled); |
561 EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset()); | 563 EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->TotalScrollOffset()); |
562 } | 564 } |
563 | 565 |
564 } // namespace | 566 } // namespace |
565 } // namespace cc | 567 } // namespace cc |
OLD | NEW |