diff options
| author | ajuma <ajuma@chromium.org> | 2015-12-01 13:01:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 21:02:06 +0000 |
| commit | b6aa1c6d2c6b9161828bd6bbe8231647ed233836 (patch) | |
| tree | 97044ffdac74a59a8cb95a191b00602a5fd17a77 /cc/trees/layer_tree_host_common.cc | |
| parent | 184777d9335924f6c9b88fe90f9e4d3b783d0d9b (diff) | |
| download | chromium_src-b6aa1c6d2c6b9161828bd6bbe8231647ed233836.zip chromium_src-b6aa1c6d2c6b9161828bd6bbe8231647ed233836.tar.gz chromium_src-b6aa1c6d2c6b9161828bd6bbe8231647ed233836.tar.bz2 | |
cc: Fix screen space transform computation for non-drawn layers
When property trees are enabled, draw properties are only
computed for drawn layers. This means that when a non-drawn
layer's screen space transform is needed, it must be computed
on-demand using the transform tree rather than being read
from the layer's draw properties.
BUG=560758
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1492463002
Cr-Commit-Position: refs/heads/master@{#362498}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 7558230..172b01e 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -2115,7 +2115,8 @@ static void CalculateDrawPropertiesInternal( // The owning layer's screen_space_transform has a scale from content to // layer space which we need to undo and replace with a scale from the // surface's subtree into layer space. - gfx::Transform screen_space_transform = layer->screen_space_transform(); + gfx::Transform screen_space_transform = + layer->draw_properties().screen_space_transform; screen_space_transform.Scale(1.0 / combined_transform_scales.x(), 1.0 / combined_transform_scales.y()); render_surface->SetScreenSpaceTransform(screen_space_transform); |