diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/graphics/transforms | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/graphics/transforms')
| -rw-r--r-- | Source/WebCore/platform/graphics/transforms/AffineTransform.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/transforms/TransformationMatrix.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/transforms/AffineTransform.h b/Source/WebCore/platform/graphics/transforms/AffineTransform.h index 3e3995f..14431aa 100644 --- a/Source/WebCore/platform/graphics/transforms/AffineTransform.h +++ b/Source/WebCore/platform/graphics/transforms/AffineTransform.h @@ -40,7 +40,7 @@ #include "VGUtils.h" #elif PLATFORM(QT) #include <QTransform> -#elif PLATFORM(SKIA) +#elif USE(SKIA) #include <SkMatrix.h> #elif PLATFORM(WX) && USE(WXGC) #include <wx/graphics.h> @@ -165,7 +165,7 @@ public: operator VGMatrix() const; #elif PLATFORM(QT) operator QTransform() const; -#elif PLATFORM(SKIA) +#elif USE(SKIA) operator SkMatrix() const; #elif PLATFORM(WX) && USE(WXGC) operator wxGraphicsMatrix() const; diff --git a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h index fa27c0e..adda46b 100644 --- a/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h +++ b/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h @@ -32,17 +32,17 @@ #include <wtf/FastAllocBase.h> #if PLATFORM(CA) -#include <QuartzCore/CATransform3D.h> +typedef struct CATransform3D CATransform3D; #endif #if PLATFORM(CG) -#include <CoreGraphics/CGAffineTransform.h> +typedef struct CGAffineTransform CGAffineTransform; #elif PLATFORM(CAIRO) #include <cairo.h> #elif PLATFORM(OPENVG) #include "VGUtils.h" #elif PLATFORM(QT) #include <QTransform> -#elif PLATFORM(SKIA) +#elif USE(SKIA) #include <SkMatrix.h> #elif PLATFORM(WX) && USE(WXGC) #include <wx/graphics.h> @@ -321,7 +321,7 @@ public: operator VGMatrix() const; #elif PLATFORM(QT) operator QTransform() const; -#elif PLATFORM(SKIA) +#elif USE(SKIA) operator SkMatrix() const; #elif PLATFORM(WX) && USE(WXGC) operator wxGraphicsMatrix() const; |