cc: LayerTreeHostImpl uses element id to tick animations

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1101 matching lines @@
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     gfx::Transform transform;
     FilterOperations filters;
     LayerImpl* root = impl->active_tree()->root_layer_for_testing();
     switch (static_cast<Animations>(index_)) {
       case OPACITY:
         index_++;
         impl->active_tree()->ResetAllChangeTracking();
-        impl->active_tree()->property_trees()->effect_tree.OnOpacityAnimated(
-            0.5f, root->effect_tree_index(), impl->active_tree());
+        impl->active_tree()->SetTreeLayerOpacityMutated(root->element_id(),
+                                                        0.5f);
         PostSetNeedsCommitToMainThread();
         break;
       case TRANSFORM:
         index_++;
         EXPECT_TRUE(impl->active_tree()
                         ->LayerById(root_->id())
                         ->LayerPropertyChanged());
         impl->active_tree()->ResetAllChangeTracking();
         EXPECT_FALSE(impl->active_tree()
                          ->LayerById(root_->id())
                          ->LayerPropertyChanged());
         EXPECT_FALSE(impl->active_tree()
                          ->LayerById(child_->id())
                          ->LayerPropertyChanged());
         transform.Translate(10, 10);
-        impl->active_tree()
-            ->property_trees()
-            ->transform_tree.OnTransformAnimated(
-                transform, root->transform_tree_index(), impl->active_tree());
+        impl->active_tree()->SetTreeLayerTransformMutated(root->element_id(),
+                                                          transform);
         PostSetNeedsCommitToMainThread();
         break;
       case FILTER:
         index_++;
         EXPECT_TRUE(root->LayerPropertyChanged());
         EXPECT_TRUE(impl->active_tree()
                         ->LayerById(child_->id())
                         ->LayerPropertyChanged());
         impl->active_tree()->ResetAllChangeTracking();
         EXPECT_FALSE(root->LayerPropertyChanged());
         EXPECT_FALSE(impl->active_tree()
                          ->LayerById(child_->id())
                          ->LayerPropertyChanged());
         filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
-        impl->active_tree()->property_trees()->effect_tree.OnFilterAnimated(
-            filters, root->effect_tree_index(), impl->active_tree());
+        impl->active_tree()->SetTreeLayerFilterMutated(root->element_id(),
+                                                       filters);
         PostSetNeedsCommitToMainThread();
         break;
       case END:
         EXPECT_TRUE(root->LayerPropertyChanged());
         EndTest();
         break;
     }
   }
 
   void AfterTest() override {}
@@ skipping 53 matching lines @@
         break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     EffectTree& effect_tree = impl->sync_tree()->property_trees()->effect_tree;
     LayerImpl* root = impl->sync_tree()->root_layer_for_testing();
     EffectNode* node = effect_tree.Node(root->effect_tree_index());
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
-        effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),
-                                      impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerOpacityMutated(root->element_id(),
+                                                      0.75f);
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         EXPECT_EQ(node->opacity, 0.75f);
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
         EXPECT_EQ(node->opacity, 0.75f);
-        effect_tree.OnOpacityAnimated(0.75f, root->effect_tree_index(),
-                                      impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerOpacityMutated(root->element_id(),
+                                                      0.75f);
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         EXPECT_EQ(node->opacity, 0.5f);
         PostSetNeedsCommitToMainThread();
         break;
       case 4:
         EXPECT_EQ(node->opacity, 0.25f);
-        impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
-            brightness_filter_, root->effect_tree_index(), impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerFilterMutated(root->element_id(),
+                                                     brightness_filter_);
         PostSetNeedsCommitToMainThread();
         break;
       case 5:
         EXPECT_EQ(node->filters, brightness_filter_);
         PostSetNeedsCommitToMainThread();
         break;
       case 6:
         EXPECT_EQ(node->filters, brightness_filter_);
-        impl->sync_tree()->property_trees()->effect_tree.OnFilterAnimated(
-            brightness_filter_, root->effect_tree_index(), impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerFilterMutated(root->element_id(),
+                                                     brightness_filter_);
         PostSetNeedsCommitToMainThread();
         break;
       case 7:
         EXPECT_EQ(node->filters, blur_filter_);
         PostSetNeedsCommitToMainThread();
         break;
       case 8:
         EXPECT_EQ(node->filters, sepia_filter_);
         EndTest();
         break;
@@ skipping 41 matching lines @@
       case 4:
         node->local = gfx::Transform();
         node->is_currently_animating = true;
         break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     TransformTree& transform_tree =
         impl->sync_tree()->property_trees()->transform_tree;
-    TransformNode* node = transform_tree.Node(
-        impl->sync_tree()->root_layer_for_testing()->transform_tree_index());
+    const LayerImpl* root_layer = impl->sync_tree()->root_layer_for_testing();
+    const TransformNode* node =
+        transform_tree.FindNodeFromOwningLayerId(root_layer->id());
     gfx::Transform rotate10;
     rotate10.Rotate(10.f);
     gfx::Transform rotate20;
     rotate20.Rotate(20.f);
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
-        impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(
-            rotate20, node->id, impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerTransformMutated(
+            root_layer->element_id(), rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         EXPECT_EQ(node->local, rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
         EXPECT_EQ(node->local, rotate20);
-        impl->sync_tree()->property_trees()->transform_tree.OnTransformAnimated(
-            rotate20, node->id, impl->sync_tree());
+        impl->sync_tree()->SetTreeLayerTransformMutated(
+            root_layer->element_id(), rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         EXPECT_EQ(node->local, rotate10);
         PostSetNeedsCommitToMainThread();
         break;
       case 4:
         EXPECT_EQ(node->local, gfx::Transform());
         EndTest();
     }
@@ skipping 63 matching lines @@
       EndTest();
     }
 
     return draw_result;
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     if (impl->active_tree()->source_frame_number() == 0) {
       gfx::Transform scale;
       scale.Scale(2.0, 2.0);
-      impl->active_tree()->property_trees()->transform_tree.OnTransformAnimated(
-          scale, child_->transform_tree_index(), impl->active_tree());
+      impl->active_tree()->SetTreeLayerTransformMutated(child_->element_id(),
+                                                        scale);
     }
   }
 
   void AfterTest() override {}
 
  private:
   scoped_refptr<Layer> root_;
   scoped_refptr<Layer> child_;
   scoped_refptr<Layer> grand_child_;
 };
@@ skipping 5744 matching lines @@
 
  private:
   bool first_ = true;
   SkBitmap bitmap_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestQueueImageDecodeNonLazy);
 
 }  // namespace
 }  // namespace cc