| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index 7402ea2a808697928a1a96edc44562b899aa6efc..320dd018cf7c24bcf34f2bd4d27e8a9fee89d7ae 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -1278,10 +1278,16 @@ 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) {
|
| + property_trees_.effect_tree.OnOpacityAnimated(element_id, opacity);
|
| + return;
|
| + }
|
| +
|
| + Layer* layer = LayerByElementId(element_id);
|
| + DCHECK(layer);
|
| layer->OnOpacityAnimated(opacity);
|
|
|
| if (EffectNode* node =
|
| @@ -1302,6 +1308,11 @@ void LayerTreeHost::SetElementTransformMutated(
|
| ElementId element_id,
|
| ElementListType list_type,
|
| const gfx::Transform& transform) {
|
| + if (settings_.use_layer_lists) {
|
| + property_trees_.transform_tree.OnTransformAnimated(element_id, transform);
|
| + return;
|
| + }
|
| +
|
| Layer* layer = LayerByElementId(element_id);
|
| DCHECK(layer);
|
| layer->OnTransformAnimated(transform);
|
|
|