Chromium Code Reviews| 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..ff19641d17e0b26470cefcf5905ba894c9c01d4c 100644 |
| --- a/chrome/renderer/printing/print_web_view_helper_mac.mm |
| +++ b/chrome/renderer/printing/print_web_view_helper_mac.mm |
| @@ -118,20 +118,17 @@ 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) { |
|
Vitaly Buka (NO REVIEWS)
2014/11/05 22:21:38
static_cast
hal.canary
2014/11/05 23:10:58
Done.
|
| - PrintHeaderAndFooter(canvas_ptr, |
| + PrintHeaderAndFooter((blink::WebCanvas*)canvas, |
| page_number + 1, |
| print_preview_context_.total_page_count(), |
| *frame, |
| @@ -140,7 +137,7 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params, |
| params); |
| } |
| RenderPageContent(frame, page_number, canvas_area, content_area, |
| - scale_factor, canvas_ptr); |
| + scale_factor, (blink::WebCanvas*)canvas); |
|
Vitaly Buka (NO REVIEWS)
2014/11/05 22:21:38
static_cast
hal.canary
2014/11/05 23:10:58
Done.
|
| } |
| // Done printing. Close the device context to retrieve the compiled metafile. |