| Index: Source/core/rendering/svg/SVGResources.h
|
| diff --git a/Source/core/rendering/svg/SVGResources.h b/Source/core/rendering/svg/SVGResources.h
|
| index e2df80b914c6e471ac6878780b63b17125b7e911..f32d494760cb4b746fee8e31d33d31864a69e0fe 100644
|
| --- a/Source/core/rendering/svg/SVGResources.h
|
| +++ b/Source/core/rendering/svg/SVGResources.h
|
| @@ -34,6 +34,7 @@ class RenderSVGResourceContainer;
|
| class RenderSVGResourceFilter;
|
| class RenderSVGResourceMarker;
|
| class RenderSVGResourceMasker;
|
| +class RenderSVGResourcePaintServer;
|
| class SVGElement;
|
| class SVGRenderStyle;
|
|
|
| @@ -63,8 +64,8 @@ public:
|
| }
|
|
|
| // Paint servers
|
| - RenderSVGResourceContainer* fill() const { return m_fillStrokeData ? m_fillStrokeData->fill : 0; }
|
| - RenderSVGResourceContainer* stroke() const { return m_fillStrokeData ? m_fillStrokeData->stroke : 0; }
|
| + RenderSVGResourcePaintServer* fill() const { return m_fillStrokeData ? m_fillStrokeData->fill : 0; }
|
| + RenderSVGResourcePaintServer* stroke() const { return m_fillStrokeData ? m_fillStrokeData->stroke : 0; }
|
|
|
| // Chainable resources - linked through xlink:href
|
| RenderSVGResourceContainer* linkedResource() const { return m_linkedResource; }
|
| @@ -101,8 +102,8 @@ private:
|
| bool setMarkerMid(RenderSVGResourceMarker*);
|
| bool setMarkerEnd(RenderSVGResourceMarker*);
|
| bool setMasker(RenderSVGResourceMasker*);
|
| - bool setFill(RenderSVGResourceContainer*);
|
| - bool setStroke(RenderSVGResourceContainer*);
|
| + bool setFill(RenderSVGResourcePaintServer*);
|
| + bool setStroke(RenderSVGResourcePaintServer*);
|
| bool setLinkedResource(RenderSVGResourceContainer*);
|
|
|
| // From SVG 1.1 2nd Edition
|
| @@ -170,8 +171,8 @@ private:
|
| return adoptPtr(new FillStrokeData);
|
| }
|
|
|
| - RenderSVGResourceContainer* fill;
|
| - RenderSVGResourceContainer* stroke;
|
| + RenderSVGResourcePaintServer* fill;
|
| + RenderSVGResourcePaintServer* stroke;
|
| };
|
|
|
| OwnPtr<ClipperFilterMaskerData> m_clipperFilterMaskerData;
|
|
|