cc: Reland Move data to LayerTree from LayerTreeHost.

cc/trees/layer_tree_host_perftest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <stdint.h>
 
 #include <sstream>
 
@@ skipping 117 matching lines @@
 
   void ReadTestFile(const std::string& name) {
     base::FilePath test_data_dir;
     ASSERT_TRUE(PathService::Get(CCPaths::DIR_TEST_DATA, &test_data_dir));
     base::FilePath json_file = test_data_dir.AppendASCII(name + ".json");
     ASSERT_TRUE(base::ReadFileToString(json_file, &json_));
   }
 
   void BuildTree() override {
     gfx::Size viewport = gfx::Size(720, 1038);
-    layer_tree_host()->SetViewportSize(viewport);
+    layer_tree()->SetViewportSize(viewport);
     scoped_refptr<Layer> root = ParseTreeFromJson(json_,
                                                   &fake_content_layer_client_);
     ASSERT_TRUE(root.get());
-    layer_tree_host()->SetRootLayer(root);
+    layer_tree()->SetRootLayer(root);
     fake_content_layer_client_.set_bounds(viewport);
   }
 
  private:
   std::string json_;
 };
 
 // Simulates a tab switcher scene with two stacks of 10 tabs each.
 TEST_F(LayerTreeHostPerfTestJsonReader, TenTenSingleThread) {
   SetTestName("10_10_single_thread");
@@ skipping 24 matching lines @@
 }
 
 // Invalidates a leaf layer in the tree on the main thread after every commit.
 class LayerTreeHostPerfTestLeafInvalidates
     : public LayerTreeHostPerfTestJsonReader {
  public:
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
 
     // Find a leaf layer.
-    for (layer_to_invalidate_ = layer_tree_host()->root_layer();
+    for (layer_to_invalidate_ = layer_tree()->root_layer();
          layer_to_invalidate_->children().size();
          layer_to_invalidate_ = layer_to_invalidate_->children()[0].get()) {
     }
   }
 
   void DidCommitAndDrawFrame() override {
     if (TestEnded())
       return;
 
     layer_to_invalidate_->SetOpacity(
@@ skipping 20 matching lines @@
 
 // Simulates main-thread scrolling on each frame.
 class ScrollingLayerTreePerfTest : public LayerTreeHostPerfTestJsonReader {
  public:
   ScrollingLayerTreePerfTest()
       : LayerTreeHostPerfTestJsonReader() {
   }
 
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
-    scrollable_ = layer_tree_host()->root_layer()->children()[1];
+    scrollable_ = layer_tree()->root_layer()->children()[1];
     ASSERT_TRUE(scrollable_.get());
   }
 
   void UpdateLayerTreeHost() override {
     if (TestEnded())
       return;
     static const gfx::Vector2d delta = gfx::Vector2d(0, 10);
     scrollable_->SetScrollOffset(
         gfx::ScrollOffsetWithDelta(scrollable_->scroll_offset(), delta));
   }
@@ skipping 15 matching lines @@
 }
 
 // Simulates main-thread scrolling on each frame.
 class BrowserCompositorInvalidateLayerTreePerfTest
     : public LayerTreeHostPerfTestJsonReader {
  public:
   BrowserCompositorInvalidateLayerTreePerfTest() = default;
 
   void BuildTree() override {
     LayerTreeHostPerfTestJsonReader::BuildTree();
-    tab_contents_ =
-        static_cast<TextureLayer*>(
-            layer_tree_host()->root_layer()->children()[0]->
-                                             children()[0]->
-                                             children()[0]->
-                                             children()[0].get());
+    tab_contents_ = static_cast<TextureLayer*>(layer_tree()
+                                                   ->root_layer()
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   ->children()[0]
+                                                   .get());
     ASSERT_TRUE(tab_contents_.get());
   }
 
   void WillCommit() override {
     if (CleanUpStarted())
       return;
     gpu::Mailbox gpu_mailbox;
     std::ostringstream name_stream;
     name_stream << "name" << next_fence_sync_;
     gpu_mailbox.SetName(
@@ skipping 64 matching lines @@
 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreaded) {
   begin_frame_driven_drawing_ = true;
   measure_commit_cost_ = true;
   SetTestName("heavy_page");
   ReadTestFile("heavy_layer_tree");
   RunTest(CompositorMode::THREADED);
 }
 
 }  // namespace
 }  // namespace cc