| Index: chrome/renderer/printing/print_web_view_helper_mac.mm
|
| diff --git a/chrome/renderer/printing/print_web_view_helper_mac.mm b/chrome/renderer/printing/print_web_view_helper_mac.mm
|
| index db8bb80affc455a03eb1c3eb9fd9182e389ee0cd..ffde22cd43eb847c3b18de0ebd7627d295ac8b5a 100644
|
| --- a/chrome/renderer/printing/print_web_view_helper_mac.mm
|
| +++ b/chrome/renderer/printing/print_web_view_helper_mac.mm
|
| @@ -118,29 +118,23 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
|
| params.display_header_footer ? gfx::Rect(*page_size) : content_area;
|
|
|
| {
|
| - SkBaseDevice* device = metafile->StartPageForVectorCanvas(
|
| + skia::VectorCanvas* canvas = metafile->GetVectorCanvasForNewPage(
|
| *page_size, canvas_area, scale_factor);
|
| - if (!device)
|
| + if (!canvas)
|
| return;
|
|
|
| - skia::RefPtr<skia::VectorCanvas> canvas =
|
| - skia::AdoptRef(new skia::VectorCanvas(device));
|
| - blink::WebCanvas* canvas_ptr = canvas.get();
|
| MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
| skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
|
| skia::SetIsPreviewMetafile(*canvas, is_preview);
|
|
|
| if (params.display_header_footer) {
|
| - PrintHeaderAndFooter(canvas_ptr,
|
| + PrintHeaderAndFooter(static_cast<blink::WebCanvas*>(canvas),
|
| page_number + 1,
|
| - print_preview_context_.total_page_count(),
|
| - *frame,
|
| - scale_factor,
|
| - page_layout_in_points,
|
| - params);
|
| + print_preview_context_.total_page_count(), *frame,
|
| + scale_factor, page_layout_in_points, params);
|
| }
|
| RenderPageContent(frame, page_number, canvas_area, content_area,
|
| - scale_factor, canvas_ptr);
|
| + scale_factor, static_cast<blink::WebCanvas*>(canvas));
|
| }
|
|
|
| // Done printing. Close the device context to retrieve the compiled metafile.
|
|
|