CC Animation: Let MutatorHostClient deals with elements instead of layers.

cc/test/animation_timelines_test_common.h

 // Copyright 2015 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.
 
 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 61 matching lines @@
   bool mutated_properties_[TargetProperty::LAST_TARGET_PROPERTY + 1];
 };
 
 class TestHostClient : public MutatorHostClient {
  public:
   explicit TestHostClient(ThreadInstance thread_instance);
   ~TestHostClient();
 
   void ClearMutatedProperties();
 
-  bool IsLayerInTree(int layer_id, LayerTreeType tree_type) const override;
+  bool IsElementInList(ElementId element_id,
+                       ElementListType list_type) const override;
 
   void SetMutatorsNeedCommit() override;
   void SetMutatorsNeedRebuildPropertyTrees() override;
 
-  void SetLayerFilterMutated(int layer_id,
-                             LayerTreeType tree_type,
-                             const FilterOperations& filters) override;
+  void SetElementFilterMutated(ElementId element_id,
+                               ElementListType list_type,
+                               const FilterOperations& filters) override;
 
-  void SetLayerOpacityMutated(int layer_id,
-                              LayerTreeType tree_type,
-                              float opacity) override;
+  void SetElementOpacityMutated(ElementId element_id,
+                                ElementListType list_type,
+                                float opacity) override;
 
-  void SetLayerTransformMutated(int layer_id,
-                                LayerTreeType tree_type,
-                                const gfx::Transform& transform) override;
+  void SetElementTransformMutated(ElementId element_id,
+                                  ElementListType list_type,
+                                  const gfx::Transform& transform) override;
 
-  void SetLayerScrollOffsetMutated(
-      int layer_id,
-      LayerTreeType tree_type,
+  void SetElementScrollOffsetMutated(
+      ElementId element_id,
+      ElementListType list_type,
       const gfx::ScrollOffset& scroll_offset) override;
 
-  void LayerTransformIsPotentiallyAnimatingChanged(int layer_id,
-                                                   LayerTreeType tree_type,
-                                                   bool is_animating) override;
+  void ElementTransformIsPotentiallyAnimatingChanged(
+      ElementId element_id,
+      ElementListType list_type,
+      bool is_animating) override;
 
   void ScrollOffsetAnimationFinished() override {}
 
   void SetScrollOffsetForAnimation(const gfx::ScrollOffset& scroll_offset);
-  gfx::ScrollOffset GetScrollOffsetForAnimation(int layer_id) const override;
+  gfx::ScrollOffset GetScrollOffsetForAnimation(
+      ElementId element_id) const override;
 
   bool mutators_need_commit() const { return mutators_need_commit_; }
   void set_mutators_need_commit(bool need) { mutators_need_commit_ = need; }
 
-  void RegisterLayer(int layer_id, LayerTreeType tree_type);
-  void UnregisterLayer(int layer_id, LayerTreeType tree_type);
+  void RegisterElement(ElementId element_id, ElementListType list_type);
+  void UnregisterElement(ElementId element_id, ElementListType list_type);
 
   AnimationHost* host() {
     DCHECK(host_);
     return host_.get();
   }
 
-  bool IsPropertyMutated(int layer_id,
-                         LayerTreeType tree_type,
+  bool IsPropertyMutated(ElementId element_id,
+                         ElementListType list_type,
                          TargetProperty::Type property) const;
 
-  FilterOperations GetFilters(int layer_id, LayerTreeType tree_type) const;
-  float GetOpacity(int layer_id, LayerTreeType tree_type) const;
-  gfx::Transform GetTransform(int layer_id, LayerTreeType tree_type) const;
-  gfx::ScrollOffset GetScrollOffset(int layer_id,
-                                    LayerTreeType tree_type) const;
-  bool GetTransformIsAnimating(int layer_id, LayerTreeType tree_type) const;
+  FilterOperations GetFilters(ElementId element_id,
+                              ElementListType list_type) const;
+  float GetOpacity(ElementId element_id, ElementListType list_type) const;
+  gfx::Transform GetTransform(ElementId element_id,
+                              ElementListType list_type) const;
+  gfx::ScrollOffset GetScrollOffset(ElementId element_id,
+                                    ElementListType list_type) const;
+  bool GetTransformIsAnimating(ElementId element_id,
+                               ElementListType list_type) const;
 
-  void ExpectFilterPropertyMutated(int layer_id,
-                                   LayerTreeType tree_type,
+  void ExpectFilterPropertyMutated(ElementId element_id,
+                                   ElementListType list_type,
                                    float brightness) const;
-  void ExpectOpacityPropertyMutated(int layer_id,
-                                    LayerTreeType tree_type,
+  void ExpectOpacityPropertyMutated(ElementId element_id,
+                                    ElementListType list_type,
                                     float opacity) const;
-  void ExpectTransformPropertyMutated(int layer_id,
-                                      LayerTreeType tree_type,
+  void ExpectTransformPropertyMutated(ElementId element_id,
+                                      ElementListType list_type,
                                       int transform_x,
                                       int transform_y) const;
 
-  TestLayer* FindTestLayer(int layer_id, LayerTreeType tree_type) const;
+  TestLayer* FindTestLayer(ElementId element_id,
+                           ElementListType list_type) const;
 
  private:
   std::unique_ptr<AnimationHost> host_;
 
   using LayerIdToTestLayer =
       std::unordered_map<int, std::unique_ptr<TestLayer>>;
   LayerIdToTestLayer layers_in_active_tree_;
   LayerIdToTestLayer layers_in_pending_tree_;
 
   gfx::ScrollOffset scroll_offset_;
@@ skipping 46 matching lines @@
   void TearDown() override;
 
   void GetImplTimelineAndPlayerByID();
 
   void CreateTestLayer(bool needs_active_value_observations,
                        bool needs_pending_value_observations);
   void AttachTimelinePlayerLayer();
   void CreateImplTimelineAndPlayer();
 
   void CreateTestMainLayer();
-  void CreateTestImplLayer(LayerTreeType layer_tree_type);
+  void CreateTestImplLayer(ElementListType layer_tree_type);
 
   scoped_refptr<ElementAnimations> element_animations() const;
   scoped_refptr<ElementAnimations> element_animations_impl() const;
 
   void ReleaseRefPtrs();
 
   void AnimateLayersTransferEvents(base::TimeTicks time,
                                    unsigned expect_events);
 
-  AnimationPlayer* GetPlayerForLayerId(int layer_id);
-  AnimationPlayer* GetImplPlayerForLayerId(int layer_id);
+  AnimationPlayer* GetPlayerForLayerId(ElementId element_id);
+  AnimationPlayer* GetImplPlayerForLayerId(ElementId element_id);
 
   int NextTestLayerId();
 
   TestHostClient client_;
   TestHostClient client_impl_;
 
   AnimationHost* host_;
   AnimationHost* host_impl_;
 
   const int timeline_id_;
   const int player_id_;
   int element_id_;
 
   int next_test_layer_id_;
 
   scoped_refptr<AnimationTimeline> timeline_;
   scoped_refptr<AnimationPlayer> player_;
 
   scoped_refptr<AnimationTimeline> timeline_impl_;
   scoped_refptr<AnimationPlayer> player_impl_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_