chrome/renderer/printing/print_web_view_helper_mac.mm - Issue 516833002: Removed NativeMetafile and PreviewMetafile typedef as it's always PdfMetafileSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/printing/print_web_view_helper_mac.mm

Issue 516833002: Removed NativeMetafile and PreviewMetafile typedef as it's always PdfMetafileSkia. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no_pdf

Patch Set: Thu Aug 28 17:07:38 PDT 2014 Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/renderer/printing/print_web_view_helper_linux.cc ('k') | chrome/renderer/printing/print_web_view_helper_pdf_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 207eea7363d83fdde1bfed33ceaf55445c3a1e15..219a4fabe7c988145be760fa5562aea720810eaf 100644

--- a/chrome/renderer/printing/print_web_view_helper_mac.mm

+++ b/chrome/renderer/printing/print_web_view_helper_mac.mm

@@ -11,7 +11,6 @@

#include "base/metrics/histogram.h"

#include "chrome/common/print_messages.h"

#include "printing/metafile.h"

-#include "printing/metafile_impl.h"

#include "printing/metafile_skia_wrapper.h"

#include "printing/page_size_margins.h"

#include "skia/ext/platform_device.h"

@@ -27,7 +26,7 @@ void PrintWebViewHelper::PrintPageInternal(

const PrintMsg_PrintPage_Params& params,

const gfx::Size& canvas_size,

WebFrame* frame) {

- NativeMetafile metafile;

+ PdfMetafileSkia metafile;

if (!metafile.Init())

return;

@@ -65,11 +64,11 @@ bool PrintWebViewHelper::RenderPreviewPage(

is_print_ready_metafile_sent_;

if (render_to_draft) {

- draft_metafile.reset(new PreviewMetafile());

+ draft_metafile.reset(new PdfMetafileSkia());

if (!draft_metafile->Init()) {

print_preview_context_.set_error(

PREVIEW_ERROR_MAC_DRAFT_METAFILE_INIT_FAILED);

- LOG(ERROR) << "Draft PreviewMetafile Init failed";

+ LOG(ERROR) << "Draft PdfMetafileSkia Init failed";

return false;

}

initial_render_metafile = draft_metafile.get();