| Index: Source/core/rendering/svg/RenderSVGResource.h
|
| diff --git a/Source/core/rendering/svg/RenderSVGResource.h b/Source/core/rendering/svg/RenderSVGResource.h
|
| index 7c283a6ba82bf6e0123579e19a9fe25b493d05c3..2c8e48e7b9a76c967bd22342b5577cb957331db2 100644
|
| --- a/Source/core/rendering/svg/RenderSVGResource.h
|
| +++ b/Source/core/rendering/svg/RenderSVGResource.h
|
| @@ -41,18 +41,17 @@ enum RenderSVGResourceMode {
|
| };
|
| typedef unsigned RenderSVGResourceModeFlags;
|
|
|
| -class GraphicsContext;
|
| class RenderObject;
|
| class RenderStyle;
|
| class RenderSVGResourceSolidColor;
|
| +class SVGPaintServer;
|
|
|
| class RenderSVGResource {
|
| public:
|
| RenderSVGResource() { }
|
| virtual ~RenderSVGResource() { }
|
|
|
| - virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*, RenderSVGResourceModeFlags);
|
| - virtual void postApplyResource(GraphicsContext*) { }
|
| + virtual bool preparePaintServer(RenderObject*, RenderStyle*, RenderSVGResourceModeFlags, SVGPaintServer&);
|
|
|
| virtual RenderSVGResourceType resourceType() const = 0;
|
|
|
| @@ -62,10 +61,6 @@ public:
|
| static RenderSVGResourceSolidColor* sharedSolidPaintingResource();
|
|
|
| static void markForLayoutAndParentResourceInvalidation(RenderObject*, bool needsLayout = true);
|
| -
|
| -protected:
|
| - // Transfer fill/stroke style (except paint server) to the GC.
|
| - static void updateGraphicsContext(GraphicsContext*, const RenderStyle*, const RenderObject&, unsigned resourceModeFlags);
|
| };
|
|
|
| #define DEFINE_RENDER_SVG_RESOURCE_TYPE_CASTS(thisType, typeName) \
|
|
|