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

Unified Diff: cc/test/layer_tree_json_parser_unittest.cc

Issue 2080223010: cc: Clean up root_layer code in LTI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase++ Created 4 years, 6 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/test/test_layer_tree_host_base.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 28b8fc69d3d6ff650cde6939d1065d59a51930f0..eb7cfeb6055c99b16ddcce06fe991d5c73a49b32 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -85,13 +85,13 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
parent->test_properties()->AddChild(std::move(child));
root_impl->test_properties()->AddChild(std::move(parent));
- tree->SetRootLayer(std::move(root_impl));
+ tree->SetRootLayerForTesting(std::move(root_impl));
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
ASSERT_TRUE(root.get());
- EXPECT_TRUE(
- LayerTreesMatch(host_impl.active_tree()->root_layer(), root.get()));
+ EXPECT_TRUE(LayerTreesMatch(host_impl.active_tree()->root_layer_for_testing(),
+ root.get()));
}
TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
@@ -114,13 +114,13 @@ TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
touch_layer->SetTouchEventHandlerRegion(touch_region);
root_impl->test_properties()->AddChild(std::move(touch_layer));
- tree->SetRootLayer(std::move(root_impl));
+ tree->SetRootLayerForTesting(std::move(root_impl));
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
ASSERT_TRUE(root.get());
- EXPECT_TRUE(
- LayerTreesMatch(host_impl.active_tree()->root_layer(), root.get()));
+ EXPECT_TRUE(LayerTreesMatch(host_impl.active_tree()->root_layer_for_testing(),
+ root.get()));
}
} // namespace cc
« no previous file with comments | « cc/test/layer_test_common.cc ('k') | cc/test/test_layer_tree_host_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698