Rename paint data structures

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/paint/paint_canvas.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_pointer_action_list_params.h"
 #include "content/common/input/synthetic_pointer_action_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"
@@ skipping 101 matching lines @@
     // 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* root_layer) {
     for (auto* layer : *root_layer->layer_tree_host()) {
-      sk_sp<SkPicture> picture = layer->GetPicture();
+      sk_sp<SkPicture> picture = cc::ToSkPicture(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();
@@ skipping 314 matching lines @@
   const float kPageWidth = 612.0f;   // 8.5 inch
   const float kPageHeight = 792.0f;  // 11 inch
   const float kMarginTop = 29.0f;    // 0.40 inch
   const float kMarginLeft = 29.0f;   // 0.40 inch
   const int kContentWidth = 555;     // 7.71 inch
   const int kContentHeight = 735;    // 10.21 inch
   blink::WebPrintParams params(blink::WebSize(kContentWidth, kContentHeight));
   params.printerDPI = 300;
   int page_count = frame->printBegin(params);
   for (int i = 0; i < page_count; ++i) {
-    SkCanvas* canvas = doc->beginPage(kPageWidth, kPageHeight);
-    SkAutoCanvasRestore auto_restore(canvas, true);
-    canvas->translate(kMarginLeft, kMarginTop);
+    SkCanvas* sk_canvas = doc->beginPage(kPageWidth, kPageHeight);
+    cc::PaintCanvasPassThrough canvas(sk_canvas);
+    cc::PaintCanvasAutoRestore auto_restore(&canvas, true);
+    canvas.translate(kMarginLeft, kMarginTop);
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
     float page_shrink = frame->getPrintPageShrink(i);
     DCHECK(page_shrink > 0);
-    canvas->scale(page_shrink, page_shrink);
+    canvas.scale(page_shrink, page_shrink);
 #endif
 
-    frame->printPage(i, canvas);
+    frame->printPage(i, &canvas);
   }
   frame->printEnd();
 }
 
 static void PrintDocumentTofile(v8::Isolate* isolate,
                                 const std::string& filename,
                                 sk_sp<SkDocument> (*make_doc)(SkWStream*)) {
   GpuBenchmarkingContext context;
   if (!context.Init(true))
     return;
@@ skipping 601 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