cc: Move Layer Id to Node Map to Individual Property Tree Private

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 1222 matching lines @@
 
 void LayerTreeHost::SetElementOpacityMutated(ElementId element_id,
                                              ElementListType list_type,
                                              float opacity) {
   Layer* layer = LayerByElementId(element_id);
   DCHECK(layer);
   DCHECK_GE(opacity, 0.f);
   DCHECK_LE(opacity, 1.f);
   layer->OnOpacityAnimated(opacity);
 
-  if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT,
-                                       layer->id())) {
+  if (property_trees_.effect_tree.FindNodeFromId(layer->id())) {

[ajuma, 2017/03/16 17:15:31]

Since we're not using the node, this could FindNodeIndexFromId instead, or we
could keep the result for FindNodeFromId and skip the call to Node below.

     DCHECK_EQ(layer->effect_tree_index(),
-              property_trees_.layer_id_to_effect_node_index[layer->id()]);
+              property_trees_.effect_tree.FindNodeIndexFromId(layer->id()));
     EffectNode* node =
         property_trees_.effect_tree.Node(layer->effect_tree_index());
     if (node->opacity == opacity)
       return;
 
     node->opacity = opacity;
     property_trees_.effect_tree.set_needs_update(true);
   }
 
   SetNeedsUpdateLayers();
 }
 
 void LayerTreeHost::SetElementTransformMutated(
     ElementId element_id,
     ElementListType list_type,
     const gfx::Transform& transform) {
   Layer* layer = LayerByElementId(element_id);
   DCHECK(layer);
   layer->OnTransformAnimated(transform);
 
-  if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
-                                       layer->id())) {
+  if (property_trees_.transform_tree.FindNodeFromId(layer->id())) {

[ajuma, 2017/03/16 17:15:31]

Here too.

     DCHECK_EQ(layer->transform_tree_index(),
-              property_trees_.layer_id_to_transform_node_index[layer->id()]);
+              property_trees_.transform_tree.FindNodeIndexFromId(layer->id()));
     TransformNode* node =
         property_trees_.transform_tree.Node(layer->transform_tree_index());
     if (node->local == transform)
       return;
 
     node->local = transform;
     node->needs_local_transform_update = true;
     node->has_potential_animation = true;
     property_trees_.transform_tree.set_needs_update(true);
   }
@@ skipping 50 matching lines @@
 LayerListReverseIterator<Layer> LayerTreeHost::rend() {
   return LayerListReverseIterator<Layer>(nullptr);
 }
 
 void LayerTreeHost::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 }  // namespace cc