diff options
author | caryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 13:34:57 +0000 |
---|---|---|
committer | caryclark@chromium.org <caryclark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-22 13:34:57 +0000 |
commit | b8d85bcc99bf93261fbd3343864cf799e676de4e (patch) | |
tree | 16c3d95884bfa428068e0f4501522fc6db17773f /printing/metafile_impl.h | |
parent | fba70e690af4246bb171380a8573cb2ea71358de (diff) | |
download | chromium_src-b8d85bcc99bf93261fbd3343864cf799e676de4e.zip chromium_src-b8d85bcc99bf93261fbd3343864cf799e676de4e.tar.gz chromium_src-b8d85bcc99bf93261fbd3343864cf799e676de4e.tar.bz2 |
Add support to use Skia printing from Mac.
Reference the CG metafile from the Skia
version, so CG can be used to pass the PDF
data to the OS X pipeline.
If Skia is enabled as the Mac rendering engine,
generate Skia PDF files instead of CG ones.
This change adds a code path that will be enabled
in the future, but does not modify any existing
code, so there is no functional change.
BUG=79463
TEST=none
Review URL: http://codereview.chromium.org/7120006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/metafile_impl.h')
-rw-r--r-- | printing/metafile_impl.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/printing/metafile_impl.h b/printing/metafile_impl.h index d25481d..a40e9b1 100644 --- a/printing/metafile_impl.h +++ b/printing/metafile_impl.h @@ -7,11 +7,13 @@ #if defined(OS_WIN) #include "printing/emf_win.h" -#include "printing/pdf_metafile_skia.h" #elif defined(OS_MACOSX) #include "printing/pdf_metafile_cg_mac.h" #elif defined(OS_POSIX) #include "printing/pdf_metafile_cairo_linux.h" +#endif + +#if !defined(OS_MACOSX) || defined(USE_SKIA) #include "printing/pdf_metafile_skia.h" #endif @@ -21,8 +23,13 @@ namespace printing { 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 PdfMetafileCairo NativeMetafile; typedef PdfMetafileSkia PreviewMetafile; |