Rename paint data structures

chrome/renderer/pepper/pepper_flash_renderer_host.cc

Index: chrome/renderer/pepper/pepper_flash_renderer_host.cc
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 4a8e1702b12fbce878378863fa9be448f45682c4..5e4d7cd1cbb0833cf2b4a83608cc5d9c04a13811 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -13,6 +13,8 @@
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "components/pdf/renderer/pepper_pdf_host.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
@@ -29,7 +31,6 @@
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPoint.h"
@@ -221,7 +222,7 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
     return PP_ERROR_FAILED;
 
   PPB_ImageData_API* image = static_cast<PPB_ImageData_API*>(enter.object());
-  SkCanvas* canvas = image->GetCanvas();
+  cc::PaintCanvas* canvas = image->GetCanvas();

[danakj, 2017/01/20 23:34:14]

image doesn't return a PaintCanvas right? so nothing in here should change?

[enne (OOO), 2017/01/24 01:51:28]

Thanks.  Reverted this.

   bool needs_unmapping = false;
   if (!canvas) {
     needs_unmapping = true;
@@ -231,7 +232,7 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
       return PP_ERROR_FAILED;  // Failure mapping.
   }
 
-  SkAutoCanvasRestore acr(canvas, true);
+  cc::PaintCanvasAutoRestore acr(canvas, true);
 
   // Clip is applied in pixels before the transform.
   SkRect clip_rect = {
@@ -252,11 +253,11 @@ int32_t PepperFlashRendererHost::OnDrawGlyphs(
   matrix.set(SkMatrix::kMPersp2, SkFloatToScalar(params.transformation[2][2]));
   canvas->concat(matrix);
 
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setColor(params.color);
-  paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+  paint.setTextEncoding(cc::PaintFlags::kGlyphID_TextEncoding);
   paint.setAntiAlias(true);
-  paint.setHinting(SkPaint::kFull_Hinting);
+  paint.setHinting(cc::PaintFlags::kFull_Hinting);
   paint.setTextSize(SkIntToScalar(params.font_desc.size));
   paint.setTypeface(std::move(typeface));
   if (params.allow_subpixel_aa) {