| Index: chrome/renderer/print_web_view_helper_mac.mm
|
| diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
|
| index 0e8c3b24133f3036f2bfdad5ef2ef4a43ad671cf..21df92eb2b29a3e9a37a08454461cfe35c12ddb0 100644
|
| --- a/chrome/renderer/print_web_view_helper_mac.mm
|
| +++ b/chrome/renderer/print_web_view_helper_mac.mm
|
| @@ -17,6 +17,7 @@
|
|
|
| #if defined(USE_SKIA)
|
| #include "printing/metafile_skia_wrapper.h"
|
| +#include "skia/ext/platform_device.h"
|
| #include "skia/ext/vector_canvas.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
|
| #endif
|
| @@ -37,7 +38,7 @@ void PrintWebViewHelper::PrintPageInternal(
|
| // Render page for printing.
|
| gfx::Rect content_area(params.params.printable_size);
|
| RenderPage(params.params.printable_size, content_area, scale_factor,
|
| - page_number, frame, &metafile);
|
| + page_number, frame, false, &metafile);
|
| metafile.FinishDocument();
|
|
|
| PrintHostMsg_DidPrintPage_Params page_params;
|
| @@ -96,7 +97,7 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
|
|
|
| base::TimeTicks begin_time = base::TimeTicks::Now();
|
| RenderPage(printParams.page_size, content_area, scale_factor, page_number,
|
| - print_preview_context_.frame(), initial_render_metafile);
|
| + print_preview_context_.frame(), true, initial_render_metafile);
|
| print_preview_context_.RenderedPreviewPage(
|
| base::TimeTicks::Now() - begin_time);
|
|
|
| @@ -144,7 +145,7 @@ bool PrintWebViewHelper::RenderPreviewPage(int page_number) {
|
| void PrintWebViewHelper::RenderPage(
|
| const gfx::Size& page_size, const gfx::Rect& content_area,
|
| const float& scale_factor, int page_number, WebFrame* frame,
|
| - printing::Metafile* metafile) {
|
| + bool is_preview, printing::Metafile* metafile) {
|
|
|
| {
|
| #if defined(USE_SKIA)
|
| @@ -157,8 +158,8 @@ void PrintWebViewHelper::RenderPage(
|
| canvas->unref(); // SkRefPtr and new both took a reference.
|
| WebKit::WebCanvas* canvas_ptr = canvas.get();
|
| printing::MetafileSkiaWrapper::SetMetafileOnCanvas(canvas.get(), metafile);
|
| - printing::MetafileSkiaWrapper::SetDraftMode(canvas.get(),
|
| - is_print_ready_metafile_sent_);
|
| + skia::SetIsDraftMode(canvas.get(), is_print_ready_metafile_sent_);
|
| + skia::SetIsPreviewMetafile(canvas.get(), is_preview);
|
| #else
|
| bool success = metafile->StartPage(page_size, content_area, scale_factor);
|
| DCHECK(success);
|
|
|