1 files changed, 9 insertions, 15 deletions
diff --git a/Source/WebCore/platform/graphics/Path.h b/Source/WebCore/platform/graphics/Path.h
index 0e58d3399..1b6250d9d 100644
--- a/Source/WebCore/platform/graphics/Path.h
+++ b/Source/WebCore/platform/graphics/Path.h
@@ -28,37 +28,30 @@
 #ifndef Path_h
 #define Path_h
 
-#include "RoundedRect.h"
 #include "WindRule.h"
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
 
 #if USE(CG)
 typedef struct CGPath PlatformPath;
-#elif PLATFORM(OPENVG)
-namespace WebCore {
-class PlatformPathOpenVG;
-}
-typedef WebCore::PlatformPathOpenVG PlatformPath;
 #elif PLATFORM(QT)
 #include <qpainterpath.h>
 typedef QPainterPath PlatformPath;
-#elif PLATFORM(WX) && USE(WXGC)
-class wxGraphicsPath;
-typedef wxGraphicsPath PlatformPath;
 #elif USE(CAIRO)
 namespace WebCore {
 class CairoPath;
 }
 typedef WebCore::CairoPath PlatformPath;
-#elif USE(SKIA)
-class SkPath;
-typedef SkPath PlatformPath;
-#elif OS(WINCE)
+#elif USE(WINGDI)
 namespace WebCore {
     class PlatformPath;
 }
 typedef WebCore::PlatformPath PlatformPath;
+#elif PLATFORM(BLACKBERRY)
+namespace BlackBerry { namespace Platform { namespace Graphics {
+    class Path;
+} } }
+typedef BlackBerry::Platform::Graphics::Path PlatformPath;
 #else
 typedef void PlatformPath;
 #endif
@@ -77,6 +70,7 @@ namespace WebCore {
     class FloatRect;
     class FloatSize;
     class GraphicsContext;
+    class RoundedRect;
     class StrokeStyleApplier;
 
     enum PathElementType {
@@ -168,12 +162,12 @@ namespace WebCore {
         void addPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius, RoundedRectStrategy = PreferNativeRoundedRect);
         void addBeziersForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
 
-#if USE(CG)
+#if USE(CG) || PLATFORM(BLACKBERRY)
         void platformAddPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
 #endif
 
 #if PLATFORM(BLACKBERRY)
-        Path(const SkPath&);
+        Path(const PlatformPath&);
 #endif
 
     private: