cc: Use sublayer scale from effect tree (2)

cc/trees/layer_tree_impl.cc

Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index e97ee7f74d9b7a6e812f816b8ca43401673eb786..ac7a82f33a744fd59fc493424c7b4320e2796528 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -970,13 +970,16 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
               occlusion_surface->TransformTreeIndex(), &draw_transform);
           // We don't have to apply sublayer 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::PostConcatSublayerScale(occlusion_effect_node,

[Ian Vollick, 2016/07/16 01:07:51]

If you're going to do a rename, should probably rename all these functions, too?

[jaydasika, 2016/07/16 02:23:15]

Done.

+                                                         &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::ConcatInverseSublayerScale(effect_node,
+                                                          &draw_transform);
         }
 
         Occlusion occlusion =