| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index b6be2aa9ed57a3440825f5ef961e82866a35d9e3..4386c028739734831a14829c47e7f7d1dff8806e 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -454,6 +454,7 @@ EffectNodeData::EffectNodeData()
|
| double_sided(false),
|
| is_drawn(true),
|
| has_animated_opacity(false),
|
| + is_currently_animating_opacity(false),
|
| effect_changed(false),
|
| num_copy_requests_in_subtree(0),
|
| transform_id(0),
|
| @@ -471,6 +472,8 @@ bool EffectNodeData::operator==(const EffectNodeData& other) const {
|
| hidden_by_backface_visibility == other.hidden_by_backface_visibility &&
|
| double_sided == other.double_sided && is_drawn == other.is_drawn &&
|
| has_animated_opacity == other.has_animated_opacity &&
|
| + is_currently_animating_opacity ==
|
| + other.is_currently_animating_opacity &&
|
| effect_changed == other.effect_changed &&
|
| num_copy_requests_in_subtree == other.num_copy_requests_in_subtree &&
|
| transform_id == other.transform_id && clip_id == other.clip_id &&
|
| @@ -489,6 +492,7 @@ void EffectNodeData::ToProtobuf(proto::TreeNode* proto) const {
|
| data->set_double_sided(double_sided);
|
| data->set_is_drawn(is_drawn);
|
| data->set_has_animated_opacity(has_animated_opacity);
|
| + data->set_is_currently_animating_opacity(is_currently_animating_opacity);
|
| data->set_effect_changed(effect_changed);
|
| data->set_num_copy_requests_in_subtree(num_copy_requests_in_subtree);
|
| data->set_transform_id(transform_id);
|
| @@ -509,6 +513,7 @@ void EffectNodeData::FromProtobuf(const proto::TreeNode& proto) {
|
| double_sided = data.double_sided();
|
| is_drawn = data.is_drawn();
|
| has_animated_opacity = data.has_animated_opacity();
|
| + is_currently_animating_opacity = data.is_currently_animating_opacity();
|
| effect_changed = data.effect_changed();
|
| num_copy_requests_in_subtree = data.num_copy_requests_in_subtree();
|
| transform_id = data.transform_id();
|
|
|