Revert of Use element id's for animations

cc/trees/layer_tree_host.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 931 matching lines @@
 }
 
 void LayerTreeHost::ReportFixedRasterScaleUseCounters(
     bool has_fixed_raster_scale_blurry_content,
     bool has_fixed_raster_scale_potential_performance_regression) {
   client_->ReportFixedRasterScaleUseCounters(
       has_fixed_raster_scale_blurry_content,
       has_fixed_raster_scale_potential_performance_regression);
 }
 
-static void SetElementIdForTesting(Layer* layer) {
-  layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
-}
-
-void LayerTreeHost::SetElementIdsForTesting() {
-  LayerTreeHostCommon::CallFunctionForEveryLayer(this, SetElementIdForTesting);
-}
-
 bool LayerTreeHost::UsingSharedMemoryResources() {
   return GetRendererCapabilities().using_shared_memory_resources;
 }
 
 bool LayerTreeHost::DoUpdateLayers(Layer* root_layer) {
   TRACE_EVENT1("cc", "LayerTreeHost::DoUpdateLayers", "source_frame_number",
                source_frame_number());
 
   UpdateHudLayer();
 
@@ skipping 298 matching lines @@
   return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++);
 }
 
 void LayerTreeHost::SetLayerTreeMutator(
     std::unique_ptr<LayerTreeMutator> mutator) {
   proxy_->SetMutator(std::move(mutator));
 }
 
 Layer* LayerTreeHost::LayerById(int id) const {
   LayerIdMap::const_iterator iter = layer_id_map_.find(id);
-  return iter != layer_id_map_.end() ? iter->second : nullptr;
-}
-
-Layer* LayerTreeHost::LayerByElementId(ElementId element_id) const {
-  ElementLayersMap::const_iterator iter = element_layers_map_.find(element_id);
-  return iter != element_layers_map_.end() ? iter->second : nullptr;
-}
-
-void LayerTreeHost::AddToElementMap(Layer* layer) {
-  if (!layer->element_id())
-    return;
-
-  element_layers_map_[layer->element_id()] = layer;
-}
-
-void LayerTreeHost::RemoveFromElementMap(Layer* layer) {
-  if (!layer->element_id())
-    return;
-
-  element_layers_map_.erase(layer->element_id());
+  return iter != layer_id_map_.end() ? iter->second : NULL;
 }
 
 void LayerTreeHost::AddLayerShouldPushProperties(Layer* layer) {
   layers_that_should_push_properties_.insert(layer);
 }
 
 void LayerTreeHost::RemoveLayerShouldPushProperties(Layer* layer) {
   layers_that_should_push_properties_.erase(layer);
 }
 
 std::unordered_set<Layer*>& LayerTreeHost::LayersThatShouldPushProperties() {
   return layers_that_should_push_properties_;
 }
 
 bool LayerTreeHost::LayerNeedsPushPropertiesForTesting(Layer* layer) {
   return layers_that_should_push_properties_.find(layer) !=
          layers_that_should_push_properties_.end();
 }
 
 void LayerTreeHost::RegisterLayer(Layer* layer) {
   DCHECK(!LayerById(layer->id()));
   DCHECK(!in_paint_layer_contents_);
   layer_id_map_[layer->id()] = layer;
-  if (layer->element_id()) {
-    animation_host_->RegisterElement(layer->element_id(),
-                                     ElementListType::ACTIVE);
-  }
+  animation_host_->RegisterElement(layer->id(), ElementListType::ACTIVE);
 }
 
 void LayerTreeHost::UnregisterLayer(Layer* layer) {
   DCHECK(LayerById(layer->id()));
   DCHECK(!in_paint_layer_contents_);
-  if (layer->element_id()) {
-    animation_host_->UnregisterElement(layer->element_id(),
-                                       ElementListType::ACTIVE);
-  }
+  animation_host_->UnregisterElement(layer->id(), ElementListType::ACTIVE);
   RemoveLayerShouldPushProperties(layer);
   layer_id_map_.erase(layer->id());
 }
 
 bool LayerTreeHost::IsElementInList(ElementId element_id,
                                     ElementListType list_type) const {
-  return list_type == ElementListType::ACTIVE && LayerByElementId(element_id);
+  return list_type == ElementListType::ACTIVE && LayerById(element_id);
 }
 
 void LayerTreeHost::SetMutatorsNeedCommit() {
   SetNeedsCommit();
 }
 
 void LayerTreeHost::SetMutatorsNeedRebuildPropertyTrees() {
   property_trees_.needs_rebuild = true;
 }
 
 void LayerTreeHost::SetElementFilterMutated(ElementId element_id,
                                             ElementListType list_type,
                                             const FilterOperations& filters) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   DCHECK(layer);
   layer->OnFilterAnimated(filters);
 }
 
 void LayerTreeHost::SetElementOpacityMutated(ElementId element_id,
                                              ElementListType list_type,
                                              float opacity) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   DCHECK(layer);
   layer->OnOpacityAnimated(opacity);
 }
 
 void LayerTreeHost::SetElementTransformMutated(
     ElementId element_id,
     ElementListType list_type,
     const gfx::Transform& transform) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   DCHECK(layer);
   layer->OnTransformAnimated(transform);
 }
 
 void LayerTreeHost::SetElementScrollOffsetMutated(
     ElementId element_id,
     ElementListType list_type,
     const gfx::ScrollOffset& scroll_offset) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   DCHECK(layer);
   layer->OnScrollOffsetAnimated(scroll_offset);
 }
 
 void LayerTreeHost::ElementTransformIsAnimatingChanged(
     ElementId element_id,
     ElementListType list_type,
     AnimationChangeType change_type,
     bool is_animating) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   if (layer) {
     switch (change_type) {
       case AnimationChangeType::POTENTIAL:
         layer->OnTransformIsPotentiallyAnimatingChanged(is_animating);
         break;
       case AnimationChangeType::RUNNING:
         layer->OnTransformIsCurrentlyAnimatingChanged(is_animating);
         break;
       case AnimationChangeType::BOTH:
         layer->OnTransformIsPotentiallyAnimatingChanged(is_animating);
         layer->OnTransformIsCurrentlyAnimatingChanged(is_animating);
         break;
     }
   }
 }
 
 void LayerTreeHost::ElementOpacityIsAnimatingChanged(
     ElementId element_id,
     ElementListType list_type,
     AnimationChangeType change_type,
     bool is_animating) {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   if (layer) {
     switch (change_type) {
       case AnimationChangeType::POTENTIAL:
         layer->OnOpacityIsPotentiallyAnimatingChanged(is_animating);
         break;
       case AnimationChangeType::RUNNING:
         layer->OnOpacityIsCurrentlyAnimatingChanged(is_animating);
         break;
       case AnimationChangeType::BOTH:
         layer->OnOpacityIsPotentiallyAnimatingChanged(is_animating);
         layer->OnOpacityIsCurrentlyAnimatingChanged(is_animating);
         break;
     }
   }
 }
 
 gfx::ScrollOffset LayerTreeHost::GetScrollOffsetForAnimation(
     ElementId element_id) const {
-  Layer* layer = LayerByElementId(element_id);
+  Layer* layer = LayerById(element_id);
   DCHECK(layer);
   return layer->ScrollOffsetForAnimation();
 }
 
 bool LayerTreeHost::ScrollOffsetAnimationWasInterrupted(
     const Layer* layer) const {
-  return animation_host_->ScrollOffsetAnimationWasInterrupted(
-      layer->element_id());
+  return animation_host_->ScrollOffsetAnimationWasInterrupted(layer->id());
 }
 
 bool LayerTreeHost::IsAnimatingFilterProperty(const Layer* layer) const {
-  return animation_host_->IsAnimatingFilterProperty(layer->element_id(),
+  return animation_host_->IsAnimatingFilterProperty(layer->id(),
                                                     ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::IsAnimatingOpacityProperty(const Layer* layer) const {
-  return animation_host_->IsAnimatingOpacityProperty(layer->element_id(),
+  return animation_host_->IsAnimatingOpacityProperty(layer->id(),
                                                      ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::IsAnimatingTransformProperty(const Layer* layer) const {
-  return animation_host_->IsAnimatingTransformProperty(layer->element_id(),
+  return animation_host_->IsAnimatingTransformProperty(layer->id(),
                                                        ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::HasPotentiallyRunningFilterAnimation(
     const Layer* layer) const {
   return animation_host_->HasPotentiallyRunningFilterAnimation(
-      layer->element_id(), ElementListType::ACTIVE);
+      layer->id(), ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::HasPotentiallyRunningOpacityAnimation(
     const Layer* layer) const {
   return animation_host_->HasPotentiallyRunningOpacityAnimation(
-      layer->element_id(), ElementListType::ACTIVE);
+      layer->id(), ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::HasPotentiallyRunningTransformAnimation(
     const Layer* layer) const {
   return animation_host_->HasPotentiallyRunningTransformAnimation(
-      layer->element_id(), ElementListType::ACTIVE);
+      layer->id(), ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::HasOnlyTranslationTransforms(const Layer* layer) const {
-  return animation_host_->HasOnlyTranslationTransforms(layer->element_id(),
+  return animation_host_->HasOnlyTranslationTransforms(layer->id(),
                                                        ElementListType::ACTIVE);
 }
 
 bool LayerTreeHost::MaximumTargetScale(const Layer* layer,
                                        float* max_scale) const {
   return animation_host_->MaximumTargetScale(
-      layer->element_id(), ElementListType::ACTIVE, max_scale);
+      layer->id(), ElementListType::ACTIVE, max_scale);
 }
 
 bool LayerTreeHost::AnimationStartScale(const Layer* layer,
                                         float* start_scale) const {
   return animation_host_->AnimationStartScale(
-      layer->element_id(), ElementListType::ACTIVE, start_scale);
+      layer->id(), ElementListType::ACTIVE, start_scale);
 }
 
 bool LayerTreeHost::HasAnyAnimationTargetingProperty(
     const Layer* layer,
     TargetProperty::Type property) const {
-  return animation_host_->HasAnyAnimationTargetingProperty(layer->element_id(),
+  return animation_host_->HasAnyAnimationTargetingProperty(layer->id(),
                                                            property);
 }
 
 bool LayerTreeHost::AnimationsPreserveAxisAlignment(const Layer* layer) const {
-  return animation_host_->AnimationsPreserveAxisAlignment(layer->element_id());
+  return animation_host_->AnimationsPreserveAxisAlignment(layer->id());
 }
 
 bool LayerTreeHost::HasAnyAnimation(const Layer* layer) const {
-  return animation_host_->HasAnyAnimation(layer->element_id());
+  return animation_host_->HasAnyAnimation(layer->id());
 }
 
 bool LayerTreeHost::HasActiveAnimationForTesting(const Layer* layer) const {
-  return animation_host_->HasActiveAnimationForTesting(layer->element_id());
+  return animation_host_->HasActiveAnimationForTesting(layer->id());
 }
 
 bool LayerTreeHost::IsSingleThreaded() const {
   DCHECK(compositor_mode_ != CompositorMode::SINGLE_THREADED ||
          !task_runner_provider_->HasImplThread());
   return compositor_mode_ == CompositorMode::SINGLE_THREADED;
 }
 
 bool LayerTreeHost::IsThreaded() const {
   DCHECK(compositor_mode_ != CompositorMode::THREADED ||
@@ skipping 189 matching lines @@
   int seq_num = property_trees_.sequence_number;
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) {
     layer->set_property_tree_sequence_number(seq_num);
   });
 
   surface_id_namespace_ = proto.surface_id_namespace();
   next_surface_sequence_ = proto.next_surface_sequence();
 }
 
 }  // namespace cc