cc: Use sublayer scale from effect tree (2)

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 945 matching lines @@
       }
 
       if (it.represents_contributing_render_surface()) {
         // Surfaces aren't used by the tile raster code, so they can have
         // occlusion regardless of replicas.
         const RenderSurfaceImpl* occlusion_surface =
             occlusion_tracker.OcclusionSurfaceForContributingSurface();
         gfx::Transform draw_transform;
         if (occlusion_surface) {
           // We are calculating transform between two render surfaces. So, we
-          // need to apply the sublayer scale at target and remove the sublayer
-          // scale at source.
+          // need to apply the surface contents scale at target and remove the
+          // surface contents scale at source.
           property_trees()->transform_tree.ComputeTransform(
               it->render_surface()->TransformTreeIndex(),
               occlusion_surface->TransformTreeIndex(), &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 (occlusion_surface->TransformTreeIndex() != 0) {
-            draw_property_utils::PostConcatSublayerScale(
-                occlusion_surface->EffectTreeIndex(),
-                property_trees()->effect_tree, &draw_transform);
+            const EffectNode* occlusion_effect_node =
+                property_trees()->effect_tree.Node(
+                    occlusion_surface->EffectTreeIndex());
+            draw_property_utils::PostConcatSurfaceContentsScale(
+                occlusion_effect_node, &draw_transform);
           }
-          draw_property_utils::ConcatInverseSublayerScale(
-              it->render_surface()->EffectTreeIndex(),
-              property_trees()->effect_tree, &draw_transform);
+          const EffectNode* effect_node = property_trees()->effect_tree.Node(
+              it->render_surface()->EffectTreeIndex());
+          draw_property_utils::ConcatInverseSurfaceContentsScale(
+              effect_node, &draw_transform);
         }
 
         Occlusion occlusion =
             occlusion_tracker.GetCurrentOcclusionForContributingSurface(
                 draw_transform);
         it->render_surface()->set_occlusion_in_content_space(occlusion);
         // Masks are used to draw the contributing surface, so should have
         // the same occlusion as the surface (nothing inside the surface
         // occludes them).
         if (LayerImpl* mask = it->render_surface()->MaskLayer()) {
@@ skipping 667 matching lines @@
   return layer_space_region.Contains(
       gfx::ToRoundedPoint(hit_test_point_in_layer_space));
 }
 
 static const gfx::Transform SurfaceScreenSpaceTransform(
     const LayerImpl* layer,
     const TransformTree& transform_tree) {
   DCHECK(layer->render_surface());
   return layer->is_drawn_render_surface_layer_list_member()
              ? layer->render_surface()->screen_space_transform()
-             : transform_tree.ToScreenSpaceTransformWithoutSublayerScale(
+             : transform_tree.ToScreenSpaceTransformWithoutSurfaceContentsScale(
                    layer->render_surface()->TransformTreeIndex());
 }
 
 static bool PointIsClippedByAncestorClipNode(
     const gfx::PointF& screen_space_point,
     const LayerImpl* layer,
     const ClipTree& clip_tree,
     const TransformTree& transform_tree) {
   // We need to visit all ancestor clip nodes to check this. Checking with just
   // the combined clip stored at a clip node is not enough because parent
@@ skipping 334 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks and replicas.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc