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

Unified Diff: components/printing/renderer/print_web_view_helper.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
Index: components/printing/renderer/print_web_view_helper.cc
diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc
index afb07fb24cba8e28f067b2878df375947169798a..840774286e65a53aa3a788342e1e4074eaa74480 100644
--- a/components/printing/renderer/print_web_view_helper.cc
+++ b/components/printing/renderer/print_web_view_helper.cc
@@ -35,6 +35,7 @@
#include "printing/metafile_skia_wrapper.h"
#include "printing/pdf_metafile_skia.h"
#include "printing/units.h"
+#include "skia/ext/cdl_canvas.h"
#include "third_party/WebKit/public/platform/WebDoubleSize.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
@@ -569,7 +570,7 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
float webkit_scale_factor,
const PageSizeMargins& page_layout,
const PrintMsg_Print_Params& params) {
- SkAutoCanvasRestore auto_restore(canvas, true);
+ CdlAutoCanvasRestore auto_restore(canvas, true);
canvas->scale(1 / webkit_scale_factor, 1 / webkit_scale_factor);
blink::WebSize page_size(page_layout.margin_left + page_layout.margin_right +
@@ -626,7 +627,7 @@ float PrintWebViewHelper::RenderPageContent(blink::WebFrame* frame,
const gfx::Rect& content_area,
double scale_factor,
blink::WebCanvas* canvas) {
- SkAutoCanvasRestore auto_restore(canvas, true);
+ CdlAutoCanvasRestore auto_restore(canvas, true);
canvas->translate((content_area.x() - canvas_area.x()) / scale_factor,
(content_area.y() - canvas_area.y()) / scale_factor);
return frame->printPage(page_number, canvas);
@@ -1872,8 +1873,8 @@ void PrintWebViewHelper::PrintPageInternal(
float scale_factor = css_scale_factor;
#endif
- SkCanvas* canvas = metafile->GetVectorCanvasForNewPage(
- page_size, canvas_area, scale_factor);
+ CdlCanvas* canvas =
+ metafile->GetVectorCanvasForNewPage(page_size, canvas_area, scale_factor);
if (!canvas)
return;
« no previous file with comments | « components/favicon/core/fallback_icon_service.cc ('k') | components/printing/renderer/print_web_view_helper_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698