Move geometry generation out of RenderSVGResource*::postApplyResource

Source/core/rendering/svg/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 19 matching lines @@
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/InlineFlowBox.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/PointerEventsHitRules.h"
 #include "core/rendering/RenderInline.h"
 #include "core/rendering/RenderTheme.h"
 #include "core/rendering/style/ShadowList.h"
 #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"
 #include "platform/fonts/FontCache.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 
 namespace blink {
 
 struct ExpectedSVGInlineTextBoxSize : public InlineTextBox {
     float float1;
@@ skipping 296 matching lines @@
 public:
     PaintingResourceScope(RenderObject& renderer, TextRun::RenderingContext* renderingContext = 0)
         : m_renderer(renderer)
         , m_renderingContext(renderingContext)
         , m_paintingResource(0)
     {
     }
     ~PaintingResourceScope() { ASSERT(!m_paintingResource); }
 
     bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderStyle*, RenderSVGResourceModeFlags);
-    void releasePaintingResource(GraphicsContext*&, const Path*, RenderSVGResourceModeFlags);
+    void releasePaintingResource(GraphicsContext*&);
 
 private:
     RenderObject& m_renderer;
     TextRun::RenderingContext* m_renderingContext;
     RenderSVGResource* m_paintingResource;
 };
 
 bool PaintingResourceScope::acquirePaintingResource(GraphicsContext*& context, float scalingFactor,
     RenderStyle* style, RenderSVGResourceModeFlags resourceMode)
 {
@@ skipping 27 matching lines @@
 
 #if ENABLE(SVG_FONTS)
     // SVG Fonts need access to the painting resource used to draw the current text chunk.
     if (m_renderingContext)
         static_cast<SVGTextRunRenderingContext*>(m_renderingContext)->setActivePaintingResource(m_paintingResource);
 #endif
 
     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)
     if (m_renderingContext)
         static_cast<SVGTextRunRenderingContext*>(m_renderingContext)->setActivePaintingResource(0);
 #endif
 }
 
 TextRun SVGInlineTextBox::constructTextRun(RenderStyle* style, const SVGTextFragment& fragment) const
 {
@@ skipping 163 matching lines @@
     }
 
     decorationOrigin.move(0, -scaledFontMetrics.floatAscent() + positionOffsetForDecoration(decoration, scaledFontMetrics, thickness));
 
     Path path;
     path.addRect(FloatRect(decorationOrigin, FloatSize(width, thickness)));
 
     // 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,
     TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition,
     RenderSVGResourceModeFlags resourceMode)
 {
     RenderSVGInlineText& textRenderer = toRenderSVGInlineText(this->renderer());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
@@ skipping 21 matching lines @@
     if (resourceScope.acquirePaintingResource(context, scalingFactor, style, resourceMode)) {
         TextRunPaintInfo textRunPaintInfo(textRun);
         textRunPaintInfo.from = startPosition;
         textRunPaintInfo.to = endPosition;
 
         float baseline = scaledFont.fontMetrics().floatAscent();
         textRunPaintInfo.bounds = FloatRect(textOrigin.x(), textOrigin.y() - baseline,
             textSize.width(), textSize.height());
 
         scaledFont.drawText(context, textRunPaintInfo, textOrigin);
-        resourceScope.releasePaintingResource(context, 0, resourceMode);
+        resourceScope.releasePaintingResource(context);
     }
 
     if (scalingFactor != 1)
         context->restore();
     else if (hasShadow)
         context->clearShadow();
 }
 
 void SVGInlineTextBox::paintText(GraphicsContext* context, RenderStyle* style,
     RenderStyle* selectionStyle, const SVGTextFragment& fragment,
@@ skipping 143 matching lines @@
                 renderer().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
                 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, locationInContainer, rect))
                     return true;
              }
         }
     }
     return false;
 }
 
 } // namespace blink