summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_common.cc
diff options
context:
space:
mode:
authorjaydasika <jaydasika@chromium.org>2015-12-17 18:37:09 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-18 02:37:59 +0000
commit224bca01fb103eb80a02c9500fd844d8b62b5d4b (patch)
tree6b871f0f6ca94a411d2478f947c30e97b8a7780e /cc/trees/layer_tree_host_common.cc
parentfdd35a81b4c360208bc0d6d7a2f61f5e8ad652db (diff)
downloadchromium_src-224bca01fb103eb80a02c9500fd844d8b62b5d4b.zip
chromium_src-224bca01fb103eb80a02c9500fd844d8b62b5d4b.tar.gz
chromium_src-224bca01fb103eb80a02c9500fd844d8b62b5d4b.tar.bz2
cc:: Give a valid transform tree index to mask layers.
Mask layer's screen space transform is used while tracing. Both CDP and property trees don't set it. With CDP, we always returned an identity transform, but with property trees we have an invalid transform tree index and crash. This CL gives the owning layer's transform tree index to the mask layer and so its screen space transform will be the same as its owning layer's. BUG=570739 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1539723002 Cr-Commit-Position: refs/heads/master@{#365993}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
-rw-r--r--cc/trees/layer_tree_host_common.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 2cea8bf..ff6ba40 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -2600,6 +2600,8 @@ static void ComputeMaskLayerDrawProperties(const LayerImpl* layer,
mask_layer_draw_properties.visible_layer_rect = gfx::Rect(layer->bounds());
mask_layer_draw_properties.target_space_transform =
layer->draw_properties().target_space_transform;
+ mask_layer_draw_properties.screen_space_transform =
+ layer->draw_properties().screen_space_transform;
mask_layer_draw_properties.maximum_animation_contents_scale =
layer->draw_properties().maximum_animation_contents_scale;
mask_layer_draw_properties.starting_animation_contents_scale =