chrome/browser/printing/print_view_manager_base.cc - 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/browser/printing/print_view_manager_base.cc

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 02:43:23 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 | « android_webview/renderer/print_web_view_helper_linux.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/print_view_manager_base.cc

diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc

index 55c9a57dbf549dddf65b1e7367b6fa022257fba7..c842c260d86881c8e5a0756a6db7ff4df0edbb19 100644

--- a/chrome/browser/printing/print_view_manager_base.cc

+++ b/chrome/browser/printing/print_view_manager_base.cc

@@ -25,7 +25,7 @@

#include "content/public/browser/notification_source.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

-#include "printing/metafile_impl.h"

+#include "printing/pdf_metafile_skia.h"

#include "printing/printed_document.h"

#include "ui/base/l10n/l10n_util.h"

@@ -37,6 +37,7 @@

#include "base/memory/ref_counted.h"

#include "base/memory/ref_counted_memory.h"

#include "chrome/browser/printing/pdf_to_emf_converter.h"

+#include "printing/emf_win.h"

#include "printing/pdf_render_settings.h"

#endif

@@ -189,7 +190,7 @@ void PrintViewManagerBase::OnDidPrintPage(

}

- scoped_ptr<NativeMetafile> metafile(new NativeMetafile);

+ scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia);

if (metafile_must_be_valid) {

if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {

NOTREACHED() << "Invalid metafile header";

@@ -203,7 +204,7 @@ void PrintViewManagerBase::OnDidPrintPage(

int raster_size =

std::min(params.page_size.GetArea(), kMaxRasterSizeInPixels);

if (big_emf) {

- scoped_ptr<NativeMetafile> raster_metafile(

+ scoped_ptr<PdfMetafileSkia> raster_metafile(

Lei Zhang 2014/08/28 18:11:23 Shouldn't this be Emf?

Vitaly Buka (NO REVIEWS) 2014/08/28 18:28:48 It would go away with WIN_PDF_METAFILE_FOR_PRINTIN

Vitaly Buka (NO REVIEWS) 2014/08/28 20:18:46 Done.

metafile->RasterizeMetafile(raster_size));

if (raster_metafile.get()) {

metafile.swap(raster_metafile);