diff options
| author | weiliangc <weiliangc@chromium.org> | 2015-09-18 11:27:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 18:28:41 +0000 |
| commit | 0196ea7ff0cb36bac4b783c676e47750d3e3f920 (patch) | |
| tree | e4504ee31880bd19464d5085cfca8a6ddd168783 /cc/trees/property_tree.cc | |
| parent | 0c6cd0cf5e53ffffc05f447927ffa02ebe3c7cdc (diff) | |
| download | chromium_src-0196ea7ff0cb36bac4b783c676e47750d3e3f920.zip chromium_src-0196ea7ff0cb36bac4b783c676e47750d3e3f920.tar.gz chromium_src-0196ea7ff0cb36bac4b783c676e47750d3e3f920.tar.bz2 | |
cc:Make effect tree nodes render targets
Start using effect tree nodes as render targets.
BUG=521717
R=enne
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1319803006
Cr-Commit-Position: refs/heads/master@{#349715}
Diffstat (limited to 'cc/trees/property_tree.cc')
| -rw-r--r-- | cc/trees/property_tree.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index 809c158..049e387 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc @@ -105,7 +105,12 @@ ClipNodeData::ClipNodeData() requires_tight_clip_rect(true), render_surface_is_clipped(false) {} -EffectNodeData::EffectNodeData() : opacity(1.f), screen_space_opacity(1.f) {} +EffectNodeData::EffectNodeData() + : opacity(1.f), + screen_space_opacity(1.f), + has_render_surface(false), + transform_id(0), + clip_id(0) {} void TransformTree::clear() { PropertyTree<TransformNode>::clear(); @@ -393,10 +398,9 @@ void TransformTree::UpdateTargetSpaceTransform(TransformNode* node, node->data.to_target.Scale(node->data.sublayer_scale.x(), node->data.sublayer_scale.y()); } else { - const bool target_is_root_surface = target_node->id == 1; // In order to include the root transform for the root surface, we walk up // to the root of the transform tree in ComputeTransform. - int target_id = target_is_root_surface ? 0 : target_node->id; + int target_id = target_node->id; ComputeTransformWithDestinationSublayerScale(node->id, target_id, &node->data.to_target); } |