Apply SVG paint-order to text-decorations

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 525 matching lines @@
     RenderObject* decorationRenderer = findRenderObjectDefininingTextDecoration(parent());
     RenderStyle* decorationStyle = decorationRenderer->style();
     ASSERT(decorationStyle);
 
     if (decorationStyle->visibility() == HIDDEN)
         return;
 
     const SVGRenderStyle* svgDecorationStyle = decorationStyle->svgStyle();
     ASSERT(svgDecorationStyle);
 
-    bool hasDecorationFill = svgDecorationStyle->hasFill();
-    bool hasVisibleDecorationStroke = svgDecorationStyle->hasVisibleStroke();
-
-    if (hasDecorationFill) {
-        m_paintingResourceMode = ApplyToFillMode;
-        paintDecorationWithStyle(context, decoration, fragment, decorationRenderer);
-    }
-
-    if (hasVisibleDecorationStroke) {
-        m_paintingResourceMode = ApplyToStrokeMode;
-        paintDecorationWithStyle(context, decoration, fragment, decorationRenderer);
+    for (int i = 0; i < 3; i++) {

[pdr., 2014/04/08 14:20:57]

Question: can we share this with the loop above (in SVGInlineTextBox::paint)?

[fs, 2014/04/08 15:50:24]

No, not as long as the stroke+fill for the decorations (under/overline) should
be painted separately.
(I.e. "fill deco.", "stroke deco.", "fill glyphs", "stroke glyphs" vs. "fill
deco.", "fill glyphs", "stroke deco.", "stroke glyphs")

+        switch (svgDecorationStyle->paintOrderType(i)) {
+        case PT_FILL:
+            if (svgDecorationStyle->hasFill()) {
+                m_paintingResourceMode = ApplyToFillMode;
+                paintDecorationWithStyle(context, decoration, fragment, decorationRenderer);
+            }
+            break;
+        case PT_STROKE:
+            if (svgDecorationStyle->hasVisibleStroke()) {
+                m_paintingResourceMode = ApplyToStrokeMode;
+                paintDecorationWithStyle(context, decoration, fragment, decorationRenderer);
+            }
+            break;
+        case PT_MARKERS:
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+        }
     }
 }
 
 void SVGInlineTextBox::paintDecorationWithStyle(GraphicsContext* context, TextDecoration decoration, const SVGTextFragment& fragment, RenderObject* decorationRenderer)
 {
     ASSERT(!m_paintingResource);
     ASSERT(m_paintingResourceMode != ApplyToDefaultMode);
 
     RenderStyle* decorationStyle = decorationRenderer->style();
     ASSERT(decorationStyle);
@@ skipping 223 matching lines @@
                 renderer().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
                 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, locationInContainer, rect))
                     return true;
              }
         }
     }
     return false;
 }
 
 } // namespace WebCore