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

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

Issue 2270273002: cc : Add OnFilterAnimated to effect tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 4 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/property_tree.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 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 EXPECT_TRUE(root->LayerPropertyChanged()); 976 EXPECT_TRUE(root->LayerPropertyChanged());
977 EXPECT_TRUE(impl->active_tree() 977 EXPECT_TRUE(impl->active_tree()
978 ->LayerById(child_->id()) 978 ->LayerById(child_->id())
979 ->LayerPropertyChanged()); 979 ->LayerPropertyChanged());
980 impl->active_tree()->ResetAllChangeTracking(); 980 impl->active_tree()->ResetAllChangeTracking();
981 EXPECT_FALSE(root->LayerPropertyChanged()); 981 EXPECT_FALSE(root->LayerPropertyChanged());
982 EXPECT_FALSE(impl->active_tree() 982 EXPECT_FALSE(impl->active_tree()
983 ->LayerById(child_->id()) 983 ->LayerById(child_->id())
984 ->LayerPropertyChanged()); 984 ->LayerPropertyChanged());
985 filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); 985 filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
986 root->OnFilterAnimated(filters); 986 impl->active_tree()->property_trees()->effect_tree.OnFilterAnimated(
987 filters, root->effect_tree_index(), impl->active_tree());
987 PostSetNeedsCommitToMainThread(); 988 PostSetNeedsCommitToMainThread();
988 break; 989 break;
989 case END: 990 case END:
990 EXPECT_TRUE(root->LayerPropertyChanged()); 991 EXPECT_TRUE(root->LayerPropertyChanged());
991 EndTest(); 992 EndTest();
992 break; 993 break;
993 } 994 }
994 } 995 }
995 996
996 void AfterTest() override {} 997 void AfterTest() override {}
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(), 1071 effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),
1071 impl->sync_tree()); 1072 impl->sync_tree());
1072 PostSetNeedsCommitToMainThread(); 1073 PostSetNeedsCommitToMainThread();
1073 break; 1074 break;
1074 case 3: 1075 case 3:
1075 EXPECT_EQ(node->opacity, 0.5f); 1076 EXPECT_EQ(node->opacity, 0.5f);
1076 PostSetNeedsCommitToMainThread(); 1077 PostSetNeedsCommitToMainThread();
1077 break; 1078 break;
1078 case 4: 1079 case 4:
1079 EXPECT_EQ(node->opacity, 0.25f); 1080 EXPECT_EQ(node->opacity, 0.25f);
1080 root->OnFilterAnimated(brightness_filter_); 1081 impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
1082 brightness_filter_, root->effect_tree_index(), impl->sync_tree());
1081 PostSetNeedsCommitToMainThread(); 1083 PostSetNeedsCommitToMainThread();
1082 break; 1084 break;
1083 case 5: 1085 case 5:
1084 EXPECT_EQ(node->filters, brightness_filter_); 1086 EXPECT_EQ(node->filters, brightness_filter_);
1085 PostSetNeedsCommitToMainThread(); 1087 PostSetNeedsCommitToMainThread();
1086 break; 1088 break;
1087 case 6: 1089 case 6:
1088 EXPECT_EQ(node->filters, brightness_filter_); 1090 EXPECT_EQ(node->filters, brightness_filter_);
1089 root->OnFilterAnimated(brightness_filter_); 1091 impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
1092 brightness_filter_, root->effect_tree_index(), impl->sync_tree());
1090 PostSetNeedsCommitToMainThread(); 1093 PostSetNeedsCommitToMainThread();
1091 break; 1094 break;
1092 case 7: 1095 case 7:
1093 EXPECT_EQ(node->filters, blur_filter_); 1096 EXPECT_EQ(node->filters, blur_filter_);
1094 PostSetNeedsCommitToMainThread(); 1097 PostSetNeedsCommitToMainThread();
1095 break; 1098 break;
1096 case 8: 1099 case 8:
1097 EXPECT_EQ(node->filters, sepia_filter_); 1100 EXPECT_EQ(node->filters, sepia_filter_);
1098 EndTest(); 1101 EndTest();
1099 break; 1102 break;
(...skipping 5930 matching lines...) Expand 10 before | Expand all | Expand 10 after
7030 private: 7033 private:
7031 FakeContentLayerClient client_; 7034 FakeContentLayerClient client_;
7032 const gfx::Size viewport_size_; 7035 const gfx::Size viewport_size_;
7033 const gfx::Size large_image_size_; 7036 const gfx::Size large_image_size_;
7034 }; 7037 };
7035 7038
7036 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage); 7039 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage);
7037 7040
7038 } // namespace 7041 } // namespace
7039 } // namespace cc 7042 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698