Move geometry generation out of RenderSVGResource*::postApplyResource

The code-paths that will operate on RenderSVGResources that are
paint-servers are quite easily distinguishable from those where other
resources are involved - and because all paint-servers have the same kind
of geometry generation it's trivially hoistable into the relevant
callsites.
This allows the argument list of postApplyResource to be shortened
(removing |path|, |shape| and |resourceMode| since they are now unused).
Since all callers of the hoisted function (fillOrStrokePrimitive) passes
either a |shape| or a |path| - but never both, we can split this method into
its two logical parts.
Doing this however reveal that the |shape| variant can be trivially folded
into it's callers since they will always end up calling the same method.
This means that fillOrStrokePrimitive is replaced with/transformed into
fillOrStrokePath.

Review URL: https://codereview.chromium.org/571923002

git-svn-id: svn://svn.chromium.org/blink/trunk@182004 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/rendering/svg/RenderSVGResource.h

@@ -60,7 +60,7 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) = 0;
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) = 0;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) { }
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) { }
 
     virtual RenderSVGResourceType resourceType() const = 0;
 

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.cpp

@@ -208,8 +208,8 @@ bool RenderSVGResourceClipper::applyClippingToContext(RenderObject* target, cons
     return true;
 }
 
-void RenderSVGResourceClipper::postApplyResource(RenderObject*, GraphicsContext*&, unsigned short,
-    const Path*, const RenderSVGShape*) {
+void RenderSVGResourceClipper::postApplyResource(RenderObject*, GraphicsContext*&)
+{
     // Clippers are always applied using stateful methods.
     ASSERT_NOT_REACHED();
 }

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h

@@ -44,7 +44,7 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE;
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) OVERRIDE;
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE;
 
     // FIXME: Filters are also stateful resources that could benefit from having their state managed
     //        on the caller stack instead of the current hashmap. We should look at refactoring these

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceFilter.cpp

@@ -337,11 +337,10 @@ bool RenderSVGResourceFilter::applyResource(RenderObject* object, RenderStyle*,
     return true;
 }
 
-void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsContext*& context, unsigned short resourceMode, const Path*, const RenderSVGShape*)
+void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsContext*& context)
 {
     ASSERT(object);
     ASSERT(context);
-    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
 
     FilterData* filterData = m_filter.get(object);
     if (!filterData)

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceFilter.h

@@ -70,7 +70,7 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE;
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE;
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE;
 
     FloatRect resourceBoundingBox(const RenderObject*);
 

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceGradient.cpp

@@ -128,11 +128,9 @@ bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle*
     return true;
 }
 
-void RenderSVGResourceGradient::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path, const RenderSVGShape* shape)
+void RenderSVGResourceGradient::postApplyResource(RenderObject*, GraphicsContext*& context)
 {
     ASSERT(context);
-    SVGRenderSupport::fillOrStrokePrimitive(context, resourceMode, path, shape);
-
     context->restore();
 }
 

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceGradient.h

@@ -49,7 +49,7 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE FINAL;
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE FINAL;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE FINAL;
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE FINAL;
 
 protected:
     void addStops(GradientData*, const Vector<Gradient::ColorStop>&) const;

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp

@@ -76,13 +76,11 @@ bool RenderSVGResourceMasker::applyResource(RenderObject* object, RenderStyle*,
     return true;
 }
 
-void RenderSVGResourceMasker::postApplyResource(RenderObject* object, GraphicsContext*& context,
-    unsigned short resourceMode, const Path*, const RenderSVGShape*)
+void RenderSVGResourceMasker::postApplyResource(RenderObject* object, GraphicsContext*& context)
 {
     ASSERT(object);
     ASSERT(context);
     ASSERT(style());
-    ASSERT_UNUSED(resourceMode, resourceMode == ApplyToDefaultMode);
     ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
 
     FloatRect paintInvalidationRect = object->paintInvalidationRectInLocalCoordinates();

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.h

@@ -45,7 +45,7 @@ public:
     virtual void removeAllClientsFromCache(bool markForInvalidation = true) OVERRIDE;
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE;
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) OVERRIDE;
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE;
     FloatRect resourceBoundingBox(const RenderObject*);
 
     SVGUnitTypes::SVGUnitType maskUnits() const { return toSVGMaskElement(element())->maskUnits()->currentValue()->enumValue(); }

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourcePattern.cpp

@@ -171,11 +171,9 @@ bool RenderSVGResourcePattern::applyResource(RenderObject* object, RenderStyle*
     return true;
 }
 
-void RenderSVGResourcePattern::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path, const RenderSVGShape* shape)
+void RenderSVGResourcePattern::postApplyResource(RenderObject*, GraphicsContext*& context)
 {
     ASSERT(context);
-    SVGRenderSupport::fillOrStrokePrimitive(context, resourceMode, path, shape);
-
     context->restore();
 }
 

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourcePattern.h

@@ -52,7 +52,7 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE;
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE;
+    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE;
 
     virtual RenderSVGResourceType resourceType() const OVERRIDE { return s_resourceType; }
     static const RenderSVGResourceType s_resourceType;

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceSolidColor.cpp

@@ -81,10 +81,4 @@ bool RenderSVGResourceSolidColor::applyResource(RenderObject* object, RenderStyl
     return true;
 }
 
-void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path, const RenderSVGShape* shape)
-{
-    ASSERT(context);
-    SVGRenderSupport::fillOrStrokePrimitive(context, resourceMode, path, shape);
-}
-
 }

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceSolidColor.h

@@ -35,7 +35,6 @@ public:
     virtual void removeClientFromCache(RenderObject*, bool = true) OVERRIDE { }
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE;
 
     virtual RenderSVGResourceType resourceType() const OVERRIDE { return s_resourceType; }
     static const RenderSVGResourceType s_resourceType;

third_party/WebKit/Source/core/rendering/svg/RenderSVGShape.cpp

@@ -205,11 +205,14 @@ void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
     bool hasFallback;
     if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(this, style, hasFallback)) {
         if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode)) {
-            fillPaintingResource->postApplyResource(this, context, ApplyToFillMode, 0, this);
+            fillShape(context);
+            fillPaintingResource->postApplyResource(this, context);
         } else if (hasFallback) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
-            if (fallbackResource->applyResource(this, style, context, ApplyToFillMode))
-                fallbackResource->postApplyResource(this, context, ApplyToFillMode, 0, this);
+            if (fallbackResource->applyResource(this, style, context, ApplyToFillMode)) {
+                fillShape(context);
+                fallbackResource->postApplyResource(this, context);
+            }
         }
     }
 }
@@ -219,11 +222,14 @@ void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
     bool hasFallback;
     if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style, hasFallback)) {
         if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode)) {
-            strokePaintingResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
+            strokeShape(context);
+            strokePaintingResource->postApplyResource(this, context);
         } else if (hasFallback) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
-            if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode))
-                fallbackResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
+            if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode)) {
+                strokeShape(context);
+                fallbackResource->postApplyResource(this, context);
+            }
         }
     }
 }

third_party/WebKit/Source/core/rendering/svg/SVGInlineTextBox.cpp

@@ -37,6 +37,7 @@
 #include "core/rendering/svg/RenderSVGInlineText.h"
 #include "core/rendering/svg/RenderSVGResource.h"
 #include "core/rendering/svg/RenderSVGResourceSolidColor.h"
+#include "core/rendering/svg/SVGRenderSupport.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "core/rendering/svg/SVGTextRunRenderingContext.h"
 #include "platform/FloatConversion.h"
@@ -353,7 +354,7 @@ public:
     ~PaintingResourceScope() { ASSERT(!m_paintingResource); }
 
     bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderStyle*, RenderSVGResourceModeFlags);
-    void releasePaintingResource(GraphicsContext*&, const Path*, RenderSVGResourceModeFlags);
+    void releasePaintingResource(GraphicsContext*&);
 
 private:
     RenderObject& m_renderer;
@@ -401,12 +402,11 @@ bool PaintingResourceScope::acquirePaintingResource(GraphicsContext*& context, f
     return true;
 }
 
-void PaintingResourceScope::releasePaintingResource(GraphicsContext*& context, const Path* path,
-    RenderSVGResourceModeFlags resourceMode)
+void PaintingResourceScope::releasePaintingResource(GraphicsContext*& context)
 {
     ASSERT(m_paintingResource);
 
-    m_paintingResource->postApplyResource(&m_renderer, context, resourceMode, path, 0);
+    m_paintingResource->postApplyResource(&m_renderer, context);
     m_paintingResource = 0;
 
 #if ENABLE(SVG_FONTS)
@@ -590,8 +590,10 @@ void SVGInlineTextBox::paintDecorationWithStyle(GraphicsContext* context, TextDe
     // acquirePaintingResource also modifies state if the scalingFactor is non-identity.
     // Above we have saved the state for this case.
     PaintingResourceScope resourceScope(*decorationRenderer);
-    if (resourceScope.acquirePaintingResource(context, scalingFactor, decorationStyle, resourceMode))
-        resourceScope.releasePaintingResource(context, &path, resourceMode);
+    if (resourceScope.acquirePaintingResource(context, scalingFactor, decorationStyle, resourceMode)) {
+        SVGRenderSupport::fillOrStrokePath(context, resourceMode, path);
+        resourceScope.releasePaintingResource(context);
+    }
 }
 
 void SVGInlineTextBox::paintTextWithShadows(GraphicsContext* context, RenderStyle* style,
@@ -633,7 +635,7 @@ void SVGInlineTextBox::paintTextWithShadows(GraphicsContext* context, RenderStyl
             textSize.width(), textSize.height());
 
         scaledFont.drawText(context, textRunPaintInfo, textOrigin);
-        resourceScope.releasePaintingResource(context, 0, resourceMode);
+        resourceScope.releasePaintingResource(context);
     }
 
     if (scalingFactor != 1)

third_party/WebKit/Source/core/rendering/svg/SVGRenderSupport.cpp

@@ -365,22 +365,14 @@ void SVGRenderSupport::applyStrokeStyleToStrokeData(StrokeData* strokeData, cons
     strokeData->setLineDash(dashArray, svgStyle.strokeDashOffset()->value(lengthContext));
 }
 
-void SVGRenderSupport::fillOrStrokePrimitive(GraphicsContext* context, unsigned short resourceMode, const Path* path, const RenderSVGShape* shape)
+void SVGRenderSupport::fillOrStrokePath(GraphicsContext* context, unsigned short resourceMode, const Path& path)
 {
     ASSERT(resourceMode != ApplyToDefaultMode);
 
-    if (resourceMode & ApplyToFillMode) {
-        if (path)
-            context->fillPath(*path);
-        else if (shape)
-            shape->fillShape(context);
-    }
-    if (resourceMode & ApplyToStrokeMode) {
-        if (path)
-            context->strokePath(*path);
-        else if (shape)
-            shape->strokeShape(context);
-    }
+    if (resourceMode & ApplyToFillMode)
+        context->fillPath(path);
+    if (resourceMode & ApplyToStrokeMode)
+        context->strokePath(path);
 }
 
 bool SVGRenderSupport::isRenderableTextNode(const RenderObject* object)

third_party/WebKit/Source/core/rendering/svg/SVGRenderSupport.h

@@ -82,8 +82,8 @@ public:
     static void applyStrokeStyleToContext(GraphicsContext*, const RenderStyle*, const RenderObject*);
     static void applyStrokeStyleToStrokeData(StrokeData*, const RenderStyle*, const RenderObject*);
 
-    // Fill and/or stroke the primitive provide as either |path| or |shape|. The former has precedence if both are non-zero.
-    static void fillOrStrokePrimitive(GraphicsContext*, unsigned short resourceMode, const Path*, const RenderSVGShape*);
+    // Fill and/or stroke the provided |path|.
+    static void fillOrStrokePath(GraphicsContext*, unsigned short resourceMode, const Path&);
 
     // Determines if any ancestor's transform has changed.
     static bool transformToRootChanged(RenderObject*);

third_party/WebKit/Source/core/rendering/svg/SVGRenderingContext.cpp

@@ -63,7 +63,7 @@ SVGRenderingContext::~SVGRenderingContext()
 
         if (m_filter) {
             ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->filter() == m_filter);
-            m_filter->postApplyResource(m_object, m_paintInfo->context, ApplyToDefaultMode, 0, 0);
+            m_filter->postApplyResource(m_object, m_paintInfo->context);
             m_paintInfo->context = m_savedContext;
             m_paintInfo->rect = m_savedPaintRect;
         }
@@ -75,7 +75,7 @@ SVGRenderingContext::~SVGRenderingContext()
 
         if (m_masker) {
             ASSERT(SVGResourcesCache::cachedResourcesForRenderObject(m_object)->masker() == m_masker);
-            m_masker->postApplyResource(m_object, m_paintInfo->context, ApplyToDefaultMode, 0, 0);
+            m_masker->postApplyResource(m_object, m_paintInfo->context);
         }
     }
 

third_party/WebKit/Source/core/rendering/svg/SVGTextRunRenderingContext.cpp

@@ -26,6 +26,7 @@
 #include "core/rendering/RenderObject.h"
 #include "core/rendering/svg/RenderSVGInlineText.h"
 #include "core/rendering/svg/RenderSVGResourceSolidColor.h"
+#include "core/rendering/svg/SVGRenderSupport.h"
 #include "core/svg/SVGFontData.h"
 #include "core/svg/SVGFontElement.h"
 #include "core/svg/SVGFontFaceElement.h"
@@ -164,7 +165,8 @@ void SVGTextRunRenderingContext::drawSVGGlyphs(GraphicsContext* context, const T
             float strokeThickness = context->strokeThickness();
             if (renderObject && renderObject->isSVGInlineText())
                 context->setStrokeThickness(strokeThickness * toRenderSVGInlineText(renderObject)->scalingFactor());
-            activePaintingResource->postApplyResource(parentRenderObject, context, resourceMode, &glyphPath, 0);
+            SVGRenderSupport::fillOrStrokePath(context, resourceMode, glyphPath);
+            activePaintingResource->postApplyResource(parentRenderObject, context);
             context->setStrokeThickness(strokeThickness);
         }