| 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/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 10539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 10550 scroll_parent5.id = 8; | 10550 scroll_parent5.id = 8; |
| 10551 scroll_parent5.owner_id = parent5->id(); | 10551 scroll_parent5.owner_id = parent5->id(); |
| 10552 scroll_parent5.contains_non_fast_scrollable_region = true; | 10552 scroll_parent5.contains_non_fast_scrollable_region = true; |
| 10553 scroll_parent5.bounds = gfx::Size(10, 10); | 10553 scroll_parent5.bounds = gfx::Size(10, 10); |
| 10554 scroll_parent5.should_flatten = true; | 10554 scroll_parent5.should_flatten = true; |
| 10555 scroll_parent5.user_scrollable_horizontal = true; | 10555 scroll_parent5.user_scrollable_horizontal = true; |
| 10556 scroll_parent5.user_scrollable_vertical = true; | 10556 scroll_parent5.user_scrollable_vertical = true; |
| 10557 scroll_parent5.transform_id = parent5->transform_tree_index(); | 10557 scroll_parent5.transform_id = parent5->transform_tree_index(); |
| 10558 expected_scroll_tree.Insert(scroll_parent5, 1); | 10558 expected_scroll_tree.Insert(scroll_parent5, 1); |
| 10559 | 10559 |
| 10560 expected_scroll_tree.SetScrollOffset(parent2->id(), gfx::ScrollOffset(0, 0)); | 10560 gfx::ScrollOffset offset; |
| 10561 expected_scroll_tree.SetScrollOffset(child7->id(), gfx::ScrollOffset(0, 0)); | 10561 gfx::ScrollOffset overscroll; |
| 10562 expected_scroll_tree.SetScrollOffset(grand_child11->id(), | 10562 expected_scroll_tree.SetScrollOffset(parent2->id(), offset, overscroll); |
| 10563 gfx::ScrollOffset(0, 0)); | 10563 expected_scroll_tree.SetScrollOffset(child7->id(), offset, overscroll); |
| 10564 expected_scroll_tree.SetScrollOffset(grand_child11->id(), offset, overscroll); |
| 10564 expected_scroll_tree.set_needs_update(false); | 10565 expected_scroll_tree.set_needs_update(false); |
| 10565 | 10566 |
| 10566 EXPECT_EQ(expected_scroll_tree, scroll_tree); | 10567 EXPECT_EQ(expected_scroll_tree, scroll_tree); |
| 10567 | 10568 |
| 10568 // Check other layers' scroll_tree_index | 10569 // Check other layers' scroll_tree_index |
| 10569 EXPECT_EQ(scroll_root1.id, page_scale_layer->scroll_tree_index()); | 10570 EXPECT_EQ(scroll_root1.id, page_scale_layer->scroll_tree_index()); |
| 10570 EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index()); | 10571 EXPECT_EQ(scroll_child6.id, grand_child10->scroll_tree_index()); |
| 10571 EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index()); | 10572 EXPECT_EQ(scroll_root1.id, parent3->scroll_tree_index()); |
| 10572 EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index()); | 10573 EXPECT_EQ(scroll_child7.id, child8->scroll_tree_index()); |
| 10573 EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index()); | 10574 EXPECT_EQ(scroll_root1.id, parent4->scroll_tree_index()); |
| 10574 EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index()); | 10575 EXPECT_EQ(scroll_root1.id, child9->scroll_tree_index()); |
| 10575 EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index()); | 10576 EXPECT_EQ(scroll_root1.id, grand_child12->scroll_tree_index()); |
| 10576 } | 10577 } |
| 10577 | 10578 |
| 10578 } // namespace | 10579 } // namespace |
| 10579 } // namespace cc | 10580 } // namespace cc |
| OLD | NEW |