| 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/tree_synchronizer.h" | 5 #include "cc/trees/tree_synchronizer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 host_impl->CreatePendingTree(); | 557 host_impl->CreatePendingTree(); |
| 558 host_->CommitAndCreatePendingTree(); | 558 host_->CommitAndCreatePendingTree(); |
| 559 host_impl->ActivateSyncTree(); | 559 host_impl->ActivateSyncTree(); |
| 560 | 560 |
| 561 EXPECT_EQ(scroll_layer->id(), | 561 EXPECT_EQ(scroll_layer->id(), |
| 562 host_impl->active_tree()->CurrentlyScrollingLayer()->id()); | 562 host_impl->active_tree()->CurrentlyScrollingLayer()->id()); |
| 563 } | 563 } |
| 564 | 564 |
| 565 TEST_F(TreeSynchronizerTest, SynchronizeScrollTreeScrollOffsetMap) { | 565 TEST_F(TreeSynchronizerTest, SynchronizeScrollTreeScrollOffsetMap) { |
| 566 host_->InitializeSingleThreaded(&single_thread_client_, | 566 host_->InitializeSingleThreaded(&single_thread_client_, |
| 567 base::ThreadTaskRunnerHandle::Get(), nullptr); | 567 base::ThreadTaskRunnerHandle::Get()); |
| 568 LayerTreeSettings settings; | 568 LayerTreeSettings settings; |
| 569 FakeLayerTreeHostImplClient client; | 569 FakeLayerTreeHostImplClient client; |
| 570 FakeImplTaskRunnerProvider task_runner_provider; | 570 FakeImplTaskRunnerProvider task_runner_provider; |
| 571 FakeRenderingStatsInstrumentation stats_instrumentation; | 571 FakeRenderingStatsInstrumentation stats_instrumentation; |
| 572 TestSharedBitmapManager shared_bitmap_manager; | 572 TestSharedBitmapManager shared_bitmap_manager; |
| 573 TestTaskGraphRunner task_graph_runner; | 573 TestTaskGraphRunner task_graph_runner; |
| 574 FakeLayerTreeHostImpl* host_impl = host_->host_impl(); | 574 FakeLayerTreeHostImpl* host_impl = host_->host_impl(); |
| 575 host_impl->CreatePendingTree(); | 575 host_impl->CreatePendingTree(); |
| 576 | 576 |
| 577 scoped_refptr<Layer> layer_tree_root = Layer::Create(); | 577 scoped_refptr<Layer> layer_tree_root = Layer::Create(); |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 scroll_offset_map[scroll_layer->id()]->PullDeltaForMainThread(); | 653 scroll_offset_map[scroll_layer->id()]->PullDeltaForMainThread(); |
| 654 scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(40, 50)); | 654 scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(40, 50)); |
| 655 scroll_offset_map[scroll_layer->id()]->PushFromMainThread( | 655 scroll_offset_map[scroll_layer->id()]->PushFromMainThread( |
| 656 gfx::ScrollOffset(100, 100)); | 656 gfx::ScrollOffset(100, 100)); |
| 657 scroll_offset_map[scroll_layer->id()]->PushPendingToActive(); | 657 scroll_offset_map[scroll_layer->id()]->PushPendingToActive(); |
| 658 EXPECT_TRUE(is_equal(scroll_offset_map, scroll_tree.scroll_offset_map())); | 658 EXPECT_TRUE(is_equal(scroll_offset_map, scroll_tree.scroll_offset_map())); |
| 659 } | 659 } |
| 660 | 660 |
| 661 TEST_F(TreeSynchronizerTest, RefreshPropertyTreesCachedData) { | 661 TEST_F(TreeSynchronizerTest, RefreshPropertyTreesCachedData) { |
| 662 host_->InitializeSingleThreaded(&single_thread_client_, | 662 host_->InitializeSingleThreaded(&single_thread_client_, |
| 663 base::ThreadTaskRunnerHandle::Get(), nullptr); | 663 base::ThreadTaskRunnerHandle::Get()); |
| 664 LayerTreeSettings settings; | 664 LayerTreeSettings settings; |
| 665 FakeLayerTreeHostImplClient client; | 665 FakeLayerTreeHostImplClient client; |
| 666 FakeImplTaskRunnerProvider task_runner_provider; | 666 FakeImplTaskRunnerProvider task_runner_provider; |
| 667 FakeRenderingStatsInstrumentation stats_instrumentation; | 667 FakeRenderingStatsInstrumentation stats_instrumentation; |
| 668 TestSharedBitmapManager shared_bitmap_manager; | 668 TestSharedBitmapManager shared_bitmap_manager; |
| 669 TestTaskGraphRunner task_graph_runner; | 669 TestTaskGraphRunner task_graph_runner; |
| 670 FakeLayerTreeHostImpl* host_impl = host_->host_impl(); | 670 FakeLayerTreeHostImpl* host_impl = host_->host_impl(); |
| 671 host_impl->CreatePendingTree(); | 671 host_impl->CreatePendingTree(); |
| 672 | 672 |
| 673 scoped_refptr<Layer> layer_tree_root = Layer::Create(); | 673 scoped_refptr<Layer> layer_tree_root = Layer::Create(); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 699 host_->CommitAndCreatePendingTree(); | 699 host_->CommitAndCreatePendingTree(); |
| 700 host_impl->ActivateSyncTree(); | 700 host_impl->ActivateSyncTree(); |
| 701 EXPECT_EQ( | 701 EXPECT_EQ( |
| 702 CombinedAnimationScale(0.f, 0.f), | 702 CombinedAnimationScale(0.f, 0.f), |
| 703 host_impl->active_tree()->property_trees()->GetAnimationScales( | 703 host_impl->active_tree()->property_trees()->GetAnimationScales( |
| 704 transform_layer->transform_tree_index(), host_impl->active_tree())); | 704 transform_layer->transform_tree_index(), host_impl->active_tree())); |
| 705 } | 705 } |
| 706 | 706 |
| 707 } // namespace | 707 } // namespace |
| 708 } // namespace cc | 708 } // namespace cc |
| OLD | NEW |