Chromium Code Reviews| 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 34f45530ff38f1340925bdbb5e80e2a32d66b439..ce9d4c5376b20c40d1d6a2109b3c98ea648f68bf 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 |
| @@ -1744,6 +1744,15 @@ static void CalculateDrawPropertiesInternal( |
| combined_maximum_animation_contents_scale, |
| animating_transform_to_screen); |
| + layer_draw_properties.ideal_contents_scale = ideal_contents_scale; |
|
danakj
2014/05/21 15:01:00
Can we add a unit test to layer_tree_host_common_u
|
| + layer_draw_properties.maximum_animation_contents_scale = |
| + combined_maximum_animation_contents_scale; |
| + layer_draw_properties.page_scale = |
| + data_from_ancestor.in_subtree_of_page_scale_application_layer |
| + ? globals.page_scale_factor |
| + : 1.f; |
| + layer_draw_properties.device_scale = 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. |