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

Source/WebCore/rendering/style/SVGRenderStyleDefs.h

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     Based on khtml code by:
     Copyright (C) 2000-2003 Lars Knoll (knoll@kde.org)
               (C) 2000 Antti Koivisto (koivisto@kde.org)
               (C) 2000-2003 Dirk Mueller (mueller@kde.org)
               (C) 2002-2003 Apple Computer, Inc.
@@ skipping 11 matching lines @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #ifndef SVGRenderStyleDefs_h
 #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>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
     enum EBaselineShift {
         BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH
@@ skipping 46 matching lines @@
 
     class CSSValue;
     class CSSValueList;
     class SVGPaint;
 
     // Inherited/Non-Inherited Style Datastructures
     class StyleFillData : public RefCounted<StyleFillData> {
     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
         {
             return !(*this == other);
         }
 
         float opacity;
-        SVGPaint::SVGPaintType paintType;
-        Color paintColor;
-        String paintUri;
+        RefPtr<SVGPaint> paint;
 
     private:
         StyleFillData();
         StyleFillData(const StyleFillData&);
     };
 
     class StyleStrokeData : public RefCounted<StyleStrokeData> {
     public:
         static PassRefPtr<StyleStrokeData> create() { return adoptRef(new StyleStrokeData); }
         PassRefPtr<StyleStrokeData> copy() const { return adoptRef(new StyleStrokeData(*this)); }
 
         bool operator==(const StyleStrokeData&) const;
         bool operator!=(const StyleStrokeData& other) const
         {
             return !(*this == other);
         }
 
         float opacity;
         float miterLimit;
 
         SVGLength width;
         SVGLength dashOffset;
         Vector<SVGLength> dashArray;
 
-        SVGPaint::SVGPaintType paintType;
-        Color paintColor;
-        String paintUri;
+        RefPtr<SVGPaint> paint;
 
     private:        
         StyleStrokeData();
         StyleStrokeData(const StyleStrokeData&);
     };
 
     class StyleStopData : public RefCounted<StyleStopData> {
     public:
         static PassRefPtr<StyleStopData> create() { return adoptRef(new StyleStopData); }
         PassRefPtr<StyleStopData> copy() const { return adoptRef(new StyleStopData(*this)); }
@@ skipping 110 matching lines @@
         String markerEnd;
 
     private:
         StyleInheritedResourceData();
         StyleInheritedResourceData(const StyleInheritedResourceData&);
     };
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)
+
 #endif // SVGRenderStyleDefs_h