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

Unified Diff: cc/trees/layer_tree_host_common.cc

Issue 271533011: cc: Move tiling management out of draw properties calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + update test Created 6 years, 6 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/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 2335f4e0315b29726af6279526ed3c26955ca29f..a4f8194b2ad5abbb05e8fe91036304d9de4ecb17 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -81,7 +81,7 @@ inline gfx::Rect CalculateVisibleRectWithCachedLayerRect(
minimal_surface_rect.Intersect(layer_rect_in_target_space);
if (minimal_surface_rect.IsEmpty())
- return gfx::Rect();
+ return gfx::Rect();
// Project the corners of the target surface rect into the layer space.
// This bounding rectangle may be larger than it needs to be (being
@@ -1740,6 +1740,15 @@ static void CalculateDrawPropertiesInternal(
combined_maximum_animation_contents_scale,
animating_transform_to_screen);
+ layer_draw_properties.ideal_contents_scale = ideal_contents_scale;
danakj 2014/06/11 19:48:35 Notice that CalculateContentsScale() in this file
sohanjg 2014/06/12 11:48:24 Done.
+ layer_draw_properties.maximum_animation_contents_scale =
+ combined_maximum_animation_contents_scale;
+ layer_draw_properties.page_scale_factor =
+ data_from_ancestor.in_subtree_of_page_scale_application_layer
+ ? globals.page_scale_factor
+ : 1.f;
+ layer_draw_properties.device_scale_factor = globals.device_scale_factor;
+
// The draw_transform that gets computed below is effectively the layer's
// draw_transform, unless the layer itself creates a render_surface. In that
// case, the render_surface re-parents the transforms.

Powered by Google App Engine
This is Rietveld 408576698