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

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: . 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
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 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 EXPECT_TRUE(root->LayerPropertyChanged()); 973 EXPECT_TRUE(root->LayerPropertyChanged());
974 EXPECT_TRUE(impl->active_tree() 974 EXPECT_TRUE(impl->active_tree()
975 ->LayerById(child_->id()) 975 ->LayerById(child_->id())
976 ->LayerPropertyChanged()); 976 ->LayerPropertyChanged());
977 impl->active_tree()->ResetAllChangeTracking(); 977 impl->active_tree()->ResetAllChangeTracking();
978 EXPECT_FALSE(root->LayerPropertyChanged()); 978 EXPECT_FALSE(root->LayerPropertyChanged());
979 EXPECT_FALSE(impl->active_tree() 979 EXPECT_FALSE(impl->active_tree()
980 ->LayerById(child_->id()) 980 ->LayerById(child_->id())
981 ->LayerPropertyChanged()); 981 ->LayerPropertyChanged());
982 filters.Append(FilterOperation::CreateOpacityFilter(0.5f)); 982 filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
983 root->OnFilterAnimated(filters); 983 impl->active_tree()->property_trees()->effect_tree.OnFilterAnimated(
984 filters, root->effect_tree_index(), impl->active_tree());
984 PostSetNeedsCommitToMainThread(); 985 PostSetNeedsCommitToMainThread();
985 break; 986 break;
986 case END: 987 case END:
987 EXPECT_TRUE(root->LayerPropertyChanged()); 988 EXPECT_TRUE(root->LayerPropertyChanged());
988 EndTest(); 989 EndTest();
989 break; 990 break;
990 } 991 }
991 } 992 }
992 993
993 void AfterTest() override {} 994 void AfterTest() override {}
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(), 1068 effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),
1068 impl->sync_tree()); 1069 impl->sync_tree());
1069 PostSetNeedsCommitToMainThread(); 1070 PostSetNeedsCommitToMainThread();
1070 break; 1071 break;
1071 case 3: 1072 case 3:
1072 EXPECT_EQ(node->opacity, 0.5f); 1073 EXPECT_EQ(node->opacity, 0.5f);
1073 PostSetNeedsCommitToMainThread(); 1074 PostSetNeedsCommitToMainThread();
1074 break; 1075 break;
1075 case 4: 1076 case 4:
1076 EXPECT_EQ(node->opacity, 0.25f); 1077 EXPECT_EQ(node->opacity, 0.25f);
1077 root->OnFilterAnimated(brightness_filter_); 1078 impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
1079 brightness_filter_, root->effect_tree_index(), impl->sync_tree());
1078 PostSetNeedsCommitToMainThread(); 1080 PostSetNeedsCommitToMainThread();
1079 break; 1081 break;
1080 case 5: 1082 case 5:
1081 EXPECT_EQ(node->filters, brightness_filter_); 1083 EXPECT_EQ(node->filters, brightness_filter_);
1082 PostSetNeedsCommitToMainThread(); 1084 PostSetNeedsCommitToMainThread();
1083 break; 1085 break;
1084 case 6: 1086 case 6:
1085 EXPECT_EQ(node->filters, brightness_filter_); 1087 EXPECT_EQ(node->filters, brightness_filter_);
1086 root->OnFilterAnimated(brightness_filter_); 1088 impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
1089 brightness_filter_, root->effect_tree_index(), impl->sync_tree());
1087 PostSetNeedsCommitToMainThread(); 1090 PostSetNeedsCommitToMainThread();
1088 break; 1091 break;
1089 case 7: 1092 case 7:
1090 EXPECT_EQ(node->filters, blur_filter_); 1093 EXPECT_EQ(node->filters, blur_filter_);
1091 PostSetNeedsCommitToMainThread(); 1094 PostSetNeedsCommitToMainThread();
1092 break; 1095 break;
1093 case 8: 1096 case 8:
1094 EXPECT_EQ(node->filters, sepia_filter_); 1097 EXPECT_EQ(node->filters, sepia_filter_);
1095 EndTest(); 1098 EndTest();
1096 break; 1099 break;
(...skipping 5929 matching lines...) Expand 10 before | Expand all | Expand 10 after
7026 private: 7029 private:
7027 FakeContentLayerClient client_; 7030 FakeContentLayerClient client_;
7028 const gfx::Size viewport_size_; 7031 const gfx::Size viewport_size_;
7029 const gfx::Size large_image_size_; 7032 const gfx::Size large_image_size_;
7030 }; 7033 };
7031 7034
7032 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage); 7035 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage);
7033 7036
7034 } // namespace 7037 } // namespace
7035 } // namespace cc 7038 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698