CC Animation: Use ElementId to attach CC animation players.

cc/layers/layer.cc

 // Copyright 2010 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/layers/layer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 103 matching lines @@
   }
 }
 
 void Layer::SetLayerTreeHost(LayerTreeHost* host) {
   if (layer_tree_host_ == host)
     return;
 
   if (layer_tree_host_) {
     layer_tree_host_->property_trees()->needs_rebuild = true;
     layer_tree_host_->UnregisterLayer(this);
+    if (element_id())
+      layer_tree_host_->UnregisterLayerForElementId(this);
   }
   if (host) {
     host->property_trees()->needs_rebuild = true;
     host->RegisterLayer(this);
+    if (element_id())
+      host->RegisterLayerForElementId(this);
   }
 
   layer_tree_host_ = host;
   InvalidatePropertyTreesIndices();
 
   // When changing hosts, the layer needs to commit its properties to the impl
   // side for the new host.
   SetNeedsPushProperties();
 
   for (size_t i = 0; i < children_.size(); ++i)
@@ skipping 694 matching lines @@
   if (!did_scroll_callback_.is_null())
     did_scroll_callback_.Run();
   // The callback could potentially change the layer structure:
   // "this" may have been destroyed during the process.
 }
 
 void Layer::SetScrollClipLayerId(int clip_layer_id) {
   DCHECK(IsPropertyChangeAllowed());
   if (scroll_clip_layer_id_ == clip_layer_id)
     return;
+
+  if (layer_tree_host_ && element_id())
+    layer_tree_host_->UnregisterLayerForElementId(this);
+
   scroll_clip_layer_id_ = clip_layer_id;
+
+  if (layer_tree_host_ && element_id())
+    layer_tree_host_->RegisterLayerForElementId(this);
+
   SetNeedsCommit();
 }
 
 Layer* Layer::scroll_clip_layer() const {
   return layer_tree_host()->LayerById(scroll_clip_layer_id_);
 }
 
 void Layer::SetUserScrollable(bool horizontal, bool vertical) {
   DCHECK(IsPropertyChangeAllowed());
   if (user_scrollable_horizontal_ == horizontal &&
@@ skipping 863 matching lines @@
 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) {
   benchmark->RunOnLayer(this);
 }
 
 void Layer::SetElementId(ElementId id) {
   DCHECK(IsPropertyChangeAllowed());
   if (element_id_ == id)
     return;
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "Layer::SetElementId", "id", id);
+  if (layer_tree_host_ && element_id())
+    layer_tree_host_->UnregisterLayerForElementId(this);
+
   element_id_ = id;
+
+  if (layer_tree_host_ && element_id())
+    layer_tree_host_->RegisterLayerForElementId(this);
+
   SetNeedsCommit();
 }
 
 void Layer::SetMutableProperties(uint32_t properties) {
   DCHECK(IsPropertyChangeAllowed());
   if (mutable_properties_ == properties)
     return;
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "Layer::SetMutableProperties", "properties", properties);
   mutable_properties_ = properties;
@@ skipping 15 matching lines @@
       ->data.num_copy_requests_in_subtree;
 }
 
 gfx::Transform Layer::screen_space_transform() const {
   DCHECK_NE(transform_tree_index_, -1);
   return draw_property_utils::ScreenSpaceTransform(
       this, layer_tree_host_->property_trees()->transform_tree);
 }
 
 }  // namespace cc