Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: cc/test/layer_test_common.cc

Issue 2866733002: Remove owning_id from EffectNode and replace it by an opaque stable_id (Closed)
Patch Set: none Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « cc/test/layer_test_common.h ('k') | cc/test/layer_tree_json_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698