| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index 7eea35e1152329e819f1dcfafa0ca08607e98d1b..bcdeed4752f0eba67fbbfcaff80c23bc47959f8a 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -438,6 +438,8 @@ EffectNodeData::EffectNodeData()
|
| has_render_surface(false),
|
| has_copy_request(false),
|
| has_background_filters(false),
|
| + node_or_ancestor_has_background_filters(false),
|
| + to_screen_opacity_is_animated(false),
|
| is_drawn(true),
|
| has_animated_opacity(false),
|
| effect_changed(false),
|
| @@ -453,6 +455,9 @@ bool EffectNodeData::operator==(const EffectNodeData& other) const {
|
| has_render_surface == other.has_render_surface &&
|
| has_copy_request == other.has_copy_request &&
|
| has_background_filters == other.has_background_filters &&
|
| + node_or_ancestor_has_background_filters ==
|
| + other.node_or_ancestor_has_background_filters &&
|
| + to_screen_opacity_is_animated == other.to_screen_opacity_is_animated &&
|
| is_drawn == other.is_drawn &&
|
| has_animated_opacity == other.has_animated_opacity &&
|
| effect_changed == other.effect_changed &&
|
| @@ -468,6 +473,9 @@ void EffectNodeData::ToProtobuf(proto::TreeNode* proto) const {
|
| data->set_has_render_surface(has_render_surface);
|
| data->set_has_copy_request(has_copy_request);
|
| data->set_has_background_filters(has_background_filters);
|
| + data->set_node_or_ancestor_has_background_filters(
|
| + node_or_ancestor_has_background_filters);
|
| + data->set_to_screen_opacity_is_animated(to_screen_opacity_is_animated);
|
| data->set_is_drawn(is_drawn);
|
| data->set_has_animated_opacity(has_animated_opacity);
|
| data->set_effect_changed(effect_changed);
|
| @@ -485,6 +493,9 @@ void EffectNodeData::FromProtobuf(const proto::TreeNode& proto) {
|
| has_render_surface = data.has_render_surface();
|
| has_copy_request = data.has_copy_request();
|
| has_background_filters = data.has_background_filters();
|
| + node_or_ancestor_has_background_filters =
|
| + data.node_or_ancestor_has_background_filters();
|
| + to_screen_opacity_is_animated = data.to_screen_opacity_is_animated();
|
| is_drawn = data.is_drawn();
|
| has_animated_opacity = data.has_animated_opacity();
|
| effect_changed = data.effect_changed();
|
|
|