Rename paint data structures

content/renderer/gpu/gpu_benchmarking_extension.cc

Index: content/renderer/gpu/gpu_benchmarking_extension.cc
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index c2b6563cace448a942f6f0a156de703e328d4c16..af3be8f0aaddcd437a0d320b5a00c8ff031362a2 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -17,6 +17,7 @@
 #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"
@@ -138,7 +139,7 @@ class SkPictureSerializer {
   // 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;
 
@@ -473,17 +474,18 @@ static void PrintDocument(blink::WebFrame* frame, SkDocument* doc) {
   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();
 }