Get rid of two callsites of effect_tree.FindNodeIndexFromOwningLayerId.

cc/test/layer_test_common.cc

 // Copyright 2012 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/test/layer_test_common.h"
 
 #include <stddef.h>
 
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
@@ skipping 17 matching lines @@
 
 namespace cc {
 
 // Align with expected and actual output.
 const char* LayerTestCommon::quad_string = "    Quad: ";
 
 RenderSurfaceImpl* GetRenderSurface(LayerImpl* layer_impl) {
   EffectTree& effect_tree =
       layer_impl->layer_tree_impl()->property_trees()->effect_tree;
 
-  EffectNode* effect_node = effect_tree.Node(layer_impl->effect_tree_index());
-  if (effect_node->owning_layer_id == layer_impl->id())
-    return effect_tree.GetRenderSurface(layer_impl->effect_tree_index());
-  return nullptr;
-}
+  if (RenderSurfaceImpl* surface =

[chrishtr, 2017/05/11 20:07:00]

The old test code assumed that a layer "owned" a render surface; now it
checks for into what render surface a layer draws.

[chrishtr, 2017/05/11 22:15:39]

Right.

+          effect_tree.GetRenderSurface(layer_impl->effect_tree_index()))
+    return surface;
 
-const RenderSurfaceImpl* GetRenderSurface(const LayerImpl* layer_impl) {
-  EffectTree& effect_tree =
-      layer_impl->layer_tree_impl()->property_trees()->effect_tree;
-
-  EffectNode* effect_node = effect_tree.Node(layer_impl->effect_tree_index());
-  if (effect_node->owning_layer_id == layer_impl->id())
-    return effect_tree.GetRenderSurface(layer_impl->effect_tree_index());
-  return nullptr;
+  return effect_tree.GetRenderSurface(
+      effect_tree.Node(layer_impl->effect_tree_index())->target_id);
 }
 
 static bool CanRectFBeSafelyRoundedToRect(const gfx::RectF& r) {
   // Ensure that range of float values is not beyond integer range.
   if (!r.IsExpressibleAsRect())
     return false;
 
   // Ensure that the values are actually integers.
   gfx::RectF floored_rect(std::floor(r.x()), std::floor(r.y()),
                           std::floor(r.width()), std::floor(r.height()));
@@ skipping 175 matching lines @@
 }
 
 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}
 
 void LayerTestCommon::LayerImplTest::RequestCopyOfOutput() {
   root_layer_for_testing()->test_properties()->copy_requests.push_back(
       CopyOutputRequest::CreateRequest(base::Bind(&EmptyCopyOutputCallback)));
 }
 
 }  // namespace cc