| Index: Source/core/rendering/style/SVGRenderStyleDefs.h
|
| diff --git a/Source/core/rendering/style/SVGRenderStyleDefs.h b/Source/core/rendering/style/SVGRenderStyleDefs.h
|
| index abd12379dd62da85bffe4d20c828995b1d104cbb..a49a47649c0d200c3cfff4d0ddd8903cdb46b4c3 100644
|
| --- a/Source/core/rendering/style/SVGRenderStyleDefs.h
|
| +++ b/Source/core/rendering/style/SVGRenderStyleDefs.h
|
| @@ -30,7 +30,6 @@
|
|
|
| #include "core/svg/SVGLength.h"
|
| #include "core/svg/SVGLengthList.h"
|
| -#include "core/svg/SVGPaint.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -38,6 +37,19 @@
|
|
|
| namespace WebCore {
|
|
|
| + enum SVGPaintType {
|
| + SVG_PAINTTYPE_UNKNOWN,
|
| + SVG_PAINTTYPE_RGBCOLOR,
|
| + SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR,
|
| + SVG_PAINTTYPE_NONE,
|
| + SVG_PAINTTYPE_CURRENTCOLOR,
|
| + SVG_PAINTTYPE_URI_NONE,
|
| + SVG_PAINTTYPE_URI_CURRENTCOLOR,
|
| + SVG_PAINTTYPE_URI_RGBCOLOR,
|
| + SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR,
|
| + SVG_PAINTTYPE_URI
|
| + };
|
| +
|
| enum EBaselineShift {
|
| BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH
|
| };
|
| @@ -117,10 +129,10 @@ namespace WebCore {
|
| }
|
|
|
| float opacity;
|
| - SVGPaint::SVGPaintType paintType;
|
| + SVGPaintType paintType;
|
| Color paintColor;
|
| String paintUri;
|
| - SVGPaint::SVGPaintType visitedLinkPaintType;
|
| + SVGPaintType visitedLinkPaintType;
|
| Color visitedLinkPaintColor;
|
| String visitedLinkPaintUri;
|
|
|
| @@ -147,10 +159,10 @@ namespace WebCore {
|
| RefPtr<SVGLength> dashOffset;
|
| RefPtr<SVGLengthList> dashArray;
|
|
|
| - SVGPaint::SVGPaintType paintType;
|
| + SVGPaintType paintType;
|
| Color paintColor;
|
| String paintUri;
|
| - SVGPaint::SVGPaintType visitedLinkPaintType;
|
| + SVGPaintType visitedLinkPaintType;
|
| Color visitedLinkPaintColor;
|
| String visitedLinkPaintUri;
|
|
|
|
|