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

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

Issue 1675963002: Move MaxScrollOffset to property_trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests failures Created 4 years, 10 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 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 void LayerTreeHostCommonTestBase:: 96 void LayerTreeHostCommonTestBase::
97 ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) { 97 ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* root_layer) {
98 DCHECK(root_layer->layer_tree_host()); 98 DCHECK(root_layer->layer_tree_host());
99 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); 99 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
100 100
101 gfx::Transform identity_transform; 101 gfx::Transform identity_transform;
102 102
103 bool can_render_to_separate_surface = true; 103 bool can_render_to_separate_surface = true;
104 104
105 Layer* page_scale_layer = nullptr; 105 const Layer* page_scale_layer =
106 root_layer->layer_tree_host()->page_scale_layer();
106 Layer* inner_viewport_scroll_layer = 107 Layer* inner_viewport_scroll_layer =
107 root_layer->layer_tree_host()->inner_viewport_scroll_layer(); 108 root_layer->layer_tree_host()->inner_viewport_scroll_layer();
108 Layer* outer_viewport_scroll_layer = 109 Layer* outer_viewport_scroll_layer =
109 root_layer->layer_tree_host()->outer_viewport_scroll_layer(); 110 root_layer->layer_tree_host()->outer_viewport_scroll_layer();
110 const Layer* overscroll_elasticity_layer = 111 const Layer* overscroll_elasticity_layer =
111 root_layer->layer_tree_host()->overscroll_elasticity_layer(); 112 root_layer->layer_tree_host()->overscroll_elasticity_layer();
112 gfx::Vector2dF elastic_overscroll = 113 gfx::Vector2dF elastic_overscroll =
113 root_layer->layer_tree_host()->elastic_overscroll(); 114 root_layer->layer_tree_host()->elastic_overscroll();
114 float page_scale_factor = 1.f; 115 float page_scale_factor = 1.f;
115 float device_scale_factor = 1.f; 116 float device_scale_factor = 1.f;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 162 }
162 163
163 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties( 164 void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
164 LayerImpl* root_layer, 165 LayerImpl* root_layer,
165 float device_scale_factor, 166 float device_scale_factor,
166 float page_scale_factor, 167 float page_scale_factor,
167 LayerImpl* page_scale_layer, 168 LayerImpl* page_scale_layer,
168 bool can_use_lcd_text, 169 bool can_use_lcd_text,
169 bool layers_always_allowed_lcd_text) { 170 bool layers_always_allowed_lcd_text) {
170 host_impl()->active_tree()->SetDeviceScaleFactor(device_scale_factor); 171 host_impl()->active_tree()->SetDeviceScaleFactor(device_scale_factor);
171 host_impl()->active_tree()->SetPageScaleOnActiveTree(page_scale_factor); 172 host_impl()->active_tree()->SetPageScaleOnActiveTreeForTesting(
173 page_scale_factor);
172 174
173 gfx::Transform identity_matrix; 175 gfx::Transform identity_matrix;
174 gfx::Size device_viewport_size = 176 gfx::Size device_viewport_size =
175 gfx::Size(root_layer->bounds().width() * device_scale_factor, 177 gfx::Size(root_layer->bounds().width() * device_scale_factor,
176 root_layer->bounds().height() * device_scale_factor); 178 root_layer->bounds().height() * device_scale_factor);
177 179
178 render_surface_layer_list_impl_.reset(new LayerImplList); 180 render_surface_layer_list_impl_.reset(new LayerImplList);
179 181
180 // We are probably not testing what is intended if the root_layer bounds are 182 // We are probably not testing what is intended if the root_layer bounds are
181 // empty. 183 // empty.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 238
237 LayerTreeHostCommonTest::LayerTreeHostCommonTest() 239 LayerTreeHostCommonTest::LayerTreeHostCommonTest()
238 : LayerTreeHostCommonTestBase(LayerTreeSettingsForCommonTest()) {} 240 : LayerTreeHostCommonTestBase(LayerTreeSettingsForCommonTest()) {}
239 241
240 LayerTreeHostCommonTest::LayerTreeHostCommonTest( 242 LayerTreeHostCommonTest::LayerTreeHostCommonTest(
241 const LayerTreeSettings& settings) 243 const LayerTreeSettings& settings)
242 : LayerTreeHostCommonTestBase(settings) { 244 : LayerTreeHostCommonTestBase(settings) {
243 } 245 }
244 246
245 } // namespace cc 247 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698