| Index: chrome/renderer/printing/print_web_view_helper_pdf_win.cc
|
| diff --git a/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
|
| index b6300b0eb9f178a342825115e94564ad46fd6a12..2e1acba3c0c2e18ebecd10e664a29539ffa9aa2e 100644
|
| --- a/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
|
| +++ b/chrome/renderer/printing/print_web_view_helper_pdf_win.cc
|
| @@ -172,23 +172,17 @@ void PrintWebViewHelper::PrintPageInternal(
|
| gfx::Rect(0, 0, page_size_in_dpi->width(), page_size_in_dpi->height());
|
| }
|
|
|
| - gfx::Rect canvas_area =
|
| - params.params.display_header_footer ? gfx::Rect(page_size) : content_area;
|
| + gfx::Rect canvas_area = gfx::Rect(page_size);
|
|
|
| float webkit_page_shrink_factor =
|
| frame->getPrintPageShrink(params.page_number);
|
| float scale_factor = css_scale_factor * webkit_page_shrink_factor;
|
|
|
| - SkBaseDevice* device = metafile->StartPageForVectorCanvas(page_size,
|
| - canvas_area,
|
| - scale_factor);
|
| - if (!device)
|
| + skia::RefPtr<skia::VectorCanvas> canvas =
|
| + metafile->GetVectorCanvasForNewPage(page_size, canvas_area, scale_factor);
|
| + if (!canvas.get())
|
| return;
|
|
|
| - // The printPage method take a reference to the canvas we pass down, so it
|
| - // can't be a stack object.
|
| - skia::RefPtr<skia::VectorCanvas> canvas =
|
| - skia::AdoptRef(new skia::VectorCanvas(device));
|
| MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
|
| skia::SetIsDraftMode(*canvas, is_print_ready_metafile_sent_);
|
|
|
| @@ -210,6 +204,8 @@ void PrintWebViewHelper::PrintPageInternal(
|
| scale_factor,
|
| canvas.get());
|
| DCHECK_GT(webkit_scale_factor, 0.0f);
|
| +
|
| + canvas.clear(); // Unref canvas before calling FinishPage.
|
| // Done printing. Close the device context to retrieve the compiled metafile.
|
| if (!metafile->FinishPage())
|
| NOTREACHED() << "metafile failed";
|
|
|