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

Side by Side Diff: cc/test/layer_tree_host_common_test.cc

Issue 1921503005: cc: Move main thread hierarchy dependencies into PropertyTreeBuilder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix telemetry unittest problem 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 | « no previous file | cc/trees/draw_property_utils.cc » ('j') | cc/trees/draw_property_utils.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/layer_tree_host_common_test.h" 5 #include "cc/test/layer_tree_host_common_test.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/layer_impl.h" 10 #include "cc/layers/layer_impl.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 } 70 }
71 71
72 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties( 72 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
73 Layer* root_layer, 73 Layer* root_layer,
74 float device_scale_factor, 74 float device_scale_factor,
75 float page_scale_factor, 75 float page_scale_factor,
76 Layer* page_scale_layer, 76 Layer* page_scale_layer,
77 bool can_use_lcd_text, 77 bool can_use_lcd_text,
78 bool layers_always_allowed_lcd_text) { 78 bool layers_always_allowed_lcd_text) {
79 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); 79 PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
80 80
81 EXPECT_TRUE(page_scale_layer || (page_scale_factor == 1.f)); 81 EXPECT_TRUE(page_scale_layer || (page_scale_factor == 1.f));
82 gfx::Transform identity_matrix; 82 gfx::Transform identity_matrix;
83 gfx::Size device_viewport_size = 83 gfx::Size device_viewport_size =
84 gfx::Size(root_layer->bounds().width() * device_scale_factor, 84 gfx::Size(root_layer->bounds().width() * device_scale_factor,
85 root_layer->bounds().height() * device_scale_factor); 85 root_layer->bounds().height() * device_scale_factor);
86 86
87 // We are probably not testing what is intended if the root_layer bounds are 87 // We are probably not testing what is intended if the root_layer bounds are
88 // empty. 88 // empty.
89 DCHECK(!root_layer->bounds().IsEmpty()); 89 DCHECK(!root_layer->bounds().IsEmpty());
90 LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs( 90 LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
91 root_layer, device_viewport_size); 91 root_layer, device_viewport_size);
92 inputs.device_scale_factor = device_scale_factor; 92 inputs.device_scale_factor = device_scale_factor;
93 inputs.page_scale_factor = page_scale_factor; 93 inputs.page_scale_factor = page_scale_factor;
94 inputs.page_scale_layer = page_scale_layer; 94 inputs.page_scale_layer = page_scale_layer;
95 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); 95 LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
96 } 96 }
97 97
98 void LayerTreeHostCommonTestBase:: 98 void LayerTreeHostCommonTestBase::
99 ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) { 99 ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) {
100 DCHECK(root_layer->layer_tree_host()); 100 DCHECK(root_layer->layer_tree_host());
101 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); 101 PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
102 102
103 gfx::Transform identity_transform; 103 gfx::Transform identity_transform;
104 104
105 bool can_render_to_separate_surface = true; 105 bool can_render_to_separate_surface = true;
106 106
107 const Layer* page_scale_layer = 107 const Layer* page_scale_layer =
108 root_layer->layer_tree_host()->page_scale_layer(); 108 root_layer->layer_tree_host()->page_scale_layer();
109 Layer* inner_viewport_scroll_layer = 109 Layer* inner_viewport_scroll_layer =
110 root_layer->layer_tree_host()->inner_viewport_scroll_layer(); 110 root_layer->layer_tree_host()->inner_viewport_scroll_layer();
111 Layer* outer_viewport_scroll_layer = 111 Layer* outer_viewport_scroll_layer =
(...skipping 21 matching lines...) Expand all
133 draw_property_utils::FindLayersThatNeedUpdates( 133 draw_property_utils::FindLayersThatNeedUpdates(
134 root_layer->layer_tree_host(), property_trees->transform_tree, 134 root_layer->layer_tree_host(), property_trees->transform_tree,
135 property_trees->effect_tree, &update_layer_list_); 135 property_trees->effect_tree, &update_layer_list_);
136 draw_property_utils::ComputeVisibleRectsForTesting( 136 draw_property_utils::ComputeVisibleRectsForTesting(
137 property_trees, can_render_to_separate_surface, &update_layer_list_); 137 property_trees, can_render_to_separate_surface, &update_layer_list_);
138 } 138 }
139 139
140 void LayerTreeHostCommonTestBase:: 140 void LayerTreeHostCommonTestBase::
141 ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) { 141 ExecuteCalculateDrawPropertiesWithPropertyTrees(LayerImpl* root_layer) {
142 DCHECK(root_layer->layer_tree_impl()); 142 DCHECK(root_layer->layer_tree_impl());
143 LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer); 143 PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
144 144
145 gfx::Transform identity_transform; 145 gfx::Transform identity_transform;
146 146
147 bool can_render_to_separate_surface = true; 147 bool can_render_to_separate_surface = true;
148 148
149 LayerImpl* page_scale_layer = nullptr; 149 LayerImpl* page_scale_layer = nullptr;
150 LayerImpl* inner_viewport_scroll_layer = 150 LayerImpl* inner_viewport_scroll_layer =
151 root_layer->layer_tree_impl()->InnerViewportScrollLayer(); 151 root_layer->layer_tree_impl()->InnerViewportScrollLayer();
152 LayerImpl* outer_viewport_scroll_layer = 152 LayerImpl* outer_viewport_scroll_layer =
153 root_layer->layer_tree_impl()->OuterViewportScrollLayer(); 153 root_layer->layer_tree_impl()->OuterViewportScrollLayer();
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 LayerTreeHostCommonTest::LayerTreeHostCommonTest() 241 LayerTreeHostCommonTest::LayerTreeHostCommonTest()
242 : LayerTreeHostCommonTestBase(LayerTreeSettings()) {} 242 : LayerTreeHostCommonTestBase(LayerTreeSettings()) {}
243 243
244 LayerTreeHostCommonTest::LayerTreeHostCommonTest( 244 LayerTreeHostCommonTest::LayerTreeHostCommonTest(
245 const LayerTreeSettings& settings) 245 const LayerTreeSettings& settings)
246 : LayerTreeHostCommonTestBase(settings) { 246 : LayerTreeHostCommonTestBase(settings) {
247 } 247 }
248 248
249 } // namespace cc 249 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/trees/draw_property_utils.cc » ('j') | cc/trees/draw_property_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698