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

Unified Diff: cc/test/layer_tree_json_parser_unittest.cc

Issue 2080703005: cc: Remove LayerTreeImpl::root_layer usage outside tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/debug/debug_rect_history.cc ('k') | cc/trees/layer_tree_host_impl.h » ('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 c209943ea3b0f20720d4e8e2886881a472632250..71f9238784f36398c01818c7545f51e6c4cda2af 100644
--- a/cc/test/layer_tree_json_parser_unittest.cc
+++ b/cc/test/layer_tree_json_parser_unittest.cc
@@ -90,7 +90,8 @@ TEST_F(LayerTreeJsonParserSanityCheck, Basic) {
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
ASSERT_TRUE(root.get());
- EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
+ EXPECT_TRUE(
+ LayerTreesMatch(host_impl.active_tree()->root_layer(), root.get()));
}
TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
@@ -118,7 +119,8 @@ TEST_F(LayerTreeJsonParserSanityCheck, EventHandlerRegions) {
std::string json = host_impl.LayerTreeAsJson();
scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
ASSERT_TRUE(root.get());
- EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
+ EXPECT_TRUE(
+ LayerTreesMatch(host_impl.active_tree()->root_layer(), root.get()));
}
} // namespace cc
« no previous file with comments | « cc/debug/debug_rect_history.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698