Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1995133002: cc : Delete ResetFlags in property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 case 1: 830 case 1:
831 scoped_refptr<Layer> replica_layer = Layer::Create(); 831 scoped_refptr<Layer> replica_layer = Layer::Create();
832 layer_tree_host()->root_layer()->SetReplicaLayer(replica_layer.get()); 832 layer_tree_host()->root_layer()->SetReplicaLayer(replica_layer.get());
833 break; 833 break;
834 } 834 }
835 } 835 }
836 836
837 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { 837 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
838 switch (index_) { 838 switch (index_) {
839 case 0: 839 case 0:
840 impl->sync_tree()->ResetAllChangeTracking( 840 impl->sync_tree()->ResetAllChangeTracking();
841 PropertyTrees::ResetFlags::ALL_TREES);
842 EXPECT_FALSE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); 841 EXPECT_FALSE(impl->sync_tree()->root_layer()->LayerPropertyChanged());
843 PostSetNeedsCommitToMainThread(); 842 PostSetNeedsCommitToMainThread();
844 index_++; 843 index_++;
845 break; 844 break;
846 case 1: 845 case 1:
847 EXPECT_TRUE(impl->sync_tree()->root_layer()->LayerPropertyChanged()); 846 EXPECT_TRUE(impl->sync_tree()->root_layer()->LayerPropertyChanged());
848 EndTest(); 847 EndTest();
849 break; 848 break;
850 } 849 }
851 } 850 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 EXPECT_FALSE(layer_tree_host()->property_trees()->needs_rebuild); 892 EXPECT_FALSE(layer_tree_host()->property_trees()->needs_rebuild);
894 } 893 }
895 } 894 }
896 895
897 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override { 896 void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
898 gfx::Transform transform; 897 gfx::Transform transform;
899 FilterOperations filters; 898 FilterOperations filters;
900 switch (static_cast<Animations>(index_)) { 899 switch (static_cast<Animations>(index_)) {
901 case OPACITY: 900 case OPACITY:
902 index_++; 901 index_++;
903 impl->active_tree()->ResetAllChangeTracking( 902 impl->active_tree()->ResetAllChangeTracking();
904 PropertyTrees::ResetFlags::ALL_TREES);
905 impl->active_tree()->root_layer()->OnOpacityAnimated(0.5f); 903 impl->active_tree()->root_layer()->OnOpacityAnimated(0.5f);
906 PostSetNeedsCommitToMainThread(); 904 PostSetNeedsCommitToMainThread();
907 break; 905 break;
908 case TRANSFORM: 906 case TRANSFORM:
909 index_++; 907 index_++;
910 EXPECT_TRUE(impl->active_tree() 908 EXPECT_TRUE(impl->active_tree()
911 ->LayerById(root_->id()) 909 ->LayerById(root_->id())
912 ->LayerPropertyChanged()); 910 ->LayerPropertyChanged());
913 impl->active_tree()->ResetAllChangeTracking( 911 impl->active_tree()->ResetAllChangeTracking();
914 PropertyTrees::ResetFlags::EFFECT_TREE);
915 EXPECT_FALSE(impl->active_tree() 912 EXPECT_FALSE(impl->active_tree()
916 ->LayerById(root_->id()) 913 ->LayerById(root_->id())
917 ->LayerPropertyChanged()); 914 ->LayerPropertyChanged());
918 EXPECT_FALSE(impl->active_tree() 915 EXPECT_FALSE(impl->active_tree()
919 ->LayerById(child_->id()) 916 ->LayerById(child_->id())
920 ->LayerPropertyChanged()); 917 ->LayerPropertyChanged());
921 transform.Translate(10, 10); 918 transform.Translate(10, 10);
922 impl->active_tree()->root_layer()->OnTransformAnimated(transform); 919 impl->active_tree()->root_layer()->OnTransformAnimated(transform);
923 PostSetNeedsCommitToMainThread(); 920 PostSetNeedsCommitToMainThread();
924 break; 921 break;
925 case FILTER: 922 case FILTER:
926 index_++; 923 index_++;
927 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); 924 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged());
928 EXPECT_TRUE(impl->active_tree() 925 EXPECT_TRUE(impl->active_tree()
929 ->LayerById(child_->id()) 926 ->LayerById(child_->id())
930 ->LayerPropertyChanged()); 927 ->LayerPropertyChanged());
931 impl->active_tree()->ResetAllChangeTracking( 928 impl->active_tree()->ResetAllChangeTracking();
932 PropertyTrees::ResetFlags::TRANSFORM_TREE);
933 EXPECT_FALSE(impl->active_tree()->root_layer()->LayerPropertyChanged()); 929 EXPECT_FALSE(impl->active_tree()->root_layer()->LayerPropertyChanged());
934 EXPECT_FALSE(impl->active_tree() 930 EXPECT_FALSE(impl->active_tree()
935 ->LayerById(child_->id()) 931 ->LayerById(child_->id())
936 ->LayerPropertyChanged()); 932 ->LayerPropertyChanged());
937 filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); 933 filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
938 impl->active_tree()->root_layer()->OnFilterAnimated(filters); 934 impl->active_tree()->root_layer()->OnFilterAnimated(filters);
939 PostSetNeedsCommitToMainThread(); 935 PostSetNeedsCommitToMainThread();
940 break; 936 break;
941 case END: 937 case END:
942 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged()); 938 EXPECT_TRUE(impl->active_tree()->root_layer()->LayerPropertyChanged());
(...skipping 5655 matching lines...) Expand 10 before | Expand all | Expand 10 after
6598 EndTest(); 6594 EndTest();
6599 } 6595 }
6600 6596
6601 void AfterTest() override {} 6597 void AfterTest() override {}
6602 }; 6598 };
6603 6599
6604 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); 6600 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
6605 6601
6606 } // namespace 6602 } // namespace
6607 } // namespace cc 6603 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698