Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 2b51bb3dacb6345f189c701540579dbad7652ff1..4adc4d538088a7ae6480226b85018e5cc4a30499 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -1271,10 +1271,18 @@ void LayerTreeHost::SetElementFilterMutated(ElementId element_id, |
void LayerTreeHost::SetElementOpacityMutated(ElementId element_id, |
ElementListType list_type, |
float opacity) { |
- Layer* layer = LayerByElementId(element_id); |
- DCHECK(layer); |
DCHECK_GE(opacity, 0.f); |
DCHECK_LE(opacity, 1.f); |
+ |
+ if (settings_.use_layer_lists) { |
+ // TODO(wkorman): Do we need to do the update-node-from-owning-layer-id |
wkorman
2017/05/11 18:19:14
Seeking your input here. I'm not sure how to think
chrishtr
2017/05/11 19:52:46
Yes, we should remove the owning node logic and ma
|
+ // below? |
+ property_trees_.effect_tree.OnOpacityAnimated(element_id, opacity); |
+ return; |
+ } |
+ |
+ Layer* layer = LayerByElementId(element_id); |
+ DCHECK(layer); |
layer->OnOpacityAnimated(opacity); |
if (EffectNode* node = |
@@ -1295,6 +1303,13 @@ void LayerTreeHost::SetElementTransformMutated( |
ElementId element_id, |
ElementListType list_type, |
const gfx::Transform& transform) { |
+ if (settings_.use_layer_lists) { |
+ // TODO(wkorman): Do we need to do the update-node-from-owning-layer-id |
+ // below? |
+ property_trees_.transform_tree.OnTransformAnimated(element_id, transform); |
+ return; |
+ } |
+ |
Layer* layer = LayerByElementId(element_id); |
DCHECK(layer); |
layer->OnTransformAnimated(transform); |