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

Side by Side Diff: cc/trees/layer_tree_host_common.h

Issue 1136643006: Fix cc unit tests that depend on verify_property_trees=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/test/layer_tree_host_common_test.cc ('k') | cc/trees/layer_tree_host_common.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 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_
6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ 6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
7 7
8 #include <limits> 8 #include <limits>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 static void UpdateRenderSurfaces(Layer* root_layer, 114 static void UpdateRenderSurfaces(Layer* root_layer,
115 bool can_render_to_separate_surface, 115 bool can_render_to_separate_surface,
116 const gfx::Transform& transform, 116 const gfx::Transform& transform,
117 bool preserves_2d_axis_alignment); 117 bool preserves_2d_axis_alignment);
118 static void UpdateRenderSurface(Layer* layer, 118 static void UpdateRenderSurface(Layer* layer,
119 bool can_render_to_separate_surface, 119 bool can_render_to_separate_surface,
120 gfx::Transform* transform, 120 gfx::Transform* transform,
121 bool* animation_preserves_axis_alignment); 121 bool* animation_preserves_axis_alignment);
122 static void CalculateDrawProperties(CalcDrawPropsMainInputs* inputs); 122 static void CalculateDrawProperties(CalcDrawPropsMainInputs* inputs);
123 static void PreCalculateMetaInformation(Layer* root_layer); 123 static void PreCalculateMetaInformation(Layer* root_layer);
124 static void PreCalculateMetaInformationForTesting(LayerImpl* root_layer);
124 125
125 typedef CalcDrawPropsInputs<LayerImpl, LayerImplList> CalcDrawPropsImplInputs; 126 typedef CalcDrawPropsInputs<LayerImpl, LayerImplList> CalcDrawPropsImplInputs;
126 typedef CalcDrawPropsInputsForTesting<LayerImpl, LayerImplList> 127 typedef CalcDrawPropsInputsForTesting<LayerImpl, LayerImplList>
127 CalcDrawPropsImplInputsForTesting; 128 CalcDrawPropsImplInputsForTesting;
128 static void CalculateDrawProperties(CalcDrawPropsImplInputs* inputs); 129 static void CalculateDrawProperties(CalcDrawPropsImplInputs* inputs);
129 static void CalculateDrawProperties( 130 static void CalculateDrawProperties(
130 CalcDrawPropsImplInputsForTesting* inputs); 131 CalcDrawPropsImplInputsForTesting* inputs);
131 132
132 template <typename LayerType> 133 template <typename LayerType>
133 static bool RenderSurfaceContributesToTarget(LayerType*, 134 static bool RenderSurfaceContributesToTarget(LayerType*,
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 render_surface_layer_list, 296 render_surface_layer_list,
296 0, 297 0,
297 GetPropertyTrees(root_layer, &temporary_property_trees)) { 298 GetPropertyTrees(root_layer, &temporary_property_trees)) {
298 DCHECK(root_layer); 299 DCHECK(root_layer);
299 DCHECK(render_surface_layer_list); 300 DCHECK(render_surface_layer_list);
300 } 301 }
301 302
302 } // namespace cc 303 } // namespace cc
303 304
304 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ 305 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_
OLDNEW
« no previous file with comments | « cc/test/layer_tree_host_common_test.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698