diff options
| author | jaydasika <jaydasika@chromium.org> | 2016-02-12 11:47:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 19:48:35 +0000 |
| commit | 75ad0a44abb3b1e5052c14e11be117fdee9a6c10 (patch) | |
| tree | ee0981b5310b1f58477dedd428d4a28981f8f374 /cc/trees/layer_tree_host_common.cc | |
| parent | d46ebd1a6ca0cc4bc7842882e03cadccfcb91253 (diff) | |
| download | chromium_src-75ad0a44abb3b1e5052c14e11be117fdee9a6c10.zip chromium_src-75ad0a44abb3b1e5052c14e11be117fdee9a6c10.tar.gz chromium_src-75ad0a44abb3b1e5052c14e11be117fdee9a6c10.tar.bz2 | |
cc :: Handle clip child getting skipped in PreCalculateMetaInformation
BUG=543693
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1696443003
Cr-Commit-Position: refs/heads/master@{#375226}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index b094c94..489a9e9 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -1102,15 +1102,15 @@ static void PreCalculateMetaInformationInternal( layer->set_layer_or_descendant_is_drawn(false); layer->set_visited(false); + if (layer->clip_parent()) + recursive_data->num_unclipped_descendants++; + if (!HasInvertibleOrAnimatedTransform(layer)) { // Layers with singular transforms should not be drawn, the whole subtree // can be skipped. return; } - if (layer->clip_parent()) - recursive_data->num_unclipped_descendants++; - for (size_t i = 0; i < layer->children().size(); ++i) { Layer* child_layer = layer->child_at(i); @@ -1146,15 +1146,15 @@ static void PreCalculateMetaInformationInternal( layer->set_layer_or_descendant_is_drawn(false); layer->set_visited(false); + if (layer->clip_parent()) + recursive_data->num_unclipped_descendants++; + if (!HasInvertibleOrAnimatedTransform(layer)) { // Layers with singular transforms should not be drawn, the whole subtree // can be skipped. return; } - if (layer->clip_parent()) - recursive_data->num_unclipped_descendants++; - for (size_t i = 0; i < layer->children().size(); ++i) { LayerImpl* child_layer = layer->child_at(i); |