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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: cc/test/layer_tree_host_common_test.cc
diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
index f40926b4998646b290c8c446d1f3516ca9983756..1336b613e485ee2b207934471bdfaec3aa383053 100644
--- a/cc/test/layer_tree_host_common_test.cc
+++ b/cc/test/layer_tree_host_common_test.cc
@@ -102,7 +102,8 @@ void LayerTreeHostCommonTestBase::
bool can_render_to_separate_surface = true;
- Layer* page_scale_layer = nullptr;
+ const Layer* page_scale_layer =
+ root_layer->layer_tree_host()->page_scale_layer();
Layer* inner_viewport_scroll_layer =
root_layer->layer_tree_host()->inner_viewport_scroll_layer();
Layer* outer_viewport_scroll_layer =
@@ -168,7 +169,8 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
bool can_use_lcd_text,
bool layers_always_allowed_lcd_text) {
host_impl()->active_tree()->SetDeviceScaleFactor(device_scale_factor);
- host_impl()->active_tree()->SetPageScaleOnActiveTree(page_scale_factor);
+ host_impl()->active_tree()->SetPageScaleOnActiveTreeForTesting(
+ page_scale_factor);
gfx::Transform identity_matrix;
gfx::Size device_viewport_size =

Powered by Google App Engine
This is Rietveld 408576698