Chromium Code Reviews| Index: chrome/renderer/printing/print_web_view_helper_linux.cc |
| diff --git a/chrome/renderer/printing/print_web_view_helper_linux.cc b/chrome/renderer/printing/print_web_view_helper_linux.cc |
| index a3014eab7b95f692e477781b465578b048479a57..8012ae530edfed45a1ea3b722bc31efdeee416c8 100644 |
| --- a/chrome/renderer/printing/print_web_view_helper_linux.cc |
| +++ b/chrome/renderer/printing/print_web_view_helper_linux.cc |
| @@ -158,19 +158,14 @@ void PrintWebViewHelper::PrintPageInternal( |
| gfx::Rect content_area; |
| GetPageSizeAndContentAreaFromPageLayout(page_layout_in_points, &page_size, |
|
Vitaly Buka (NO REVIEWS)
2014/11/03 17:57:24
Similar code in and _win.cc, _mac.mm and android_w
hal.canary
2014/11/04 15:30:34
Done. Maybe a future CL can factor out the simila
|
| &content_area); |
| - gfx::Rect canvas_area = |
| - params.params.display_header_footer ? gfx::Rect(page_size) : content_area; |
| - |
| - SkBaseDevice* device = metafile->StartPageForVectorCanvas(page_size, |
| - canvas_area, |
| - scale_factor); |
| - if (!device) |
| + gfx::Rect canvas_area = gfx::Rect(page_size); // Allow drawing on |
| + // entire page. |
| + 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_); |
| @@ -187,6 +182,7 @@ void PrintWebViewHelper::PrintPageInternal( |
| } |
| RenderPageContent(frame, params.page_number, canvas_area, content_area, |
| scale_factor, canvas.get()); |
| + canvas.clear(); |
| // Done printing. Close the device context to retrieve the compiled metafile. |
| if (!metafile->FinishPage()) |