Update from https://crrev.com/315085

cc/trees/property_tree_builder.cc

 // Copyright 2014 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/property_tree_builder.h"
 
 #include <map>
 #include <set>
 
 #include "cc/base/math_util.h"
@@ skipping 153 matching lines @@
     layer->set_transform_tree_index(transform_parent->transform_tree_index());
     return;
   }
 
   if (!is_root) {
     data_for_children->transform_tree->Insert(
         TransformNode(), transform_parent->transform_tree_index());
   }
 
   TransformNode* node = data_for_children->transform_tree->back();
+  layer->set_transform_tree_index(node->id);
 
   node->data.flattens = layer->should_flatten_transform();
   node->data.target_id =
       data_from_ancestor.render_target->transform_tree_index();
+  DCHECK_NE(node->data.target_id, -1);
   node->data.is_animated = layer->TransformIsAnimating();
 
   gfx::Transform transform;
   float device_and_page_scale_factors = 1.0f;
   if (is_root)
     device_and_page_scale_factors = data_from_ancestor.device_scale_factor;
   if (is_page_scale_application_layer)
     device_and_page_scale_factors *= data_from_ancestor.page_scale_factor;
 
   transform.Scale(device_and_page_scale_factors, device_and_page_scale_factors);
@@ skipping 19 matching lines @@
   transform.Translate3d(-layer->transform_origin().x(),
                         -layer->transform_origin().y(),
                         -layer->transform_origin().z());
 
   node->data.to_parent = transform;
   node->data.is_invertible = transform.GetInverse(&node->data.from_parent);
 
   data_from_ancestor.transform_tree->UpdateScreenSpaceTransform(node->id);
 
   layer->set_offset_to_transform_parent(gfx::Vector2dF());
-  layer->set_transform_tree_index(node->id);
 }
 
 void BuildPropertyTreesInternal(Layer* layer,
                                 const DataForRecursion& data_from_parent) {
   DataForRecursion data_for_children(data_from_parent);
   if (layer->render_surface())
     data_for_children.render_target = layer;
 
   AddTransformNodeIfNeeded(data_from_parent, layer, &data_for_children);
   AddClipNodeIfNeeded(data_from_parent, layer, &data_for_children);
@@ skipping 43 matching lines @@
   data_for_recursion.clip_tree_parent = clip_tree->Insert(root_clip, 0);
 
   BuildPropertyTreesInternal(root_layer, data_for_recursion);
 
   TransformNode* transform_root = transform_tree->Node(transform_root_id);
   transform_root->data.set_to_parent(device_transform *
                                      transform_root->data.to_parent);
 }
 
 }  // namespace cc