Revert 79985 - 2011-03-01 Nikolas Zimmermann <nzimmermann@rim.com>

Source/WebCore/rendering/style/SVGRenderStyleDefs.h

Index: Source/WebCore/rendering/style/SVGRenderStyleDefs.h
===================================================================
--- Source/WebCore/rendering/style/SVGRenderStyleDefs.h	(revision 86165)
+++ Source/WebCore/rendering/style/SVGRenderStyleDefs.h	(working copy)
@@ -29,8 +29,9 @@
 #define SVGRenderStyleDefs_h
 
 #if ENABLE(SVG)
+#include "Color.h"
+#include "PlatformString.h"
 #include "SVGLength.h"
-#include "SVGPaint.h"
 #include "ShadowData.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -97,7 +98,7 @@
     public:
         static PassRefPtr<StyleFillData> create() { return adoptRef(new StyleFillData); }
         PassRefPtr<StyleFillData> copy() const { return adoptRef(new StyleFillData(*this)); }
-
+        
         bool operator==(const StyleFillData&) const;
         bool operator!=(const StyleFillData& other) const
         {
@@ -105,9 +106,7 @@
         }
 
         float opacity;
-        SVGPaint::SVGPaintType paintType;
-        Color paintColor;
-        String paintUri;
+        RefPtr<SVGPaint> paint;
 
     private:
         StyleFillData();
@@ -132,9 +131,7 @@
         SVGLength dashOffset;
         Vector<SVGLength> dashArray;
 
-        SVGPaint::SVGPaintType paintType;
-        Color paintColor;
-        String paintUri;
+        RefPtr<SVGPaint> paint;
 
     private:        
         StyleStrokeData();
@@ -265,4 +262,5 @@
 } // namespace WebCore
 
 #endif // ENABLE(SVG)
+
 #endif // SVGRenderStyleDefs_h