cc: Move main thread hierarchy dependencies into PropertyTreeBuilder

content/renderer/gpu/gpu_benchmarking_extension.cc

 // Copyright (c) 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 "content/renderer/gpu/gpu_benchmarking_extension.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/layers/layer.h"
+#include "cc/trees/layer_tree_host.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/input/synthetic_gesture_params.h"
 #include "content/common/input/synthetic_pinch_gesture_params.h"
 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/chrome_object_extensions_utils.h"
 #include "content/public/renderer/render_thread.h"
@@ skipping 87 matching lines @@
       : dirpath_(dirpath),
         layer_id_(0) {
     // Let skia register known effect subclasses. This basically enables
     // reflection on those subclasses required for picture serialization.
     SkiaBenchmarking::Initialize();
   }
 
   // Recursively serializes the layer tree.
   // Each layer in the tree is serialized into a separate skp file
   // in the given directory.
-  void Serialize(const cc::Layer* layer) {
-    const cc::LayerList& children = layer->children();
-    for (size_t i = 0; i < children.size(); ++i) {
-      Serialize(children[i].get());
+  void Serialize(const cc::Layer* root_layer) {
+    for (auto* layer : *root_layer->layer_tree_host()) {
+      sk_sp<SkPicture> picture = layer->GetPicture();
+      if (!picture)
+        continue;
+
+      // Serialize picture to file.
+      // TODO(alokp): Note that for this to work Chrome needs to be launched
+      // with
+      // --no-sandbox command-line flag. Get rid of this limitation.
+      // CRBUG: 139640.
+      std::string filename = "layer_" + base::IntToString(layer_id_++) + ".skp";
+      std::string filepath = dirpath_.AppendASCII(filename).MaybeAsASCII();
+      DCHECK(!filepath.empty());
+      SkFILEWStream file(filepath.c_str());
+      DCHECK(file.isValid());
+
+      EncodingSerializer serializer;
+      picture->serialize(&file, &serializer);
+      file.fsync();
     }
-
-    sk_sp<SkPicture> picture = layer->GetPicture();
-    if (!picture)
-      return;
-
-    // Serialize picture to file.
-    // TODO(alokp): Note that for this to work Chrome needs to be launched with
-    // --no-sandbox command-line flag. Get rid of this limitation.
-    // CRBUG: 139640.
-    std::string filename = "layer_" + base::IntToString(layer_id_++) + ".skp";
-    std::string filepath = dirpath_.AppendASCII(filename).MaybeAsASCII();
-    DCHECK(!filepath.empty());
-    SkFILEWStream file(filepath.c_str());
-    DCHECK(file.isValid());
-
-    EncodingSerializer serializer;
-    picture->serialize(&file, &serializer);
-    file.fsync();
   }
 
  private:
   base::FilePath dirpath_;
   int layer_id_;
 };
 
 template <typename T>
 bool GetArg(gin::Arguments* args, T* value) {
   if (!args->GetNext(value)) {
@@ skipping 800 matching lines @@
           &gpu_driver_bug_workarounds))) {
     return;
   }
 
   v8::Local<v8::Value> result;
   if (gin::TryConvertToV8(args->isolate(), gpu_driver_bug_workarounds, &result))
     args->Return(result);
 }
 
 }  // namespace content