diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 20:26:34 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 20:26:34 +0000 |
| commit | 1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48 (patch) | |
| tree | 5372127f368e3ec646395797d5fc8cd7439720eb /printing | |
| parent | e9a3b0cfd6a280250cf7266e3f4d03e0fda624a8 (diff) | |
| download | chromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.zip chromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.tar.gz chromium_src-1d1cb4a133fd30cfbc8ae561bd903cd7f179eb48.tar.bz2 | |
mac: Clean up a few more uses of USE_SKIA
Likely also fixes a top-down-flipped bug with the in-process command buffer.
BUG=110881
TBR=tony
Review URL: https://codereview.chromium.org/12896006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/metafile_impl.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/printing/metafile_impl.h b/printing/metafile_impl.h index 38c68a3..840a1ce 100644 --- a/printing/metafile_impl.h +++ b/printing/metafile_impl.h @@ -5,14 +5,10 @@ #ifndef PRINTING_METAFILE_IMPL_H_ #define PRINTING_METAFILE_IMPL_H_ +#include "printing/pdf_metafile_skia.h" + #if defined(OS_WIN) #include "printing/emf_win.h" -#elif defined(OS_MACOSX) -#include "printing/pdf_metafile_cg_mac.h" -#endif - -#if !defined(OS_MACOSX) || defined(USE_SKIA) -#include "printing/pdf_metafile_skia.h" #endif namespace printing { @@ -20,14 +16,6 @@ namespace printing { #if defined(OS_WIN) typedef Emf NativeMetafile; typedef PdfMetafileSkia PreviewMetafile; -#elif defined(OS_MACOSX) -#if defined(USE_SKIA) -typedef PdfMetafileSkia NativeMetafile; -typedef PdfMetafileSkia PreviewMetafile; -#else -typedef PdfMetafileCg NativeMetafile; -typedef PdfMetafileCg PreviewMetafile; -#endif #elif defined(OS_POSIX) typedef PdfMetafileSkia NativeMetafile; typedef PdfMetafileSkia PreviewMetafile; |