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

Unified Diff: cc/test/layer_tree_json_parser_unittest.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.cc ('k') | cc/trees/damage_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_json_parser_unittest.cc
diff --git a/cc/test/layer_tree_json_parser_unittest.cc b/cc/test/layer_tree_json_parser_unittest.cc
index 9b0477a035ca7e6c9adfd403d2665aab2ae8c146..7c6591a22780ecd898fbefe5dfe58edf9ccca05c 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -11,7 +11,9 @@
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_impl.h"
#include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
#include "cc/test/test_task_graph_runner.h"
+#include "cc/trees/effect_node.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace cc {
@@ -40,8 +42,9 @@ bool LayerTreesMatch(LayerImpl* const layer_impl,
layer->contents_opaque()));
RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->scrollable(),
layer->scrollable()));
+
RETURN_IF_EXPECTATION_FAILS(
- EXPECT_FLOAT_EQ(layer_impl->Opacity(), layer->opacity()));
+ EXPECT_FLOAT_EQ(OpacityForLayer(layer_impl), layer->opacity()));
RETURN_IF_EXPECTATION_FAILS(
EXPECT_EQ(layer_impl->touch_event_handler_region(),
layer->touch_event_handler_region()));
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/trees/damage_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698