diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 03:12:17 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 03:12:17 +0000 |
| commit | 2f47fc457801054fb68055b4649e21af609f81dc (patch) | |
| tree | cb31f77630a7465c4001baf2794d25989c20e457 /printing | |
| parent | 21ee224e0862f56ce9d88f2c91950a40cfae6aa0 (diff) | |
| download | chromium_src-2f47fc457801054fb68055b4649e21af609f81dc.zip chromium_src-2f47fc457801054fb68055b4649e21af609f81dc.tar.gz chromium_src-2f47fc457801054fb68055b4649e21af609f81dc.tar.bz2 | |
compositor_unittests target is unimplmented on Mac
Adds necessary pieces to get the WebKit compositor working with
compositor_unittests target on Mac. Required gyp build flags are:
'use_aura': 1,
'use_webkit_compositor': 1,
'use_skia': 1,
BUG=104390, 104555
TEST=compositor_unittests --gtest_filter=LayerWithRealCompositorTest.* passes and shows correct visual results.
Review URL: http://codereview.chromium.org/8486020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printed_document.h | 2 | ||||
| -rw-r--r-- | printing/printing.gyp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/printing/printed_document.h b/printing/printed_document.h index 7233df5..3e3217a 100644 --- a/printing/printed_document.h +++ b/printing/printed_document.h @@ -51,7 +51,7 @@ class PRINTING_EXPORT PrintedDocument // Draws the page in the context. // Note: locks for a short amount of time in debug only. -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_MACOSX) && !defined(USE_AURA) void RenderPrintedPage(const PrintedPage& page, gfx::NativeDrawingContext context) const; #elif defined(OS_POSIX) diff --git a/printing/printing.gyp b/printing/printing.gyp index 34e3b4e..495fc73 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -111,6 +111,14 @@ ['exclude', 'metafile_skia_wrapper\\.(cc|h)$'], ], }], + # Mac-Aura does not support printing. + ['OS=="mac" and use_aura==1',{ + 'sources!': [ + 'printed_document_mac.cc', + 'printing_context_mac.mm', + 'printing_context_mac.h', + ], + }], ['OS=="mac" and use_aura==0',{ 'sources': [ 'printing_context_mac.mm', |