cc : Add LayerToPropertyTreeIndices map to PropertyTrees

cc/layers/layer_impl.cc

 // Copyright 2012 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_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 83 matching lines @@
 }
 
 LayerImpl::~LayerImpl() {
   DCHECK_EQ(DRAW_MODE_NONE, current_draw_mode_);
 
   if (!copy_requests_.empty() && layer_tree_impl_->IsActiveTree())
     layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
   layer_tree_impl_->UnregisterScrollLayer(this);
   layer_tree_impl_->UnregisterLayer(this);
   layer_tree_impl_->RemoveLayerShouldPushProperties(this);
+  layer_tree_impl_->RemoveFromLayerToPropertyTreeIndicesMap(layer_id_);
 
   layer_tree_impl_->RemoveFromElementMap(this);
 
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerImpl", this);
 
   if (mask_layer_)
     layer_tree_impl_->RemoveLayer(mask_layer_id_);
   if (replica_layer_)
     layer_tree_impl_->RemoveLayer(replica_layer_id_);
@@ skipping 60 matching lines @@
 
 void LayerImpl::ApplyScroll(ScrollState* scroll_state) {
   DCHECK(scroll_state);
   ScrollNode* node = layer_tree_impl()->property_trees()->scroll_tree.Node(
       scroll_tree_index());
   layer_tree_impl()->ApplyScroll(node, scroll_state);
 }
 
 void LayerImpl::SetTransformTreeIndex(int index) {
   transform_tree_index_ = index;
+  if (layer_tree_impl_)

[ajuma, 2016/05/12 00:54:56]

Is layer_tree_impl_ ever null? It's assumed to be non-null in lots of places in
LayerImpl.

+    layer_tree_impl()->UpdateLayerToPropertyTreeIndicesMap(
+        id(), index, PropertyTrees::Types::TRANSFORM_TREE);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetClipTreeIndex(int index) {
   clip_tree_index_ = index;
+  if (layer_tree_impl_)
+    layer_tree_impl()->UpdateLayerToPropertyTreeIndicesMap(
+        id(), index, PropertyTrees::Types::CLIP_TREE);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetEffectTreeIndex(int index) {
   effect_tree_index_ = index;
+  if (layer_tree_impl_)
+    layer_tree_impl()->UpdateLayerToPropertyTreeIndicesMap(
+        id(), index, PropertyTrees::Types::EFFECT_TREE);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::SetScrollTreeIndex(int index) {
   scroll_tree_index_ = index;
+  if (layer_tree_impl_)
+    layer_tree_impl()->UpdateLayerToPropertyTreeIndicesMap(
+        id(), index, PropertyTrees::Types::SCROLL_TREE);
   SetNeedsPushProperties();
 }
 
 void LayerImpl::PassCopyRequests(
     std::vector<std::unique_ptr<CopyOutputRequest>>* requests) {
   // In the case that a layer still has a copy request, this means that there's
   // a commit to the active tree without a draw.  This only happens in some
   // edge cases during lost context or visibility changes, so don't try to
   // handle preserving these output requests (and their surface).
   if (!copy_requests_.empty()) {
@@ skipping 1202 matching lines @@
            .layer_transforms_should_scale_layer_contents) {
     return default_scale;
   }
 
   gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
       DrawTransform(), default_scale);
   return std::max(transform_scales.x(), transform_scales.y());
 }
 
 }  // namespace cc