| Index: android_webview/renderer/print_web_view_helper_linux.cc
|
| diff --git a/android_webview/renderer/print_web_view_helper_linux.cc b/android_webview/renderer/print_web_view_helper_linux.cc
|
| index 6895b252f5eca5247608843e10fc13cba123ee42..43a7fb8b185ccab72ee7df3ebb468dffb2895021 100644
|
| --- a/android_webview/renderer/print_web_view_helper_linux.cc
|
| +++ b/android_webview/renderer/print_web_view_helper_linux.cc
|
| @@ -163,19 +163,14 @@ void PrintWebViewHelper::PrintPageInternal(
|
| gfx::Rect content_area;
|
| GetPageSizeAndContentAreaFromPageLayout(page_layout_in_points, &page_size,
|
| &content_area);
|
| - gfx::Rect canvas_area =
|
| - params.params.display_header_footer ? gfx::Rect(page_size) : content_area;
|
| + gfx::Rect canvas_area = gfx::Rect(page_size); // Allow drawing on
|
| + // entire page.
|
|
|
| - 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_);
|
|
|
| @@ -191,6 +186,7 @@ void PrintWebViewHelper::PrintPageInternal(
|
| RenderPageContent(frame, params.page_number, canvas_area, content_area,
|
| scale_factor, canvas.get());
|
|
|
| + canvas.clear(); // Unref the canvas before calling FinishPage().
|
| // Done printing. Close the device context to retrieve the compiled metafile.
|
| if (!metafile->FinishPage())
|
| NOTREACHED() << "metafile failed";
|
|
|