Revert of Use element id's for animations

cc/trees/layer_tree_host.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_H_
 #define CC_TREES_LAYER_TREE_HOST_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 330 matching lines @@
 
   PropertyTrees* property_trees() { return &property_trees_; }
   bool needs_meta_info_recomputation() {
     return needs_meta_info_recomputation_;
   }
 
   void SetLayerTreeMutator(std::unique_ptr<LayerTreeMutator> mutator);
 
   Layer* LayerById(int id) const;
 
-  Layer* LayerByElementId(ElementId element_id) const;
-  void AddToElementMap(Layer* layer);
-  void RemoveFromElementMap(Layer* layer);
-
   void AddLayerShouldPushProperties(Layer* layer);
   void RemoveLayerShouldPushProperties(Layer* layer);
   std::unordered_set<Layer*>& LayersThatShouldPushProperties();
   bool LayerNeedsPushPropertiesForTesting(Layer* layer);
 
   void RegisterLayer(Layer* layer);
   void UnregisterLayer(Layer* layer);
   // MutatorHostClient implementation.
   bool IsElementInList(ElementId element_id,
                        ElementListType list_type) const override;
@@ skipping 53 matching lines @@
   // expected input is a serialized remote LayerTreeHost. After deserializing
   // the protobuf, the normal commit-flow should continue.
   void FromProtobufForCommit(const proto::LayerTreeHost& proto);
 
   bool IsSingleThreaded() const;
   bool IsThreaded() const;
   bool IsRemoteServer() const;
   bool IsRemoteClient() const;
   void BuildPropertyTreesForTesting();
 
-  void SetElementIdsForTesting();
-
   ImageSerializationProcessor* image_serialization_processor() const {
     return image_serialization_processor_;
   }
 
   void ReportFixedRasterScaleUseCounters(
       bool has_fixed_raster_scale_blurry_content,
       bool has_fixed_raster_scale_potential_performance_regression);
 
  protected:
   LayerTreeHost(InitParams* params, CompositorMode mode);
@@ skipping 150 matching lines @@
 
   ImageSerializationProcessor* image_serialization_processor_;
 
   std::vector<std::unique_ptr<SwapPromise>> swap_promise_list_;
   std::set<SwapPromiseMonitor*> swap_promise_monitor_;
 
   PropertyTrees property_trees_;
 
   using LayerIdMap = std::unordered_map<int, Layer*>;
   LayerIdMap layer_id_map_;
-
-  using ElementLayersMap = std::unordered_map<ElementId, Layer*, ElementIdHash>;
-  ElementLayersMap element_layers_map_;
-
   // Set of layers that need to push properties.
   std::unordered_set<Layer*> layers_that_should_push_properties_;
 
   uint32_t surface_id_namespace_;
   uint32_t next_surface_sequence_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_H_