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

Unified Diff: cc/trees/layer_tree_host_perftest.cc

Issue 2253143002: Revert of cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: Created 4 years, 4 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/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_pixeltest_filters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_perftest.cc
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 75cf53cfa8573eb9ea75e2513d1c94ffadcc62b8..7b7a86aa43f499c66847413020ef0d594949979f 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -135,11 +135,11 @@
void BuildTree() override {
gfx::Size viewport = gfx::Size(720, 1038);
- layer_tree()->SetViewportSize(viewport);
+ layer_tree_host()->SetViewportSize(viewport);
scoped_refptr<Layer> root = ParseTreeFromJson(json_,
&fake_content_layer_client_);
ASSERT_TRUE(root.get());
- layer_tree()->SetRootLayer(root);
+ layer_tree_host()->SetRootLayer(root);
fake_content_layer_client_.set_bounds(viewport);
}
@@ -184,7 +184,7 @@
LayerTreeHostPerfTestJsonReader::BuildTree();
// Find a leaf layer.
- for (layer_to_invalidate_ = layer_tree()->root_layer();
+ for (layer_to_invalidate_ = layer_tree_host()->root_layer();
layer_to_invalidate_->children().size();
layer_to_invalidate_ = layer_to_invalidate_->children()[0].get()) {
}
@@ -225,7 +225,7 @@
void BuildTree() override {
LayerTreeHostPerfTestJsonReader::BuildTree();
- scrollable_ = layer_tree()->root_layer()->children()[1];
+ scrollable_ = layer_tree_host()->root_layer()->children()[1];
ASSERT_TRUE(scrollable_.get());
}
@@ -261,13 +261,12 @@
void BuildTree() override {
LayerTreeHostPerfTestJsonReader::BuildTree();
- tab_contents_ = static_cast<TextureLayer*>(layer_tree()
- ->root_layer()
- ->children()[0]
- ->children()[0]
- ->children()[0]
- ->children()[0]
- .get());
+ tab_contents_ =
+ static_cast<TextureLayer*>(
+ layer_tree_host()->root_layer()->children()[0]->
+ children()[0]->
+ children()[0]->
+ children()[0].get());
ASSERT_TRUE(tab_contents_.get());
}
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_pixeltest_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698