| 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.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 scoped_refptr<Layer> replica_layer = Layer::Create(); | 710 scoped_refptr<Layer> replica_layer = Layer::Create(); |
| 711 layer_tree_host()->root_layer()->SetReplicaLayer(replica_layer.get()); | 711 layer_tree_host()->root_layer()->SetReplicaLayer(replica_layer.get()); |
| 712 break; | 712 break; |
| 713 } | 713 } |
| 714 } | 714 } |
| 715 | 715 |
| 716 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { | 716 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { |
| 717 switch (index_) { | 717 switch (index_) { |
| 718 case 0: | 718 case 0: |
| 719 impl->sync_tree()->ResetAllChangeTracking( | 719 impl->sync_tree()->ResetAllChangeTracking( |
| 720 PropertyTrees::ResetFlags::ALL_TREES); | 720 PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); |
| 721 EXPECT_FALSE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); | 721 EXPECT_FALSE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); |
| 722 PostSetNeedsCommitToMainThread(); | 722 PostSetNeedsCommitToMainThread(); |
| 723 index_++; | 723 index_++; |
| 724 break; | 724 break; |
| 725 case 1: | 725 case 1: |
| 726 EXPECT_TRUE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); | 726 EXPECT_TRUE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); |
| 727 EndTest(); | 727 EndTest(); |
| 728 break; | 728 break; |
| 729 } | 729 } |
| 730 } | 730 } |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 } | 773 } |
| 774 } | 774 } |
| 775 | 775 |
| 776 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { | 776 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { |
| 777 gfx::Transform transform; | 777 gfx::Transform transform; |
| 778 FilterOperations filters; | 778 FilterOperations filters; |
| 779 switch (static_cast<Animations>(index_)) { | 779 switch (static_cast<Animations>(index_)) { |
| 780 case OPACITY: | 780 case OPACITY: |
| 781 index_++; | 781 index_++; |
| 782 impl->active_tree()->ResetAllChangeTracking( | 782 impl->active_tree()->ResetAllChangeTracking( |
| 783 PropertyTrees::ResetFlags::ALL_TREES); | 783 PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); |
| 784 impl->active_tree()->root_layer()->OnOpacityAnimated(0.5f); | 784 impl->active_tree()->root_layer()->OnOpacityAnimated(0.5f); |
| 785 PostSetNeedsCommitToMainThread(); | 785 PostSetNeedsCommitToMainThread(); |
| 786 break; | 786 break; |
| 787 case TRANSFORM: | 787 case TRANSFORM: |
| 788 index_++; | 788 index_++; |
| 789 EXPECT_TRUE(impl->active_tree() | 789 EXPECT_TRUE(impl->active_tree() |
| 790 ->LayerById(root_->id()) | 790 ->LayerById(root_->id()) |
| 791 ->LayerPropertyChanged()); | 791 ->LayerPropertyChanged()); |
| 792 impl->active_tree()->ResetAllChangeTracking( | 792 impl->active_tree()->ResetAllChangeTracking( |
| 793 PropertyTrees::ResetFlags::EFFECT_TREE); | 793 PropertyTrees::Types::EFFECT_TREE); |
| 794 EXPECT_FALSE(impl->active_tree() | 794 EXPECT_FALSE(impl->active_tree() |
| 795 ->LayerById(root_->id()) | 795 ->LayerById(root_->id()) |
| 796 ->LayerPropertyChanged()); | 796 ->LayerPropertyChanged()); |
| 797 EXPECT_FALSE(impl->active_tree() | 797 EXPECT_FALSE(impl->active_tree() |
| 798 ->LayerById(child_->id()) | 798 ->LayerById(child_->id()) |
| 799 ->LayerPropertyChanged()); | 799 ->LayerPropertyChanged()); |
| 800 transform.Translate(10, 10); | 800 transform.Translate(10, 10); |
| 801 impl->active_tree()->root_layer()->OnTransformAnimated(transform); | 801 impl->active_tree()->root_layer()->OnTransformAnimated(transform); |
| 802 PostSetNeedsCommitToMainThread(); | 802 PostSetNeedsCommitToMainThread(); |
| 803 break; | 803 break; |
| 804 case FILTER: | 804 case FILTER: |
| 805 index_++; | 805 index_++; |
| 806 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); | 806 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); |
| 807 EXPECT_TRUE(impl->active_tree() | 807 EXPECT_TRUE(impl->active_tree() |
| 808 ->LayerById(child_->id()) | 808 ->LayerById(child_->id()) |
| 809 ->LayerPropertyChanged()); | 809 ->LayerPropertyChanged()); |
| 810 impl->active_tree()->ResetAllChangeTracking( | 810 impl->active_tree()->ResetAllChangeTracking( |
| 811 PropertyTrees::ResetFlags::TRANSFORM_TREE); | 811 PropertyTrees::Types::TRANSFORM_TREE); |
| 812 EXPECT_FALSE(impl->active_tree()->root_layer()->LayerPropertyChanged()); | 812 EXPECT_FALSE(impl->active_tree()->root_layer()->LayerPropertyChanged()); |
| 813 EXPECT_FALSE(impl->active_tree() | 813 EXPECT_FALSE(impl->active_tree() |
| 814 ->LayerById(child_->id()) | 814 ->LayerById(child_->id()) |
| 815 ->LayerPropertyChanged()); | 815 ->LayerPropertyChanged()); |
| 816 filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); | 816 filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); |
| 817 impl->active_tree()->root_layer()->OnFilterAnimated(filters); | 817 impl->active_tree()->root_layer()->OnFilterAnimated(filters); |
| 818 PostSetNeedsCommitToMainThread(); | 818 PostSetNeedsCommitToMainThread(); |
| 819 break; | 819 break; |
| 820 case END: | 820 case END: |
| 821 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); | 821 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); |
| (...skipping 5655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6477 EndTest(); | 6477 EndTest(); |
| 6478 } | 6478 } |
| 6479 | 6479 |
| 6480 void AfterTest() override {} | 6480 void AfterTest() override {} |
| 6481 }; | 6481 }; |
| 6482 | 6482 |
| 6483 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); | 6483 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); |
| 6484 | 6484 |
| 6485 } // namespace | 6485 } // namespace |
| 6486 } // namespace cc | 6486 } // namespace cc |
| OLD | NEW |