cc: Use sublayer scale from effect tree (2)

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 36 matching lines @@
   EffectNode* effect_node =
       layer->layer_tree_impl()->property_trees()->effect_tree.Node(
           layer->effect_tree_index());
   if (effect_node->owner_id != layer->id())
     return;
   DCHECK_EQ(effect_node->mask_layer_id, -1) << "layer: " << layer->id();
   DCHECK_EQ(effect_node->replica_layer_id, -1) << "layer: " << layer->id();
   DCHECK(effect_node->background_filters.IsEmpty());
 }
 
-void VerifySublayerScalesMatch(const int effect_node_id,
-                               const int target_transform_id,
-                               const EffectTree& effect_tree,
-                               const TransformTree& transform_tree) {
+void VerifySurfaceContentsScalesMatch(const int target_effect_id,
+                                      const int target_transform_id,
+                                      const EffectTree& effect_tree,
+                                      const TransformTree& transform_tree) {
   const TransformNode* target_transform_node =
       transform_tree.Node(target_transform_id);
-  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
-  const EffectNode* target_effect_node =
-      effect_node->has_render_surface
-          ? effect_node
-          : effect_tree.Node(effect_node->target_id);
-  DCHECK(target_transform_node->sublayer_scale ==
-         target_effect_node->sublayer_scale)
-      << " sublayer scale from transform tree: "
-      << target_transform_node->sublayer_scale.ToString()
-      << " sublayer scale from effect tree: "
-      << target_effect_node->sublayer_scale.ToString();
+  const EffectNode* target_effect_node = effect_tree.Node(target_effect_id);
+  DCHECK(target_transform_node->surface_contents_scale ==
+         target_effect_node->surface_contents_scale)
+      << " surface contents scale from transform tree: "
+      << target_transform_node->surface_contents_scale.ToString()
+      << " surface contents scale from effect tree: "
+      << target_effect_node->surface_contents_scale.ToString();
 }
 #endif
 
+static const EffectNode* ContentsTargetEffectNode(
+    const int effect_tree_index,
+    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,
                                   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);
 
   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)) {
-      // We don't have to apply sublayer scale when target is root.
+      // We don't have to apply surface contents scale when target is root.
       if (target_node_id != 0) {
-        PostConcatSublayerScale(layer->effect_tree_index(), effect_tree,
-                                &clip_to_target);
+        const EffectNode* target_effect_node =
+            ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
+        PostConcatSurfaceContentsScale(target_effect_node, &clip_to_target);
 #if DCHECK_IS_ON()
-        VerifySublayerScalesMatch(layer->effect_tree_index(), target_node_id,
-                                  effect_tree, transform_tree);
+        VerifySurfaceContentsScalesMatch(layer->effect_tree_index(),
+                                         target_node_id, effect_tree,
+                                         transform_tree);
 #endif
       }
 
-      const TransformNode* source_node =
-          transform_tree.Node(clip_node->target_transform_id);
-      if (source_node->sublayer_scale.x() != 0.f &&
-          source_node->sublayer_scale.y() != 0.f)
-        clip_to_target.Scale(1.0f / source_node->sublayer_scale.x(),
-                             1.0f / source_node->sublayer_scale.y());
+      const EffectNode* source_node =
+          effect_tree.Node(clip_node->target_effect_id);
+      ConcatInverseSurfaceContentsScale(source_node, &clip_to_target);
+#if DCHECK_IS_ON()
+      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)) {
       *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,
     int current_transform_id,
-    int target_transform_id) {
+    int target_transform_id,
+    const int current_effect_id) {
   gfx::Transform current_to_target;
-  if (!transform_tree.ComputeTransformWithSourceSublayerScale(
-          current_transform_id, target_transform_id, &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,
     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 transform is not invertible, cannot apply clip.
     return ConditionalClip{false, gfx::RectF()};
-  // We don't have to apply sublayer scale when target is root.
+  // We don't have to apply surface contents scale when target is root.
   if (target_transform_id != 0) {
-    PostConcatSublayerScale(target_effect_id, effect_tree, &current_to_target);
+    const EffectNode* target_effect_node = effect_tree.Node(target_effect_id);
+    PostConcatSurfaceContentsScale(target_effect_node, &current_to_target);
 #if DCHECK_IS_ON()
-    VerifySublayerScalesMatch(target_effect_id, target_transform_id,
-                              effect_tree, 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,
                                           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,
                                          target_transform_id, target_effect_id);
 
   gfx::RectF current_clip = clip_node->clip;
-  gfx::Vector2dF sublayer_scale =
-      transform_tree.Node(target_transform_id)->sublayer_scale;
-  if (sublayer_scale.x() > 0 && sublayer_scale.y() > 0)
-    current_clip.Scale(sublayer_scale.x(), sublayer_scale.y());
+  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,
     int local_clip_id,
     const EffectTree& effect_tree,
     int target_id,
     const TransformTree& transform_tree) {
   const ClipNode* clip_node = clip_tree.Node(local_clip_id);
@@ skipping 162 matching lines @@
         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,
-          copy_request_effect_node->transform_id,
-          layer->transform_tree_index());
+          accumulated_clip_in_copy_request_space, transform_tree, effect_tree,
+          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 {
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
       }
@@ skipping 94 matching lines @@
         layer_content_bounds_in_target_space);
     if (combined_clip_rect_in_target_space.IsEmpty()) {
       layer->set_visible_layer_rect(gfx::Rect());
       continue;
     }
 
     gfx::Transform target_to_layer;
     if (transform_node->ancestors_are_invertible) {
       target_to_layer = transform_tree.FromTarget(transform_node->id);
     } else {
-      if (!transform_tree.ComputeTransformWithSourceSublayerScale(
-              target_node_id, transform_node->id, &target_to_layer)) {
+      bool success = transform_tree.ComputeTransform(
+          target_node_id, transform_node->id, &target_to_layer);
+      if (!success) {
         // An animated singular transform may become non-singular during the
         // animation, so we still need to compute a visible rect. In this
         // situation, we treat the entire layer as visible.
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
         continue;
       }
+      if (target_node_id != 0) {
+        const EffectNode* target_effect_node =
+            ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
+        ConcatInverseSurfaceContentsScale(target_effect_node, &target_to_layer);
+#if DCHECK_IS_ON()
+        VerifySurfaceContentsScalesMatch(target_effect_node->id, target_node_id,
+                                         effect_tree, transform_tree);
+#endif
+      }
     }
-
     gfx::Transform target_to_content;
     target_to_content.Translate(-layer->offset_to_transform_parent().x(),
                                 -layer->offset_to_transform_parent().y());
     target_to_content.PreconcatTransform(target_to_layer);
 
     gfx::Rect visible_rect = gfx::ToEnclosingRect(MathUtil::ProjectClippedRect(
         target_to_content, combined_clip_rect_in_target_space));
     visible_rect.Intersect(gfx::Rect(layer_bounds));
     layer->set_visible_layer_rect(visible_rect);
   }
@@ skipping 179 matching lines @@
     }
   }
 }
 
 static void ResetIfHasNanCoordinate(gfx::RectF* rect) {
   if (std::isnan(rect->x()) || std::isnan(rect->y()) ||
       std::isnan(rect->right()) || std::isnan(rect->bottom()))
     *rect = gfx::RectF();
 }
 
-void PostConcatSublayerScale(const int effect_node_id,
-                             const EffectTree& effect_tree,
-                             gfx::Transform* transform) {
-  // TODO(jaydasika): This function should not compute target effect node id. It
-  // should receive it from callers.
-  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
-  const EffectNode* target_effect_node =
-      effect_node->has_render_surface
-          ? effect_node
-          : effect_tree.Node(effect_node->target_id);
-  transform->matrix().postScale(target_effect_node->sublayer_scale.x(),
-                                target_effect_node->sublayer_scale.y(), 1.f);
+void PostConcatSurfaceContentsScale(const EffectNode* effect_node,
+                                    gfx::Transform* transform) {
+  DCHECK(effect_node->has_render_surface);
+  transform->matrix().postScale(effect_node->surface_contents_scale.x(),
+                                effect_node->surface_contents_scale.y(), 1.f);
 }
 
-void ConcatInverseSublayerScale(const int effect_node_id,
-                                const EffectTree& effect_tree,
-                                gfx::Transform* transform) {
-  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
-  if (effect_node->sublayer_scale.x() != 0.0 &&
-      effect_node->sublayer_scale.y() != 0.0)
-    transform->Scale(1.0 / effect_node->sublayer_scale.x(),
-                     1.0 / effect_node->sublayer_scale.y());
+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,
                   bool non_root_surfaces_enabled) {
   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);
@@ skipping 26 matching lines @@
     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,
           &parent_to_current);
-      // We don't have to apply sublayer scale when target is root.
+      // We don't have to apply surface contents scale when target is root.
       if (clip_node->target_transform_id != 0) {
-        PostConcatSublayerScale(clip_node->target_effect_id, effect_tree,
-                                &parent_to_current);
+        const EffectNode* target_effect_node =
+            effect_tree.Node(clip_node->target_effect_id);
+        PostConcatSurfaceContentsScale(target_effect_node, &parent_to_current);
 #if DCHECK_IS_ON()
-        VerifySublayerScalesMatch(clip_node->target_effect_id,
-                                  clip_node->target_transform_id, effect_tree,
-                                  transform_tree);
+        VerifySurfaceContentsScalesMatch(clip_node->target_effect_id,
+                                         clip_node->target_transform_id,
+                                         effect_tree, transform_tree);
 #endif
       }
-      if (parent_target_transform_node->sublayer_scale.x() > 0 &&
-          parent_target_transform_node->sublayer_scale.y() > 0)
-        parent_to_current.Scale(
-            1.f / parent_target_transform_node->sublayer_scale.x(),
-            1.f / parent_target_transform_node->sublayer_scale.y());
+      if (parent_clip_node->target_transform_id != 0) {
+        const EffectNode* parent_target_effect_node =
+            effect_tree.Node(parent_clip_node->target_effect_id);
+        ConcatInverseSurfaceContentsScale(parent_target_effect_node,
+                                          &parent_to_current);
+#if DCHECK_IS_ON()
+        VerifySurfaceContentsScalesMatch(parent_clip_node->target_effect_id,
+                                         parent_clip_node->target_transform_id,
+                                         effect_tree, transform_tree);
+#endif
+      }
       // If we can't compute a transform, it's because we had to use the inverse
       // of a singular transform. We won't draw in this case, so there's no need
       // to compute clips.
       if (!success)
         continue;
       parent_combined_clip_in_target_space = MathUtil::ProjectClippedRect(
           parent_to_current, parent_clip_node->combined_clip_in_target_space);
       parent_clip_in_target_space = MathUtil::ProjectClippedRect(
           parent_to_current, parent_clip_node->clip_in_target_space);
     }
@@ skipping 39 matching lines @@
 
       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);
-        // We don't have to apply sublayer scale when target is root.
+        // We don't have to apply surface contents scale when target is root.
         if (clip_node->target_transform_id != 0) {
-          PostConcatSublayerScale(clip_node->target_effect_id, effect_tree,
-                                  &source_to_target);
+          const EffectNode* target_effect_node =
+              effect_tree.Node(clip_node->target_effect_id);
+          PostConcatSurfaceContentsScale(target_effect_node, &source_to_target);
 #if DCHECK_IS_ON()
-          VerifySublayerScalesMatch(clip_node->target_effect_id,
-                                    clip_node->target_transform_id, effect_tree,
-                                    transform_tree);
+          VerifySurfaceContentsScalesMatch(clip_node->target_effect_id,
+                                           clip_node->target_transform_id,
+                                           effect_tree, transform_tree);
 #endif
         }
         // source_to_target computation should be successful as target is an
         // ancestor of the transform node.
         DCHECK(success);
       }
 
       gfx::RectF source_clip_in_target_space =
           MathUtil::MapClippedRect(source_to_target, clip_node->clip);
 
@@ skipping 134 matching lines @@
 }
 
 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());
   gfx::Transform draw_transform;
   property_trees->transform_tree.ComputeTransform(source_id, destination_id,
                                                   &draw_transform);
-  // We don't have to apply sublayer scale when target is root.
+  // We don't have to apply surface contents scale when target is root.
   if (destination_id != 0) {
-    PostConcatSublayerScale(layer->effect_tree_index(),
-                            property_trees->effect_tree, &draw_transform);
+    const EffectNode* target_effect_node = ContentsTargetEffectNode(
+        layer->effect_tree_index(), property_trees->effect_tree);
+    PostConcatSurfaceContentsScale(target_effect_node, &draw_transform);
 #if DCHECK_IS_ON()
-    VerifySublayerScalesMatch(layer->effect_tree_index(), destination_id,
-                              property_trees->effect_tree,
-                              property_trees->transform_tree);
+    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(),
                            layer->offset_to_transform_parent().y());
   DCHECK(draw_transform.ApproximatelyEqual(
       DrawTransform(layer, property_trees->transform_tree)))
       << " layer: " << layer->id() << " source transform id: " << source_id
       << " destination transform id: " << destination_id
@@ skipping 12 matching lines @@
     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);
   }
   UpdateRenderTarget(&property_trees->effect_tree,
                      property_trees->non_root_surfaces_enabled);
   ComputeTransforms(&property_trees->transform_tree);
-  // Computation of clips uses sublayer scale which is updated while computing
-  // effects. So, ComputeEffects should be before ComputeClips.
+  // 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);
 
   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,
                                 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);
 }
 
 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 sublayer scale which is updated while computing
-  // effects. So, ComputeEffects should be before ComputeClips.
+  // 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);
 }
 
 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,
@@ skipping 80 matching lines @@
       !IsRootLayer(layer) && layer->has_render_surface();
   if (!owns_non_root_surface) {
     // If you're not the root, or you don't own a surface, you need to apply
     // your local offset.
     xform = tree.ToTarget(layer->transform_tree_index());
     if (layer->should_flatten_transform_from_property_tree())
       xform.FlattenTo2d();
     xform.Translate(layer->offset_to_transform_parent().x(),
                     layer->offset_to_transform_parent().y());
   } else {
-    // Surfaces need to apply their sublayer scale.
-    xform.Scale(node->sublayer_scale.x(), node->sublayer_scale.y());
+    // Surfaces need to apply their surface contents scale.
+    xform.Scale(node->surface_contents_scale.x(),
+                node->surface_contents_scale.y());
   }
   return xform;
 }
 
 static void SetSurfaceDrawTransform(const TransformTree& transform_tree,
                                     const EffectTree& effect_tree,
                                     RenderSurfaceImpl* render_surface) {
   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);
-  // We don't have to apply sublayer scale when target is root.
+  // We don't have to apply surface contents scale when target is root.
   if (target_transform_node->id != 0) {
-    PostConcatSublayerScale(effect_node->target_id, effect_tree,
-                            &render_surface_transform);
+    const EffectNode* target_effect_node =
+        effect_tree.Node(effect_node->target_id);
+    PostConcatSurfaceContentsScale(target_effect_node,
+                                   &render_surface_transform);
 #if DCHECK_IS_ON()
-    VerifySublayerScalesMatch(effect_node->target_id, target_transform_node->id,
-                              effect_tree, transform_tree);
+    VerifySurfaceContentsScalesMatch(effect_node->target_id,
+                                     target_transform_node->id, effect_tree,
+                                     transform_tree);
 #endif
   }
 
-  DCHECK(transform_node->sublayer_scale == effect_node->sublayer_scale);
-  if (effect_node->sublayer_scale.x() != 0.0 &&
-      effect_node->sublayer_scale.y() != 0.0)
-    render_surface_transform.Scale(1.0 / effect_node->sublayer_scale.x(),
-                                   1.0 / effect_node->sublayer_scale.y());
+  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);
 }
@@ skipping 23 matching lines @@
   const bool success = transform_tree.ComputeTransform(
       parent_clip_node->target_transform_id,
       transform_tree.TargetId(transform_node->id),
       &clip_parent_target_to_target);
 
   if (!success) {
     render_surface->SetClipRect(gfx::Rect());
     return;
   }
 
-  // We don't have to apply sublayer scale when target is root.
+  // We don't have to apply surface contents scale when target is root.
   if (transform_tree.TargetId(transform_node->id) != 0) {
-    PostConcatSublayerScale(render_surface->EffectTreeIndex(), effect_tree,
-                            &clip_parent_target_to_target);
+    const EffectNode* effect_node =
+        effect_tree.Node(render_surface->EffectTreeIndex());
+    PostConcatSurfaceContentsScale(effect_node, &clip_parent_target_to_target);
 #if DCHECK_IS_ON()
-    VerifySublayerScalesMatch(render_surface->EffectTreeIndex(),
-                              transform_tree.TargetId(transform_node->id),
-                              effect_tree, transform_tree);
+    VerifySurfaceContentsScalesMatch(
+        render_surface->EffectTreeIndex(),
+        transform_tree.TargetId(transform_node->id), effect_tree,
+        transform_tree);
 #endif
   }
 
   DCHECK_LT(parent_clip_node->target_transform_id,
             transform_tree.TargetId(transform_node->id));
   render_surface->SetClipRect(gfx::ToEnclosingRect(MathUtil::ProjectClippedRect(
       clip_parent_target_to_target, parent_clip_node->clip_in_target_space)));
 }
 
 template <typename LayerType>
@@ skipping 61 matching lines @@
 
 static gfx::Transform ReplicaToSurfaceTransform(
     const RenderSurfaceImpl* render_surface,
     const TransformTree& tree) {
   gfx::Transform replica_to_surface;
   if (!render_surface->HasReplica())
     return replica_to_surface;
   const LayerImpl* replica_layer = render_surface->ReplicaLayer();
   const TransformNode* surface_transform_node =
       tree.Node(render_surface->TransformTreeIndex());
-  replica_to_surface.Scale(surface_transform_node->sublayer_scale.x(),
-                           surface_transform_node->sublayer_scale.y());
+  replica_to_surface.Scale(surface_transform_node->surface_contents_scale.x(),
+                           surface_transform_node->surface_contents_scale.y());
   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;
   tree.ComputeTransform(replica_layer->transform_tree_index(),
                         render_surface->TransformTreeIndex(),
                         &replica_transform_node_to_surface);
   replica_to_surface.PreconcatTransform(replica_transform_node_to_surface);
-  if (surface_transform_node->sublayer_scale.x() != 0 &&
-      surface_transform_node->sublayer_scale.y() != 0) {
-    replica_to_surface.Scale(1.0 / surface_transform_node->sublayer_scale.x(),
-                             1.0 / surface_transform_node->sublayer_scale.y());
+  if (surface_transform_node->surface_contents_scale.x() != 0 &&
+      surface_transform_node->surface_contents_scale.y() != 0) {
+    replica_to_surface.Scale(
+        1.0 / surface_transform_node->surface_contents_scale.x(),
+        1.0 / surface_transform_node->surface_contents_scale.y());
   }
   return replica_to_surface;
 }
 
 void ComputeLayerDrawProperties(LayerImpl* layer,
                                 const PropertyTrees* property_trees) {
   const TransformNode* transform_node =
       property_trees->transform_tree.Node(layer->transform_tree_index());
   const ClipNode* clip_node =
       property_trees->clip_tree.Node(layer->clip_tree_index());
@@ skipping 40 matching lines @@
 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);
   render_surface->SetScreenSpaceTransform(
-      property_trees->transform_tree.ToScreenSpaceTransformWithoutSublayerScale(
-          render_surface->TransformTreeIndex()));
+      property_trees->transform_tree
+          .ToScreenSpaceTransformWithoutSurfaceContentsScale(
+              render_surface->TransformTreeIndex()));
 
   if (render_surface->HasReplica()) {
     gfx::Transform replica_to_surface = ReplicaToSurfaceTransform(
         render_surface, property_trees->transform_tree);
     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());
@@ skipping 100 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