cc: Compute transform to target using effect id.

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 <stddef.h>
 
 #include <vector>
 
@@ skipping 64 matching lines @@
     const EffectTree& effect_tree) {
   const EffectNode* effect_node = effect_tree.Node(effect_tree_index);
   return effect_node->has_render_surface
              ? effect_node
              : effect_tree.Node(effect_node->target_id);
 }
 
 template <typename LayerType>
 bool ComputeClipRectInTargetSpace(const LayerType* layer,
                                   const ClipNode* clip_node,
-                                  const TransformTree& transform_tree,
-                                  const EffectTree& effect_tree,
+                                  const PropertyTrees* property_trees,
                                   int target_node_id,
                                   gfx::RectF* clip_rect_in_target_space) {
   DCHECK(layer->clip_tree_index() == clip_node->id);
   DCHECK(clip_node->target_transform_id != target_node_id);
 
+  const EffectTree& effect_tree = property_trees->effect_tree;
+  const EffectNode* target_effect_node =
+      ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
   gfx::Transform clip_to_target;
   if (clip_node->target_transform_id > target_node_id) {
     // In this case, layer has a scroll parent. We need to keep the scale
     // at the layer's target but remove the scale at the scroll parent's
     // target.
-    if (transform_tree.ComputeTransform(clip_node->target_transform_id,
-                                        target_node_id, &clip_to_target)) {
+    if (property_trees->ComputeTransformToTarget(clip_node->target_transform_id,
+                                                 target_effect_node->id,
+                                                 &clip_to_target)) {
       // We don't have to apply surface contents scale when target is root.
       if (target_node_id != 0) {
-        const EffectNode* target_effect_node =
-            ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
         PostConcatSurfaceContentsScale(target_effect_node, &clip_to_target);
 #if DCHECK_IS_ON()
+        const TransformTree& transform_tree = property_trees->transform_tree;
         VerifySurfaceContentsScalesMatch(layer->effect_tree_index(),
                                          target_node_id, effect_tree,
                                          transform_tree);
 #endif
       }
 
       const EffectNode* source_node =
           effect_tree.Node(clip_node->target_effect_id);
       ConcatInverseSurfaceContentsScale(source_node, &clip_to_target);
 #if DCHECK_IS_ON()
+      const TransformTree& transform_tree = property_trees->transform_tree;
       VerifySurfaceContentsScalesMatch(clip_node->target_effect_id,
                                        clip_node->target_transform_id,
                                        effect_tree, transform_tree);
 #endif
       *clip_rect_in_target_space = MathUtil::MapClippedRect(
           clip_to_target, clip_node->clip_in_target_space);
     } else {
       return false;
     }
   } else {
-    if (transform_tree.ComputeTransform(clip_node->target_transform_id,
-                                        target_node_id, &clip_to_target)) {
+    if (property_trees->ComputeTransformToTarget(clip_node->target_transform_id,
+                                                 target_effect_node->id,
+                                                 &clip_to_target)) {
       *clip_rect_in_target_space = MathUtil::ProjectClippedRect(
           clip_to_target, clip_node->clip_in_target_space);
     } else {
       return false;
     }
   }
   return true;
 }
 
 struct ConditionalClip {
   bool is_clipped;
   gfx::RectF clip_rect;
 };
 
 static ConditionalClip ComputeTargetRectInLocalSpace(
     gfx::RectF rect,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree,
+    const PropertyTrees* property_trees,
     int current_transform_id,
     int target_transform_id,
     const int current_effect_id) {
+  const TransformTree& transform_tree = property_trees->transform_tree;
+  const EffectTree& effect_tree = property_trees->effect_tree;
   gfx::Transform current_to_target;
   bool success = transform_tree.ComputeTransform(
       current_transform_id, target_transform_id, &current_to_target);
   if (!success)
     // If transform is not invertible, cannot apply clip.
     return ConditionalClip{false, gfx::RectF()};
   const EffectNode* current_effect_node = effect_tree.Node(current_effect_id);
   ConcatInverseSurfaceContentsScale(current_effect_node, &current_to_target);
 
   if (current_transform_id > target_transform_id)
     return ConditionalClip{true,  // is_clipped.
                            MathUtil::MapClippedRect(current_to_target, rect)};
 
   return ConditionalClip{true,  // is_clipped.
                          MathUtil::ProjectClippedRect(current_to_target, rect)};
 }
 
 static ConditionalClip ComputeLocalRectInTargetSpace(
     gfx::RectF rect,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree,
+    const PropertyTrees* property_trees,
     int current_transform_id,
     int target_transform_id,
     int target_effect_id) {
   gfx::Transform current_to_target;
-  if (!transform_tree.ComputeTransform(current_transform_id,
-                                       target_transform_id, &current_to_target))
+  if (!property_trees->ComputeTransformToTarget(
+          current_transform_id, target_effect_id, &current_to_target))
     // If transform is not invertible, cannot apply clip.
     return ConditionalClip{false, gfx::RectF()};
   // We don't have to apply surface contents scale when target is root.
   if (target_transform_id != 0) {
+    const EffectTree& effect_tree = property_trees->effect_tree;
     const EffectNode* target_effect_node = effect_tree.Node(target_effect_id);
     PostConcatSurfaceContentsScale(target_effect_node, &current_to_target);
 #if DCHECK_IS_ON()
+    const TransformTree& transform_tree = property_trees->transform_tree;
     VerifySurfaceContentsScalesMatch(target_effect_id, target_transform_id,
                                      effect_tree, transform_tree);
 #endif
   }
 
   if (current_transform_id > target_transform_id)
     return ConditionalClip{true,  // is_clipped.
                            MathUtil::MapClippedRect(current_to_target, rect)};
 
   return ConditionalClip{true,  // is_clipped.
                          MathUtil::ProjectClippedRect(current_to_target, rect)};
 }
 
 static ConditionalClip ComputeCurrentClip(const ClipNode* clip_node,
-                                          const TransformTree& transform_tree,
-                                          const EffectTree& effect_tree,
+                                          const PropertyTrees* property_trees,
                                           int target_transform_id,
                                           int target_effect_id) {
   if (clip_node->transform_id != target_transform_id)
-    return ComputeLocalRectInTargetSpace(clip_node->clip, transform_tree,
-                                         effect_tree, clip_node->transform_id,
+    return ComputeLocalRectInTargetSpace(clip_node->clip, property_trees,
+                                         clip_node->transform_id,
                                          target_transform_id, target_effect_id);
 
+  const EffectTree& effect_tree = property_trees->effect_tree;
   gfx::RectF current_clip = clip_node->clip;
   gfx::Vector2dF surface_contents_scale =
       effect_tree.Node(target_effect_id)->surface_contents_scale;
   if (surface_contents_scale.x() > 0 && surface_contents_scale.y() > 0)
     current_clip.Scale(surface_contents_scale.x(), surface_contents_scale.y());
   return ConditionalClip{true /* is_clipped */, current_clip};
 }
 
 static ConditionalClip ComputeAccumulatedClip(
-    const ClipTree& clip_tree,
+    const PropertyTrees* property_trees,
     int local_clip_id,
-    const EffectTree& effect_tree,
-    int target_id,
-    const TransformTree& transform_tree) {
+    int target_id) {
+  const ClipTree& clip_tree = property_trees->clip_tree;
+  const EffectTree& effect_tree = property_trees->effect_tree;
+
   const ClipNode* clip_node = clip_tree.Node(local_clip_id);
   const EffectNode* target_node = effect_tree.Node(target_id);
   int target_transform_id = target_node->transform_id;
   bool is_clipped = false;
 
   // Collect all the clips that need to be accumulated.
   std::stack<const ClipNode*> parent_chain;
 
   // If target is not direct ancestor of clip, this will find least common
   // ancestor between the target and the clip.
@@ skipping 23 matching lines @@
   while (!clip_node->applies_local_clip && parent_chain.size() > 0) {
     clip_node = parent_chain.top();
     parent_chain.pop();
   }
 
   if (!clip_node->applies_local_clip)
     // No clip node applying clip in between.
     return ConditionalClip{false, gfx::RectF()};
 
   ConditionalClip current_clip = ComputeCurrentClip(
-      clip_node, transform_tree, effect_tree, target_transform_id, target_id);
+      clip_node, property_trees, target_transform_id, target_id);
   is_clipped = current_clip.is_clipped;
   gfx::RectF accumulated_clip = current_clip.clip_rect;
 
   while (parent_chain.size() > 0) {
     clip_node = parent_chain.top();
     parent_chain.pop();
     if (!clip_node->applies_local_clip) {
       continue;
     }
     ConditionalClip current_clip = ComputeCurrentClip(
-        clip_node, transform_tree, effect_tree, target_transform_id, target_id);
+        clip_node, property_trees, target_transform_id, target_id);
 
     // If transform is not invertible, no clip will be applied.
     if (!current_clip.is_clipped)
       return ConditionalClip{false, gfx::RectF()};
 
     is_clipped = true;
     accumulated_clip =
         gfx::IntersectRects(accumulated_clip, current_clip.clip_rect);
   }
 
   return ConditionalClip{
       is_clipped, accumulated_clip.IsEmpty() ? gfx::RectF() : accumulated_clip};
 }
 
 template <typename LayerType>
 void CalculateClipRects(
     const typename LayerType::LayerListType& visible_layer_list,
-    const ClipTree& clip_tree,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree,
+    const PropertyTrees* property_trees,
     bool non_root_surfaces_enabled) {
+  const ClipTree& clip_tree = property_trees->clip_tree;
   for (auto& layer : visible_layer_list) {
     const ClipNode* clip_node = clip_tree.Node(layer->clip_tree_index());
     if (!non_root_surfaces_enabled) {
       layer->set_clip_rect(
           gfx::ToEnclosingRect(clip_node->clip_in_target_space));
       continue;
     }
 
     // When both the layer and the target are unclipped, the entire layer
     // content rect is visible.
     const bool fully_visible =
         !clip_node->layers_are_clipped && !clip_node->target_is_clipped;
 
     if (!fully_visible) {
+      const TransformTree& transform_tree = property_trees->transform_tree;
       const TransformNode* transform_node =
           transform_tree.Node(layer->transform_tree_index());
       int target_node_id = transform_tree.ContentTargetId(transform_node->id);
 
       // The clip node stores clip rect in its target space.
       gfx::RectF clip_rect_in_target_space = clip_node->clip_in_target_space;
 
       // If required, this clip rect should be mapped to the current layer's
       // target space.
       if (clip_node->target_transform_id != target_node_id) {
         // In this case, layer has a clip parent or scroll parent (or shares the
         // target with an ancestor layer that has clip parent) and the clip
         // parent's target is different from the layer's target. As the layer's
         // target has unclippped descendants, it is unclippped.
         if (!clip_node->layers_are_clipped)
           continue;
 
         // Compute the clip rect in target space and store it.
-        if (!ComputeClipRectInTargetSpace(layer, clip_node, transform_tree,
-                                          effect_tree, target_node_id,
+        if (!ComputeClipRectInTargetSpace(layer, clip_node, property_trees,
+                                          target_node_id,
                                           &clip_rect_in_target_space))
           continue;
       }
 
       if (!clip_rect_in_target_space.IsEmpty()) {
         layer->set_clip_rect(gfx::ToEnclosingRect(clip_rect_in_target_space));
       } else {
         layer->set_clip_rect(gfx::Rect());
       }
     }
   }
 }
 
 bool GetLayerClipRect(const scoped_refptr<Layer> layer,
                       const ClipNode* clip_node,
-                      const TransformTree& transform_tree,
-                      const EffectTree& effect_tree,
+                      const PropertyTrees* property_trees,
                       int target_node_id,
                       gfx::RectF* clip_rect_in_target_space) {
-  return ComputeClipRectInTargetSpace(layer.get(), clip_node, transform_tree,
-                                      effect_tree, target_node_id,
+  return ComputeClipRectInTargetSpace(layer.get(), clip_node, property_trees,
+                                      target_node_id,
                                       clip_rect_in_target_space);
 }
 
 bool GetLayerClipRect(const LayerImpl* layer,
                       const ClipNode* clip_node,
-                      const TransformTree& transform_tree,
-                      const EffectTree& effect_tree,
+                      const PropertyTrees* property_trees,
                       int target_node_id,
                       gfx::RectF* clip_rect_in_target_space) {
   // This is equivalent of calling ComputeClipRectInTargetSpace.
   *clip_rect_in_target_space = gfx::RectF(layer->clip_rect());
-  return transform_tree.Node(target_node_id)->ancestors_are_invertible;
+  return property_trees->transform_tree.Node(target_node_id)
+      ->ancestors_are_invertible;
 }
 
 template <typename LayerType>
 void CalculateVisibleRects(
     const typename LayerType::LayerListType& visible_layer_list,
-    const ClipTree& clip_tree,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree,
+    const PropertyTrees* property_trees,
     bool non_root_surfaces_enabled) {
+  const EffectTree& effect_tree = property_trees->effect_tree;
+  const TransformTree& transform_tree = property_trees->transform_tree;
+  const ClipTree& clip_tree = property_trees->clip_tree;
   for (auto& layer : visible_layer_list) {
     gfx::Size layer_bounds = layer->bounds();
 
     int effect_ancestor_with_copy_request =
         effect_tree.ClosestAncestorWithCopyRequest(layer->effect_tree_index());
     if (effect_ancestor_with_copy_request > 1) {
       // Non root copy request.
-      ConditionalClip accumulated_clip_rect = ComputeAccumulatedClip(
-          clip_tree, layer->clip_tree_index(), effect_tree,
-          effect_ancestor_with_copy_request, transform_tree);
+      ConditionalClip accumulated_clip_rect =
+          ComputeAccumulatedClip(property_trees, layer->clip_tree_index(),
+                                 effect_ancestor_with_copy_request);
       if (!accumulated_clip_rect.is_clipped) {
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
         continue;
       }
 
       gfx::RectF accumulated_clip_in_copy_request_space =
           accumulated_clip_rect.clip_rect;
 
       const EffectNode* copy_request_effect_node =
           effect_tree.Node(effect_ancestor_with_copy_request);
       ConditionalClip clip_in_layer_space = ComputeTargetRectInLocalSpace(
-          accumulated_clip_in_copy_request_space, transform_tree, effect_tree,
+          accumulated_clip_in_copy_request_space, property_trees,
           copy_request_effect_node->transform_id, layer->transform_tree_index(),
           copy_request_effect_node->id);
 
       if (clip_in_layer_space.is_clipped) {
         gfx::RectF clip_rect = clip_in_layer_space.clip_rect;
         clip_rect.Offset(-layer->offset_to_transform_parent());
         gfx::Rect visible_rect = gfx::ToEnclosingRect(clip_rect);
         visible_rect.Intersect(gfx::Rect(layer_bounds));
         layer->set_visible_layer_rect(visible_rect);
       } else {
@@ skipping 53 matching lines @@
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
         continue;
       }
 
       // We use the clip node's clip_in_target_space (and not
       // combined_clip_in_target_space) here because we want to clip
       // with respect to clip parent's local clip and not its combined clip as
       // the combined clip has even the clip parent's target's clip baked into
       // it and as our target is different, we don't want to use it in our
       // visible rect computation.
-      if (!GetLayerClipRect(layer, clip_node, transform_tree, effect_tree,
-                            target_node_id,
+      if (!GetLayerClipRect(layer, clip_node, property_trees, target_node_id,
                             &combined_clip_rect_in_target_space)) {
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
         continue;
       }
     } else {
       if (clip_node->target_is_clipped) {
         combined_clip_rect_in_target_space =
             clip_node->combined_clip_in_target_space;
       } else {
         combined_clip_rect_in_target_space = clip_node->clip_in_target_space;
@@ skipping 255 matching lines @@
 
 void ConcatInverseSurfaceContentsScale(const EffectNode* effect_node,
                                        gfx::Transform* transform) {
   DCHECK(effect_node->has_render_surface);
   if (effect_node->surface_contents_scale.x() != 0.0 &&
       effect_node->surface_contents_scale.y() != 0.0)
     transform->Scale(1.0 / effect_node->surface_contents_scale.x(),
                      1.0 / effect_node->surface_contents_scale.y());
 }
 
-void ComputeClips(ClipTree* clip_tree,
-                  const TransformTree& transform_tree,
-                  const EffectTree& effect_tree,
+void ComputeClips(PropertyTrees* property_trees,
                   bool non_root_surfaces_enabled) {
+  ClipTree* clip_tree = &property_trees->clip_tree;
   if (!clip_tree->needs_update())
     return;
   for (int i = 1; i < static_cast<int>(clip_tree->size()); ++i) {
     ClipNode* clip_node = clip_tree->Node(i);
 
     if (clip_node->id == 1) {
       ResetIfHasNanCoordinate(&clip_node->clip);
       clip_node->clip_in_target_space = clip_node->clip;
       clip_node->combined_clip_in_target_space = clip_node->clip;
       continue;
     }
+    const TransformTree& transform_tree = property_trees->transform_tree;
+    const EffectTree& effect_tree = property_trees->effect_tree;
     const TransformNode* transform_node =
         transform_tree.Node(clip_node->transform_id);
     ClipNode* parent_clip_node = clip_tree->parent(clip_node);
 
     gfx::Transform parent_to_current;
     const TransformNode* parent_target_transform_node =
         transform_tree.Node(parent_clip_node->target_transform_id);
     bool success = true;
 
     // Clips must be combined in target space. We cannot, for example, combine
     // clips in the space of the child clip. The reason is non-affine
     // transforms. Say we have the following tree T->A->B->C, and B clips C, but
     // draw into target T. It may be the case that A applies a perspective
     // transform, and B and C are at different z positions. When projected into
     // target space, the relative sizes and positions of B and C can shift.
     // Since it's the relationship in target space that matters, that's where we
     // must combine clips. For each clip node, we save the clip rects in its
     // target space. So, we need to get the ancestor clip rect in the current
     // clip node's target space.
     gfx::RectF parent_combined_clip_in_target_space =
         parent_clip_node->combined_clip_in_target_space;
     gfx::RectF parent_clip_in_target_space =
         parent_clip_node->clip_in_target_space;
     if (parent_target_transform_node &&
         parent_target_transform_node->id != clip_node->target_transform_id &&
         non_root_surfaces_enabled) {
-      success &= transform_tree.ComputeTransform(
-          parent_target_transform_node->id, clip_node->target_transform_id,
+      success &= property_trees->ComputeTransformToTarget(
+          parent_target_transform_node->id, clip_node->target_effect_id,
           &parent_to_current);
       // We don't have to apply surface contents scale when target is root.
       if (clip_node->target_transform_id != 0) {
         const EffectNode* target_effect_node =
             effect_tree.Node(clip_node->target_effect_id);
         PostConcatSurfaceContentsScale(target_effect_node, &parent_to_current);
 #if DCHECK_IS_ON()
         VerifySurfaceContentsScalesMatch(clip_node->target_effect_id,
                                          clip_node->target_transform_id,
                                          effect_tree, transform_tree);
@@ skipping 59 matching lines @@
       }
     } else {
       gfx::Transform source_to_target;
 
       if (!non_root_surfaces_enabled) {
         source_to_target = transform_tree.ToScreen(clip_node->transform_id);
       } else if (transform_tree.ContentTargetId(transform_node->id) ==
                  clip_node->target_transform_id) {
         source_to_target = transform_tree.ToTarget(clip_node->transform_id);
       } else {
-        success = transform_tree.ComputeTransform(
-            transform_node->id, clip_node->target_transform_id,
-            &source_to_target);
+        success = property_trees->ComputeTransformToTarget(
+            transform_node->id, clip_node->target_effect_id, &source_to_target);
         // We don't have to apply surface contents scale when target is root.
         if (clip_node->target_transform_id != 0) {
           const EffectNode* target_effect_node =
               effect_tree.Node(clip_node->target_effect_id);
           PostConcatSurfaceContentsScale(target_effect_node, &source_to_target);
 #if DCHECK_IS_ON()
           VerifySurfaceContentsScalesMatch(clip_node->target_effect_id,
                                            clip_node->target_transform_id,
                                            effect_tree, transform_tree);
 #endif
@@ skipping 58 matching lines @@
   if (!effect_tree->needs_update())
     return;
   for (int i = 1; i < static_cast<int>(effect_tree->size()); ++i)
     effect_tree->UpdateEffects(i);
   effect_tree->set_needs_update(false);
 }
 
 static void ComputeClipsWithEffectTree(PropertyTrees* property_trees) {
   EffectTree* effect_tree = &property_trees->effect_tree;
   const ClipTree* clip_tree = &property_trees->clip_tree;
-  const TransformTree* transform_tree = &property_trees->transform_tree;
   EffectNode* root_effect_node = effect_tree->Node(1);
   const RenderSurfaceImpl* root_render_surface =
       root_effect_node->render_surface;
   gfx::Rect root_clip =
       gfx::ToEnclosingRect(clip_tree->Node(root_effect_node->clip_id)->clip);
   if (root_render_surface->is_clipped())
     DCHECK(root_clip == root_render_surface->clip_rect())
         << "clip on root render surface: "
         << root_render_surface->clip_rect().ToString()
         << " v.s. root effect node's clip: " << root_clip.ToString();
   for (int i = 2; i < static_cast<int>(effect_tree->size()); ++i) {
     EffectNode* effect_node = effect_tree->Node(i);
     const EffectNode* target_node = effect_tree->Node(effect_node->target_id);
-    ConditionalClip accumulated_clip_rect =
-        ComputeAccumulatedClip(*clip_tree, effect_node->clip_id, *effect_tree,
-                               target_node->id, *transform_tree);
+    ConditionalClip accumulated_clip_rect = ComputeAccumulatedClip(
+        property_trees, effect_node->clip_id, target_node->id);
     gfx::RectF accumulated_clip = accumulated_clip_rect.clip_rect;
     const RenderSurfaceImpl* render_surface = effect_node->render_surface;
     if (render_surface && render_surface->is_clipped()) {
       DCHECK(gfx::ToEnclosingRect(accumulated_clip) ==
              render_surface->clip_rect())
           << " render surface's clip rect: "
           << render_surface->clip_rect().ToString()
           << " v.s. accumulated clip: "
           << gfx::ToEnclosingRect(accumulated_clip).ToString();
     }
   }
 }
 
 static void ComputeLayerClipRect(const PropertyTrees* property_trees,
                                  const LayerImpl* layer) {
   const EffectTree* effect_tree = &property_trees->effect_tree;
   const ClipTree* clip_tree = &property_trees->clip_tree;
-  const TransformTree* transform_tree = &property_trees->transform_tree;
   const EffectNode* effect_node = effect_tree->Node(layer->effect_tree_index());
   const EffectNode* target_node =
       effect_node->has_render_surface
           ? effect_node
           : effect_tree->Node(effect_node->target_id);
   // TODO(weiliangc): When effect node has up to date render surface info on
   // compositor thread, no need to check for resourceless draw mode
   if (!property_trees->non_root_surfaces_enabled) {
     target_node = effect_tree->Node(1);
   }
 
-  ConditionalClip accumulated_clip_rect =
-      ComputeAccumulatedClip(*clip_tree, layer->clip_tree_index(), *effect_tree,
-                             target_node->id, *transform_tree);
+  ConditionalClip accumulated_clip_rect = ComputeAccumulatedClip(
+      property_trees, layer->clip_tree_index(), target_node->id);
 
   gfx::RectF accumulated_clip = accumulated_clip_rect.clip_rect;
 
   if ((!property_trees->non_root_surfaces_enabled &&
        clip_tree->Node(layer->clip_tree_index())
            ->layers_are_clipped_when_surfaces_disabled) ||
       clip_tree->Node(layer->clip_tree_index())->layers_are_clipped) {
     DCHECK(layer->clip_rect() == gfx::ToEnclosingRect(accumulated_clip))
         << " layer: " << layer->id() << " clip id: " << layer->clip_tree_index()
         << " layer clip: " << layer->clip_rect().ToString() << " v.s. "
@@ skipping 13 matching lines @@
     return node->transform_id;
   node = effect_tree.Node(node->target_id);
   return node->transform_id;
 }
 
 static void VerifyDrawTransformsMatch(LayerImpl* layer,
                                       PropertyTrees* property_trees) {
   const int source_id = layer->transform_tree_index();
   int destination_id = FindTargetTransformTreeIndexFromEffectTree(
       property_trees->effect_tree, layer->effect_tree_index());
+  const EffectNode* target_effect_node = ContentsTargetEffectNode(
+      layer->effect_tree_index(), property_trees->effect_tree);
   gfx::Transform draw_transform;
-  property_trees->transform_tree.ComputeTransform(source_id, destination_id,
-                                                  &draw_transform);
+  property_trees->ComputeTransformToTarget(source_id, target_effect_node->id,
+                                           &draw_transform);
   // We don't have to apply surface contents scale when target is root.
   if (destination_id != 0) {
-    const EffectNode* target_effect_node = ContentsTargetEffectNode(
-        layer->effect_tree_index(), property_trees->effect_tree);
     PostConcatSurfaceContentsScale(target_effect_node, &draw_transform);
 #if DCHECK_IS_ON()
     VerifySurfaceContentsScalesMatch(layer->effect_tree_index(), destination_id,
                                      property_trees->effect_tree,
                                      property_trees->transform_tree);
 #endif
   }
   if (layer->should_flatten_transform_from_property_tree())
     draw_transform.FlattenTo2d();
   draw_transform.Translate(layer->offset_to_transform_parent().x(),
@@ skipping 22 matching lines @@
   if (property_trees->transform_tree.needs_update()) {
     property_trees->clip_tree.set_needs_update(true);
     property_trees->effect_tree.set_needs_update(true);
   }
   UpdateRenderTarget(&property_trees->effect_tree,
                      property_trees->non_root_surfaces_enabled);
   ComputeTransforms(&property_trees->transform_tree);
   // Computation of clips uses surface contents scale which is updated while
   // computing effects. So, ComputeEffects should be before ComputeClips.
   ComputeEffects(&property_trees->effect_tree);
-  ComputeClips(&property_trees->clip_tree, property_trees->transform_tree,
-               property_trees->effect_tree, can_render_to_separate_surface);
+  ComputeClips(property_trees, can_render_to_separate_surface);
 
   FindLayersThatNeedUpdates(root_layer->layer_tree_impl(),
                             property_trees->transform_tree,
                             property_trees->effect_tree, visible_layer_list);
-  CalculateClipRects<LayerImpl>(*visible_layer_list, property_trees->clip_tree,
-                                property_trees->transform_tree,
-                                property_trees->effect_tree,
+  CalculateClipRects<LayerImpl>(*visible_layer_list, property_trees,
                                 can_render_to_separate_surface);
-  CalculateVisibleRects<LayerImpl>(
-      *visible_layer_list, property_trees->clip_tree,
-      property_trees->transform_tree, property_trees->effect_tree,
-      can_render_to_separate_surface);
+  CalculateVisibleRects<LayerImpl>(*visible_layer_list, property_trees,
+                                   can_render_to_separate_surface);
 }
 
 void UpdatePropertyTrees(PropertyTrees* property_trees,
                          bool can_render_to_separate_surface) {
   if (property_trees->non_root_surfaces_enabled !=
       can_render_to_separate_surface) {
     property_trees->non_root_surfaces_enabled = can_render_to_separate_surface;
     property_trees->transform_tree.set_needs_update(true);
   }
   if (property_trees->transform_tree.needs_update()) {
     property_trees->clip_tree.set_needs_update(true);
     property_trees->effect_tree.set_needs_update(true);
   }
   ComputeTransforms(&property_trees->transform_tree);
   // Computation of clips uses surface contents scale which is updated while
   // computing effects. So, ComputeEffects should be before ComputeClips.
   ComputeEffects(&property_trees->effect_tree);
-  ComputeClips(&property_trees->clip_tree, property_trees->transform_tree,
-               property_trees->effect_tree, can_render_to_separate_surface);
+  ComputeClips(property_trees, can_render_to_separate_surface);
 }
 
 void ComputeVisibleRectsForTesting(PropertyTrees* property_trees,
                                    bool can_render_to_separate_surface,
                                    LayerList* update_layer_list) {
-  CalculateVisibleRects<Layer>(*update_layer_list, property_trees->clip_tree,
-                               property_trees->transform_tree,
-                               property_trees->effect_tree,
+  CalculateVisibleRects<Layer>(*update_layer_list, property_trees,
                                can_render_to_separate_surface);
 }
 
 void BuildPropertyTreesAndComputeVisibleRects(
     LayerImpl* root_layer,
     const LayerImpl* page_scale_layer,
     const LayerImpl* inner_viewport_scroll_layer,
     const LayerImpl* outer_viewport_scroll_layer,
     const LayerImpl* overscroll_elasticity_layer,
     const gfx::Vector2dF& elastic_overscroll,
@@ skipping 83 matching lines @@
                 effect_node->surface_contents_scale.y());
 #if DCHECK_IS_ON()
     VerifySurfaceContentsScalesMatch(layer->effect_tree_index(),
                                      layer->transform_tree_index(), effect_tree,
                                      transform_tree);
 #endif
   }
   return xform;
 }
 
-static void SetSurfaceDrawTransform(const TransformTree& transform_tree,
-                                    const EffectTree& effect_tree,
+static void SetSurfaceDrawTransform(const PropertyTrees* property_trees,
                                     RenderSurfaceImpl* render_surface) {
+  const TransformTree& transform_tree = property_trees->transform_tree;
+  const EffectTree& effect_tree = property_trees->effect_tree;
   const TransformNode* transform_node =
       transform_tree.Node(render_surface->TransformTreeIndex());
   const EffectNode* effect_node =
       effect_tree.Node(render_surface->EffectTreeIndex());
   // The draw transform of root render surface is identity tranform.
   if (transform_node->id == 1) {
     render_surface->SetDrawTransform(gfx::Transform());
     return;
   }
 
   gfx::Transform render_surface_transform;
   const TransformNode* target_transform_node =
       transform_tree.Node(transform_tree.TargetId(transform_node->id));
-  transform_tree.ComputeTransform(transform_node->id, target_transform_node->id,
-                                  &render_surface_transform);
+  const EffectNode* target_effect_node =
+      effect_tree.Node(effect_node->target_id);
+  property_trees->ComputeTransformToTarget(
+      transform_node->id, target_effect_node->id, &render_surface_transform);
   // We don't have to apply surface contents scale when target is root.
   if (target_transform_node->id != 0) {
-    const EffectNode* target_effect_node =
-        effect_tree.Node(effect_node->target_id);
     PostConcatSurfaceContentsScale(target_effect_node,
                                    &render_surface_transform);
 #if DCHECK_IS_ON()
     VerifySurfaceContentsScalesMatch(effect_node->target_id,
                                      target_transform_node->id, effect_tree,
                                      transform_tree);
 #endif
   }
 
   ConcatInverseSurfaceContentsScale(effect_node, &render_surface_transform);
 #if DCHECK_IS_ON()
   VerifySurfaceContentsScalesMatch(effect_node->id, transform_node->id,
                                    effect_tree, transform_tree);
 #endif
   render_surface->SetDrawTransform(render_surface_transform);
 }
 
 static void SetSurfaceIsClipped(const ClipNode* clip_node,
                                 RenderSurfaceImpl* render_surface) {
   DCHECK(render_surface->OwningLayerId() == clip_node->owner_id)
       << "we now create clip node for every render surface";
 
   render_surface->SetIsClipped(clip_node->target_is_clipped);
 }
 
 static void SetSurfaceClipRect(const ClipNode* parent_clip_node,
-                               const TransformTree& transform_tree,
-                               const EffectTree& effect_tree,
+                               const PropertyTrees* property_trees,
                                RenderSurfaceImpl* render_surface) {
   if (!render_surface->is_clipped()) {
     render_surface->SetClipRect(gfx::Rect());
     return;
   }
 
+  const EffectTree& effect_tree = property_trees->effect_tree;
+  const TransformTree& transform_tree = property_trees->transform_tree;
   const TransformNode* transform_node =
       transform_tree.Node(render_surface->TransformTreeIndex());
   if (transform_tree.TargetId(transform_node->id) ==
       parent_clip_node->target_transform_id) {
     render_surface->SetClipRect(
         gfx::ToEnclosingRect(parent_clip_node->clip_in_target_space));
     return;
   }
 
   // In this case, the clip child has reset the clip node for subtree and hence
   // the parent clip node's clip rect is in clip parent's target space and not
   // our target space. We need to transform it to our target space.
   gfx::Transform clip_parent_target_to_target;
-  const bool success = transform_tree.ComputeTransform(
-      parent_clip_node->target_transform_id,
-      transform_tree.TargetId(transform_node->id),
+  const EffectNode* effect_node =
+      effect_tree.Node(render_surface->EffectTreeIndex());
+  int target_effect_id = effect_node->target_id;
+  const bool success = property_trees->ComputeTransformToTarget(
+      parent_clip_node->target_transform_id, target_effect_id,
       &clip_parent_target_to_target);
 
   if (!success) {
     render_surface->SetClipRect(gfx::Rect());
     return;
   }
 
   // We don't have to apply surface contents scale when target is root.
   if (transform_tree.TargetId(transform_node->id) != 0) {
     const EffectNode* effect_node =
@@ skipping 71 matching lines @@
     const gfx::Rect& layer_bounds_in_target_space,
     const gfx::Rect& clip_rect) {
   if (layer->is_clipped())
     return IntersectRects(layer_bounds_in_target_space, clip_rect);
 
   return layer_bounds_in_target_space;
 }
 
 static gfx::Transform ReplicaToSurfaceTransform(
     const RenderSurfaceImpl* render_surface,
-    const TransformTree& transform_tree,
-    const EffectTree& effect_tree) {
+    const PropertyTrees* property_trees) {
   gfx::Transform replica_to_surface;
   if (!render_surface->HasReplica())
     return replica_to_surface;
   const LayerImpl* replica_layer = render_surface->ReplicaLayer();
+  const EffectTree& effect_tree = property_trees->effect_tree;
   const EffectNode* surface_effect_node =
       effect_tree.Node(render_surface->EffectTreeIndex());
   if (render_surface->TransformTreeIndex() != 0) {
     replica_to_surface.Scale(surface_effect_node->surface_contents_scale.x(),
                              surface_effect_node->surface_contents_scale.y());
 #if DCHECK_IS_ON()
+    const TransformTree& transform_tree = property_trees->transform_tree;
     VerifySurfaceContentsScalesMatch(render_surface->EffectTreeIndex(),
                                      render_surface->TransformTreeIndex(),
                                      effect_tree, transform_tree);
 #endif
   }
   replica_to_surface.Translate(replica_layer->offset_to_transform_parent().x(),
                                replica_layer->offset_to_transform_parent().y());
   gfx::Transform replica_transform_node_to_surface;
-  transform_tree.ComputeTransform(replica_layer->transform_tree_index(),
-                                  render_surface->TransformTreeIndex(),
-                                  &replica_transform_node_to_surface);
+  property_trees->ComputeTransformToTarget(
+      replica_layer->transform_tree_index(), render_surface->EffectTreeIndex(),
+      &replica_transform_node_to_surface);
   replica_to_surface.PreconcatTransform(replica_transform_node_to_surface);
   if (surface_effect_node->surface_contents_scale.x() != 0 &&
       surface_effect_node->surface_contents_scale.y() != 0) {
     replica_to_surface.Scale(
         1.0 / surface_effect_node->surface_contents_scale.x(),
         1.0 / surface_effect_node->surface_contents_scale.y());
   }
   return replica_to_surface;
 }
 
@@ skipping 43 matching lines @@
       gfx::Rect(mask_layer->bounds());
 }
 
 void ComputeSurfaceDrawProperties(const PropertyTrees* property_trees,
                                   RenderSurfaceImpl* render_surface) {
   const ClipNode* clip_node =
       property_trees->clip_tree.Node(render_surface->ClipTreeIndex());
 
   SetSurfaceIsClipped(clip_node, render_surface);
   SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface);
-  SetSurfaceDrawTransform(property_trees->transform_tree,
-                          property_trees->effect_tree, render_surface);
+  SetSurfaceDrawTransform(property_trees, render_surface);
   render_surface->SetScreenSpaceTransform(
       property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale(
           render_surface->TransformTreeIndex(),
           render_surface->EffectTreeIndex()));
 
   if (render_surface->HasReplica()) {
-    gfx::Transform replica_to_surface = ReplicaToSurfaceTransform(
-        render_surface, property_trees->transform_tree,
-        property_trees->effect_tree);
+    gfx::Transform replica_to_surface =
+        ReplicaToSurfaceTransform(render_surface, property_trees);
     render_surface->SetReplicaDrawTransform(render_surface->draw_transform() *
                                             replica_to_surface);
     render_surface->SetReplicaScreenSpaceTransform(
         render_surface->screen_space_transform() * replica_to_surface);
   } else {
     render_surface->SetReplicaDrawTransform(gfx::Transform());
     render_surface->SetReplicaScreenSpaceTransform(gfx::Transform());
   }
 
   SetSurfaceClipRect(property_trees->clip_tree.parent(clip_node),
-                     property_trees->transform_tree,
-                     property_trees->effect_tree, render_surface);
+                     property_trees, render_surface);
 }
 
 #if DCHECK_IS_ON()
 static void ValidatePageScaleLayer(const Layer* page_scale_layer) {
   DCHECK_EQ(page_scale_layer->position().ToString(), gfx::PointF().ToString());
   DCHECK_EQ(page_scale_layer->transform_origin().ToString(),
             gfx::Point3F().ToString());
 }
 
 static void ValidatePageScaleLayer(const LayerImpl* page_scale_layer) {}
@@ skipping 84 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc