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

Unified Diff: cc/trees/layer_tree_host_common.cc

Issue 2452303003: Revert of cc : Move screen space scale factor to root transform node (Closed)
Patch Set: resolve merge conflicts Created 4 years, 2 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
« no previous file with comments | « cc/trees/effect_node.cc ('k') | cc/trees/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index ecd848bc5af859d82cb2151a4aa3f0667a8d648c..e6ea05ea39c0b1e6e8c07c45f982b830b76ecd5a 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -580,16 +580,12 @@ void CalculateDrawPropertiesInternal(
inputs->elastic_overscroll);
// Similarly, the device viewport and device transform are shared
// by both trees.
- PropertyTrees* property_trees = inputs->property_trees;
- property_trees->clip_tree.SetViewportClip(
+ inputs->property_trees->clip_tree.SetViewportClip(
gfx::RectF(gfx::SizeF(inputs->device_viewport_size)));
- float page_scale_factor_for_root =
- inputs->page_scale_layer == inputs->root_layer
- ? inputs->page_scale_factor
- : 1.f;
- property_trees->transform_tree.SetRootTransformsAndScales(
- inputs->device_scale_factor, page_scale_factor_for_root,
+ inputs->property_trees->transform_tree.SetDeviceTransform(
inputs->device_transform, inputs->root_layer->position());
+ inputs->property_trees->transform_tree.SetDeviceTransformScaleFactor(
+ inputs->device_transform);
draw_property_utils::ComputeVisibleRects(
inputs->root_layer, inputs->property_trees,
inputs->can_render_to_separate_surface, &visible_layer_list);
« no previous file with comments | « cc/trees/effect_node.cc ('k') | cc/trees/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698