Combine clips in content target space.

cc/trees/draw_property_utils.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/draw_property_utils.h"
 
 #include <vector>
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
@@ skipping 20 matching lines @@
     float contents_scale_x = layer->contents_scale_x();
     float contents_scale_y = layer->contents_scale_y();
     const bool has_clip = layer->clip_tree_index() > 0;
     const TransformNode* transform_node =
         transform_tree.Node(layer->transform_tree_index());
     if (has_clip) {
       const ClipNode* clip_node = clip_tree.Node(layer->clip_tree_index());
       const TransformNode* clip_transform_node =
           transform_tree.Node(clip_node->data.transform_id);
       const TransformNode* target_node =
-          transform_tree.Node(transform_node->data.target_id);
+          transform_tree.Node(transform_node->data.content_target_id);
 
       gfx::Transform clip_to_target;
       gfx::Transform content_to_target;
       gfx::Transform target_to_content;
       gfx::Transform target_to_layer;
 
       bool success =
           transform_tree.ComputeTransform(clip_transform_node->id,
                                           target_node->id, &clip_to_target) &&
           transform_tree.ComputeTransform(transform_node->id, target_node->id,
@@ skipping 223 matching lines @@
 
   std::vector<Layer*> layers_to_update;
   const bool subtree_is_visible_from_ancestor = true;
   FindLayersThatNeedVisibleRects(root_layer, *transform_tree,
                                  subtree_is_visible_from_ancestor,
                                  &layers_to_update);
   CalculateVisibleRects(layers_to_update, *clip_tree, *transform_tree);
 }
 
 }  // namespace cc