diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/cg/FloatPointCG.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/cg/FloatPointCG.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/cg/FloatPointCG.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp b/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp index f9c3353..5e7aab3 100644 --- a/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp +++ b/Source/WebCore/platform/graphics/cg/FloatPointCG.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "FloatPoint.h" -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) #include <ApplicationServices/ApplicationServices.h> @@ -44,4 +44,4 @@ FloatPoint::operator CGPoint() const } -#endif // PLATFORM(CG) +#endif // USE(CG) |