Rename paint data structures

chrome/renderer/pepper/pepper_flash_renderer_host.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 "chrome/renderer/pepper/pepper_flash_renderer_host.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #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"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/http/http_util.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/proxy/serialized_structs.h"
 #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"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/gurl.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;
 
@@ skipping 171 matching lines @@
       params.font_desc.face.c_str(), SkFontStyle::FromOldStyle(style)));
   if (!typeface)
     return PP_ERROR_FAILED;
 
   EnterResourceNoLock<PPB_ImageData_API> enter(
       params.image_data.host_resource(), true);
   if (enter.failed())
     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;
     image->Map();
     canvas = image->GetCanvas();
     if (!canvas)
       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 = {
       SkIntToScalar(params.clip.point.x), SkIntToScalar(params.clip.point.y),
       SkIntToScalar(params.clip.point.x + params.clip.size.width),
       SkIntToScalar(params.clip.point.y + params.clip.size.height)};
   canvas->clipRect(clip_rect);
 
   SkMatrix matrix;
   matrix.set(SkMatrix::kMScaleX, SkFloatToScalar(params.transformation[0][0]));
   matrix.set(SkMatrix::kMSkewX, SkFloatToScalar(params.transformation[0][1]));
   matrix.set(SkMatrix::kMTransX, SkFloatToScalar(params.transformation[0][2]));
   matrix.set(SkMatrix::kMSkewY, SkFloatToScalar(params.transformation[1][0]));
   matrix.set(SkMatrix::kMScaleY, SkFloatToScalar(params.transformation[1][1]));
   matrix.set(SkMatrix::kMTransY, SkFloatToScalar(params.transformation[1][2]));
   matrix.set(SkMatrix::kMPersp0, SkFloatToScalar(params.transformation[2][0]));
   matrix.set(SkMatrix::kMPersp1, SkFloatToScalar(params.transformation[2][1]));
   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) {
     paint.setSubpixelText(true);
     paint.setLCDRenderText(true);
   }
 
   SkScalar x = SkIntToScalar(params.position.x);
   SkScalar y = SkIntToScalar(params.position.y);
 
@@ skipping 100 matching lines @@
           rect.point.x, rect.point.y, rect.size.width, rect.size.height)))
     return PP_OK;
   return PP_ERROR_FAILED;
 }
 
 int32_t PepperFlashRendererHost::OnInvokePrinting(
     ppapi::host::HostMessageContext* host_context) {
   pdf::PepperPDFHost::InvokePrintingForInstance(pp_instance());
   return PP_OK;
 }