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/transforms | |
| 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/transforms')
| -rw-r--r-- | Source/WebCore/platform/graphics/transforms/AffineTransform.h | 8 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/transforms/TransformationMatrix.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebCore/platform/graphics/transforms/AffineTransform.h b/Source/WebCore/platform/graphics/transforms/AffineTransform.h index 14431aa..176c41e 100644 --- a/Source/WebCore/platform/graphics/transforms/AffineTransform.h +++ b/Source/WebCore/platform/graphics/transforms/AffineTransform.h @@ -32,9 +32,9 @@ #include <string.h> // for memcpy #include <wtf/FastAllocBase.h> -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CGAffineTransform.h> -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) #include <cairo.h> #elif PLATFORM(OPENVG) #include "VGUtils.h" @@ -157,9 +157,9 @@ public: return result; } -#if PLATFORM(CG) +#if USE(CG) operator CGAffineTransform() const; -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) operator cairo_matrix_t() const; #elif PLATFORM(OPENVG) operator VGMatrix() const; diff --git a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h index adda46b..ff668bb 100644 --- a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h +++ b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h @@ -31,12 +31,12 @@ #include <string.h> //for memcpy #include <wtf/FastAllocBase.h> -#if PLATFORM(CA) +#if USE(CA) typedef struct CATransform3D CATransform3D; #endif -#if PLATFORM(CG) +#if USE(CG) typedef struct CGAffineTransform CGAffineTransform; -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) #include <cairo.h> #elif PLATFORM(OPENVG) #include "VGUtils.h" @@ -308,14 +308,14 @@ public: return result; } -#if PLATFORM(CA) +#if USE(CA) TransformationMatrix(const CATransform3D&); operator CATransform3D() const; #endif -#if PLATFORM(CG) +#if USE(CG) TransformationMatrix(const CGAffineTransform&); operator CGAffineTransform() const; -#elif PLATFORM(CAIRO) +#elif USE(CAIRO) operator cairo_matrix_t() const; #elif PLATFORM(OPENVG) operator VGMatrix() const; |