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

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

Issue 2269143003: cc : Add OnTransformAnimated to transform tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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_host_unittest_picture.cc » ('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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 ->LayerById(root_->id()) 958 ->LayerById(root_->id())
959 ->LayerPropertyChanged()); 959 ->LayerPropertyChanged());
960 impl->active_tree()->ResetAllChangeTracking(); 960 impl->active_tree()->ResetAllChangeTracking();
961 EXPECT_FALSE(impl->active_tree() 961 EXPECT_FALSE(impl->active_tree()
962 ->LayerById(root_->id()) 962 ->LayerById(root_->id())
963 ->LayerPropertyChanged()); 963 ->LayerPropertyChanged());
964 EXPECT_FALSE(impl->active_tree() 964 EXPECT_FALSE(impl->active_tree()
965 ->LayerById(child_->id()) 965 ->LayerById(child_->id())
966 ->LayerPropertyChanged()); 966 ->LayerPropertyChanged());
967 transform.Translate(10, 10); 967 transform.Translate(10, 10);
968 root->OnTransformAnimated(transform); 968 impl->active_tree()
969 ->property_trees()
970 ->transform_tree.OnTransformAnimated(
971 transform, root->transform_tree_index(), impl->active_tree());
969 PostSetNeedsCommitToMainThread(); 972 PostSetNeedsCommitToMainThread();
970 break; 973 break;
971 case FILTER: 974 case FILTER:
972 index_++; 975 index_++;
973 EXPECT_TRUE(root->LayerPropertyChanged()); 976 EXPECT_TRUE(root->LayerPropertyChanged());
974 EXPECT_TRUE(impl->active_tree() 977 EXPECT_TRUE(impl->active_tree()
975 ->LayerById(child_->id()) 978 ->LayerById(child_->id())
976 ->LayerPropertyChanged()); 979 ->LayerPropertyChanged());
977 impl->active_tree()->ResetAllChangeTracking(); 980 impl->active_tree()->ResetAllChangeTracking();
978 EXPECT_FALSE(root->LayerPropertyChanged()); 981 EXPECT_FALSE(root->LayerPropertyChanged());
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 TransformTree& transform_tree = 1149 TransformTree& transform_tree =
1147 impl->sync_tree()->property_trees()->transform_tree; 1150 impl->sync_tree()->property_trees()->transform_tree;
1148 TransformNode* node = transform_tree.Node( 1151 TransformNode* node = transform_tree.Node(
1149 impl->sync_tree()->root_layer_for_testing()->transform_tree_index()); 1152 impl->sync_tree()->root_layer_for_testing()->transform_tree_index());
1150 gfx::Transform rotate10; 1153 gfx::Transform rotate10;
1151 rotate10.Rotate(10.f); 1154 rotate10.Rotate(10.f);
1152 gfx::Transform rotate20; 1155 gfx::Transform rotate20;
1153 rotate20.Rotate(20.f); 1156 rotate20.Rotate(20.f);
1154 switch (impl->sync_tree()->source_frame_number()) { 1157 switch (impl->sync_tree()->source_frame_number()) {
1155 case 0: 1158 case 0:
1156 impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated( 1159 impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(
1157 rotate20); 1160 rotate20, node->id, impl->sync_tree());
1158 PostSetNeedsCommitToMainThread(); 1161 PostSetNeedsCommitToMainThread();
1159 break; 1162 break;
1160 case 1: 1163 case 1:
1161 EXPECT_EQ(node->local, rotate20); 1164 EXPECT_EQ(node->local, rotate20);
1162 PostSetNeedsCommitToMainThread(); 1165 PostSetNeedsCommitToMainThread();
1163 break; 1166 break;
1164 case 2: 1167 case 2:
1165 EXPECT_EQ(node->local, rotate20); 1168 EXPECT_EQ(node->local, rotate20);
1166 impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated( 1169 impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(
1167 rotate20); 1170 rotate20, node->id, impl->sync_tree());
1168 PostSetNeedsCommitToMainThread(); 1171 PostSetNeedsCommitToMainThread();
1169 break; 1172 break;
1170 case 3: 1173 case 3:
1171 EXPECT_EQ(node->local, rotate10); 1174 EXPECT_EQ(node->local, rotate10);
1172 PostSetNeedsCommitToMainThread(); 1175 PostSetNeedsCommitToMainThread();
1173 break; 1176 break;
1174 case 4: 1177 case 4:
1175 EXPECT_EQ(node->local, gfx::Transform()); 1178 EXPECT_EQ(node->local, gfx::Transform());
1176 EndTest(); 1179 EndTest();
1177 } 1180 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 EndTest(); 1240 EndTest();
1238 } 1241 }
1239 1242
1240 return draw_result; 1243 return draw_result;
1241 } 1244 }
1242 1245
1243 void DrawLayersOnThread(LayerTreeHostImpl* impl) override { 1246 void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
1244 if (impl->active_tree()->source_frame_number() == 0) { 1247 if (impl->active_tree()->source_frame_number() == 0) {
1245 gfx::Transform scale; 1248 gfx::Transform scale;
1246 scale.Scale(2.0, 2.0); 1249 scale.Scale(2.0, 2.0);
1247 impl->active_tree()->LayerById(child_->id())->OnTransformAnimated(scale); 1250 impl->active_tree()->property_trees()->transform_tree.OnTransformAnimated(
1251 scale, child_->transform_tree_index(), impl->active_tree());
1248 } 1252 }
1249 } 1253 }
1250 1254
1251 void AfterTest() override {} 1255 void AfterTest() override {}
1252 1256
1253 private: 1257 private:
1254 scoped_refptr<Layer> root_; 1258 scoped_refptr<Layer> root_;
1255 scoped_refptr<Layer> child_; 1259 scoped_refptr<Layer> child_;
1256 scoped_refptr<Layer> grand_child_; 1260 scoped_refptr<Layer> grand_child_;
1257 }; 1261 };
(...skipping 5768 matching lines...) Expand 10 before | Expand all | Expand 10 after
7026 private: 7030 private:
7027 FakeContentLayerClient client_; 7031 FakeContentLayerClient client_;
7028 const gfx::Size viewport_size_; 7032 const gfx::Size viewport_size_;
7029 const gfx::Size large_image_size_; 7033 const gfx::Size large_image_size_;
7030 }; 7034 };
7031 7035
7032 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage); 7036 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage);
7033 7037
7034 } // namespace 7038 } // namespace
7035 } // namespace cc 7039 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698