Index: cc/test/layer_test_common.cc |
diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc |
index b741dc0d673f87598b02aa9d6806ccd312cb79e0..3155d9e8c19eff45ab943abad1ff0f1e2054ad51 100644 |
--- a/cc/test/layer_test_common.cc |
+++ b/cc/test/layer_test_common.cc |
@@ -35,20 +35,19 @@ 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 = |
+ 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; |
+ return effect_tree.GetRenderSurface( |
+ effect_tree.Node(layer_impl->effect_tree_index())->target_id); |
+} |
- 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; |
+float OpacityForLayer(LayerImpl* layer_impl) { |
+ return layer_impl->layer_tree_impl() |
+ ->property_trees() |
+ ->effect_tree.Node(layer_impl->effect_tree_index()) |
+ ->opacity; |
} |
static bool CanRectFBeSafelyRoundedToRect(const gfx::RectF& r) { |