Fold away SVGInlineTextBoxPainter::paintDecorationWithStyle

Source/core/paint/SVGInlineTextBoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGInlineTextBoxPainter.h"
 
 #include "core/dom/DocumentMarkerController.h"
 #include "core/dom/RenderedDocumentMarker.h"
 #include "core/editing/Editor.h"
@@ skipping 186 matching lines @@
         if (renderer->style() && renderer->style()->textDecoration() != TextDecorationNone)
             break;
 
         parentBox = parentBox->parent();
     }
 
     ASSERT(renderer);
     return renderer;
 }
 
-void SVGInlineTextBoxPainter::paintDecoration(GraphicsContext* context, TextDecoration decoration, const SVGTextFragment& fragment)
-{
-    if (m_svgInlineTextBox.renderer().style()->textDecorationsInEffect() == TextDecorationNone)
-        return;
-
-    // Find out which render style defined the text-decoration, as its fill/stroke properties have to be used for drawing instead of ours.
-    RenderObject* decorationRenderer = findRenderObjectDefininingTextDecoration(m_svgInlineTextBox.parent());
-    RenderStyle* decorationStyle = decorationRenderer->style();
-    ASSERT(decorationStyle);
-
-    if (decorationStyle->visibility() == HIDDEN)
-        return;
-
-    const SVGRenderStyle& svgDecorationStyle = decorationStyle->svgStyle();
-
-    for (int i = 0; i < 3; i++) {
-        switch (svgDecorationStyle.paintOrderType(i)) {
-        case PT_FILL:
-            if (svgDecorationStyle.hasFill())
-                paintDecorationWithStyle(context, decoration, fragment, decorationRenderer, ApplyToFillMode);
-            break;
-        case PT_STROKE:
-            if (svgDecorationStyle.hasVisibleStroke())
-                paintDecorationWithStyle(context, decoration, fragment, decorationRenderer, ApplyToStrokeMode);
-            break;
-        case PT_MARKERS:
-            break;
-        default:
-            ASSERT_NOT_REACHED();
-        }
-    }
-}
 
 // Offset from the baseline for |decoration|. Positive offsets are above the baseline.
 static inline float baselineOffsetForDecoration(TextDecoration decoration, const FontMetrics& fontMetrics, float thickness)
 {
     // FIXME: For SVG Fonts we need to use the attributes defined in the <font-face> if specified.
     // Compatible with Batik/Presto.
     if (decoration == TextDecorationUnderline)
         return -thickness * 1.5f;
     if (decoration == TextDecorationOverline)
         return fontMetrics.floatAscent() - thickness;
     if (decoration == TextDecorationLineThrough)
         return fontMetrics.floatAscent() * 3 / 8.0f;
 
     ASSERT_NOT_REACHED();
     return 0.0f;
 }
 
 static inline float thicknessForDecoration(TextDecoration, const Font& font)
 {
     // FIXME: For SVG Fonts we need to use the attributes defined in the <font-face> if specified.
     // Compatible with Batik/Presto
     return font.fontDescription().computedSize() / 20.0f;
 }
 
-void SVGInlineTextBoxPainter::paintDecorationWithStyle(GraphicsContext* context, TextDecoration decoration,
-    const SVGTextFragment& fragment, RenderObject* decorationRenderer, RenderSVGResourceMode resourceMode)
+void SVGInlineTextBoxPainter::paintDecoration(GraphicsContext* context, TextDecoration decoration, const SVGTextFragment& fragment)
 {
+    if (m_svgInlineTextBox.renderer().style()->textDecorationsInEffect() == TextDecorationNone)
+        return;
+
+    if (fragment.width <= 0)
+        return;
+
+    // Find out which render style defined the text-decoration, as its fill/stroke properties have to be used for drawing instead of ours.
+    RenderObject* decorationRenderer = findRenderObjectDefininingTextDecoration(m_svgInlineTextBox.parent());
     RenderStyle* decorationStyle = decorationRenderer->style();
     ASSERT(decorationStyle);
 
+    if (decorationStyle->visibility() == HIDDEN)
+        return;
+
     float scalingFactor = 1;
     Font scaledFont;
     RenderSVGInlineText::computeNewScaledFontForStyle(decorationRenderer, decorationStyle, scalingFactor, scaledFont);
     ASSERT(scalingFactor);
 
     float thickness = thicknessForDecoration(decoration, scaledFont);
-
-    if (fragment.width <= 0 && thickness <= 0)
+    if (thickness <= 0)
         return;
 
     float decorationOffset = baselineOffsetForDecoration(decoration, scaledFont.fontMetrics(), thickness);
     FloatPoint decorationOrigin(fragment.x, fragment.y - decorationOffset / scalingFactor);
 
     Path path;
     path.addRect(FloatRect(decorationOrigin, FloatSize(fragment.width, thickness / scalingFactor)));
 
-    GraphicsContextStateSaver stateSaver(*context, false);
-    if (!SVGRenderSupport::updateGraphicsContext(stateSaver, decorationStyle, *decorationRenderer, resourceMode))
-        return;
-    SVGRenderSupport::fillOrStrokePath(context, resourceMode, path);
+    const SVGRenderStyle& svgDecorationStyle = decorationStyle->svgStyle();
+
+    for (int i = 0; i < 3; i++) {
+        switch (svgDecorationStyle.paintOrderType(i)) {
+        case PT_FILL:
+            if (svgDecorationStyle.hasFill()) {
+                GraphicsContextStateSaver stateSaver(*context, false);
+                if (!SVGRenderSupport::updateGraphicsContext(stateSaver, decorationStyle, *decorationRenderer, ApplyToFillMode))
+                    break;
+                context->fillPath(path);
+            }
+            break;
+        case PT_STROKE:
+            if (svgDecorationStyle.hasVisibleStroke()) {
+                GraphicsContextStateSaver stateSaver(*context, false);
+                if (!SVGRenderSupport::updateGraphicsContext(stateSaver, decorationStyle, *decorationRenderer, ApplyToStrokeMode))
+                    break;
+                context->strokePath(path);
+            }
+            break;
+        case PT_MARKERS:
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+        }
+    }
 }
 
 void SVGInlineTextBoxPainter::paintTextWithShadows(GraphicsContext* context, RenderStyle* style,
     TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition,
     RenderSVGResourceMode resourceMode)
 {
     RenderSVGInlineText& textRenderer = toRenderSVGInlineText(m_svgInlineTextBox.renderer());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
@@ skipping 133 matching lines @@
 
             fragmentRect = fragmentTransform.mapRect(fragmentRect);
             markerRect.unite(fragmentRect);
         }
     }
 
     toRenderedDocumentMarker(marker)->setRenderedRect(textRenderer.localToAbsoluteQuad(markerRect).enclosingBoundingBox());
 }
 
 } // namespace blink