Chromium Code Reviews| Index: cc/trees/property_tree_builder.cc |
| diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc |
| index 4bd62d1bea7dedbe8447e3765ba95037462e6e61..3c0b3c7acc989fc4d409f15962c9d589243f978b 100644 |
| --- a/cc/trees/property_tree_builder.cc |
| +++ b/cc/trees/property_tree_builder.cc |
| @@ -673,6 +673,14 @@ static inline bool HideLayerAndSubtree(LayerImpl* layer) { |
| return layer->test_properties()->hide_layer_and_subtree; |
| } |
| +static inline bool AlwaysUseActiveTreeOpacity(Layer* layer) { |
| + return layer->AlwaysUseActiveTreeOpacity(); |
| +} |
| + |
| +static inline bool AlwaysUseActiveTreeOpacity(LayerImpl* layer) { |
| + return false; |
| +} |
| + |
| template <typename LayerType> |
| bool ShouldCreateRenderSurface(LayerType* layer, |
| gfx::Transform current_transform, |
| @@ -810,6 +818,10 @@ bool AddEffectNodeIfNeeded( |
| EffectNode node; |
| node.owner_id = layer->id(); |
| + if (AlwaysUseActiveTreeOpacity(layer)) |
| + data_for_children->property_trees->always_use_active_tree_opacity_effect_ids |
| + .push_back(node.owner_id); |
|
ajuma
2016/05/18 13:53:48
Are there tests for this (that break when we don't
jaydasika
2016/05/19 00:27:09
Added one.
|
| + |
| node.data.opacity = layer->opacity(); |
| node.data.has_render_surface = should_create_render_surface; |
| node.data.has_copy_request = layer->HasCopyRequest(); |