diff options
-rw-r--r-- | JavaScriptCore/wtf/Platform.h | 1 | ||||
-rw-r--r-- | WebCore/platform/graphics/FloatPoint.h | 4 | ||||
-rw-r--r-- | WebCore/platform/graphics/FloatRect.h | 4 | ||||
-rw-r--r-- | WebCore/platform/graphics/IntPoint.h | 4 | ||||
-rw-r--r-- | WebCore/platform/graphics/IntRect.h | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 3fb8d08..23e6c8b 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -181,7 +181,6 @@ #define WTF_USE_PTHREADS 1 #define WTF_PLATFORM_SGL 1 -#define WTF_PLATFORM_SKIA_SGL 1 #define WTF_PLATFORM_UNIX 1 #define USE_SYSTEM_MALLOC 1 diff --git a/WebCore/platform/graphics/FloatPoint.h b/WebCore/platform/graphics/FloatPoint.h index 49264d3..a3fbeea 100644 --- a/WebCore/platform/graphics/FloatPoint.h +++ b/WebCore/platform/graphics/FloatPoint.h @@ -55,7 +55,7 @@ QT_END_NAMESPACE class TPoint; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) struct SkPoint; #endif @@ -99,7 +99,7 @@ public: FloatPoint(const TPoint&); #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) operator SkPoint() const; FloatPoint(const SkPoint&); #endif diff --git a/WebCore/platform/graphics/FloatRect.h b/WebCore/platform/graphics/FloatRect.h index 3d225a3..786fb3e 100644 --- a/WebCore/platform/graphics/FloatRect.h +++ b/WebCore/platform/graphics/FloatRect.h @@ -51,7 +51,7 @@ QT_END_NAMESPACE class wxRect2DDouble; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) struct SkRect; #endif @@ -143,7 +143,7 @@ public: operator wxRect2DDouble() const; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) FloatRect(const SkRect&); operator SkRect() const; #endif diff --git a/WebCore/platform/graphics/IntPoint.h b/WebCore/platform/graphics/IntPoint.h index 779bf34..a05b1f0 100644 --- a/WebCore/platform/graphics/IntPoint.h +++ b/WebCore/platform/graphics/IntPoint.h @@ -59,7 +59,7 @@ class TPoint; class wxPoint; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) struct SkPoint; struct SkIPoint; #endif @@ -128,7 +128,7 @@ public: operator wxPoint() const; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) IntPoint(const SkIPoint&); operator SkIPoint() const; operator SkPoint() const; diff --git a/WebCore/platform/graphics/IntRect.h b/WebCore/platform/graphics/IntRect.h index 90864b0..1be98b8 100644 --- a/WebCore/platform/graphics/IntRect.h +++ b/WebCore/platform/graphics/IntRect.h @@ -58,7 +58,7 @@ class TRect; class wxRect; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) struct SkRect; struct SkIRect; #endif @@ -158,7 +158,7 @@ public: operator CGRect() const; #endif -#if PLATFORM(SKIA_SGL) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) IntRect(const SkIRect&); operator SkRect() const; operator SkIRect() const; |