Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5628)

Unified Diff: chrome/renderer/pepper/pepper_flash_renderer_host.cc

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu.cc ('k') | components/favicon/core/fallback_icon_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3345735328a854c60c585d7e89a0396cedf3e02b 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -28,6 +28,7 @@
#include "ppapi/proxy/serialized_structs.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_image_data_api.h"
+#include "skia/ext/cdl_paint.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkMatrix.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();
+ CdlCanvas* canvas = image->GetCanvas();
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);
+ CdlAutoCanvasRestore 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;
+ CdlPaint paint;
paint.setColor(params.color);
- paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ paint.setTextEncoding(CdlPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
- paint.setHinting(SkPaint::kFull_Hinting);
+ paint.setHinting(CdlPaint::kFull_Hinting);
paint.setTextSize(SkIntToScalar(params.font_desc.size));
paint.setTypeface(std::move(typeface));
if (params.allow_subpixel_aa) {
« no previous file with comments | « chrome/browser/ui/views/toolbar/app_menu.cc ('k') | components/favicon/core/fallback_icon_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698