Prefer using RenderSVGResourceMode when possible

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 91 matching lines @@
             paintDecoration(paintInfo.context, TextDecorationUnderline, fragment);
         if (decorations & TextDecorationOverline)
             paintDecoration(paintInfo.context, TextDecorationOverline, fragment);
 
         for (int i = 0; i < 3; i++) {
             switch (svgStyle.paintOrderType(i)) {
             case PT_FILL:
                 // Fill text
                 if (hasFill) {
                     paintText(paintInfo.context, style, selectionStyle, fragment,
-                        ApplyToFillMode | ApplyToTextMode, hasSelection, paintSelectedTextOnly);
+                        ApplyToFillMode, hasSelection, paintSelectedTextOnly);
                 }
                 break;
             case PT_STROKE:
                 // Stroke text
                 if (hasVisibleStroke) {
                     paintText(paintInfo.context, style, selectionStyle, fragment,
-                        ApplyToStrokeMode | ApplyToTextMode, hasSelection, paintSelectedTextOnly);
+                        ApplyToStrokeMode, hasSelection, paintSelectedTextOnly);
                 }
                 break;
             case PT_MARKERS:
                 // Markers don't apply to text
                 break;
             default:
                 ASSERT_NOT_REACHED();
                 break;
             }
         }
@@ skipping 170 matching lines @@
 }
 
 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, RenderSVGResourceModeFlags resourceMode)
+    const SVGTextFragment& fragment, RenderObject* decorationRenderer, RenderSVGResourceMode resourceMode)
 {
     RenderStyle* decorationStyle = decorationRenderer->style();
     ASSERT(decorationStyle);
 
     float scalingFactor = 1;
     Font scaledFont;
     RenderSVGInlineText::computeNewScaledFontForStyle(decorationRenderer, decorationStyle, scalingFactor, scaledFont);
     ASSERT(scalingFactor);
 
     float thickness = thicknessForDecoration(decoration, scaledFont);
 
     if (fragment.width <= 0 && 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)));
 
     PaintingResourceScope resourceScope(*decorationRenderer);
     if (resourceScope.acquirePaintingResource(context, decorationStyle, resourceMode)) {
         SVGRenderSupport::fillOrStrokePath(context, resourceMode, path);
         resourceScope.releasePaintingResource(context);
     }
 }
 
 void SVGInlineTextBoxPainter::paintTextWithShadows(GraphicsContext* context, RenderStyle* style,
     TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition,
-    RenderSVGResourceModeFlags resourceMode)
+    RenderSVGResourceMode resourceMode)
 {
     RenderSVGInlineText& textRenderer = toRenderSVGInlineText(m_svgInlineTextBox.renderer());
 
     float scalingFactor = textRenderer.scalingFactor();
     ASSERT(scalingFactor);
 
     const Font& scaledFont = textRenderer.scaledFont();
     const ShadowList* shadowList = style->textShadow();
 
     // Text shadows are disabled when printing. http://crbug.com/258321
     bool hasShadow = shadowList && !context->printing();
 
     FloatPoint textOrigin(fragment.x, fragment.y);
     FloatSize textSize(fragment.width, fragment.height);
 
     if (scalingFactor != 1) {
         textOrigin.scale(scalingFactor, scalingFactor);
         textSize.scale(scalingFactor);
         context->save();
         context->scale(1 / scalingFactor, 1 / scalingFactor);
     }
 
     if (hasShadow)
         context->setDrawLooper(shadowList->createDrawLooper(DrawLooperBuilder::ShadowRespectsAlpha));
 
     PaintingResourceScope resourceScope(m_svgInlineTextBox.parent()->renderer());
-    if (resourceScope.acquirePaintingResource(context, style, resourceMode)) {
-        if (scalingFactor != 1 && resourceMode & ApplyToStrokeMode)
+    if (resourceScope.acquirePaintingResource(context, style, resourceMode | ApplyToTextMode)) {
+        context->setTextDrawingMode(resourceMode == ApplyToFillMode ? TextModeFill : TextModeStroke);
+
+        if (scalingFactor != 1 && resourceMode == ApplyToStrokeMode)
             context->setStrokeThickness(context->strokeThickness() * scalingFactor);
 
         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);
     }
 
     if (scalingFactor != 1)
         context->restore();
     else if (hasShadow)
         context->clearShadow();
 }
 
 void SVGInlineTextBoxPainter::paintText(GraphicsContext* context, RenderStyle* style,
     RenderStyle* selectionStyle, const SVGTextFragment& fragment,
-    RenderSVGResourceModeFlags resourceMode, bool hasSelection, bool paintSelectedTextOnly)
+    RenderSVGResourceMode resourceMode, bool hasSelection, bool paintSelectedTextOnly)
 {
     ASSERT(style);
     ASSERT(selectionStyle);
 
     int startPosition = 0;
     int endPosition = 0;
     if (hasSelection) {
         m_svgInlineTextBox.selectionStartEnd(startPosition, endPosition);
         hasSelection = m_svgInlineTextBox.mapStartEndPositionsIntoFragmentCoordinates(fragment, startPosition, endPosition);
     }
@@ skipping 78 matching lines @@
 
             fragmentRect = fragmentTransform.mapRect(fragmentRect);
             markerRect.unite(fragmentRect);
         }
     }
 
     toRenderedDocumentMarker(marker)->setRenderedRect(textRenderer.localToAbsoluteQuad(markerRect).enclosingBoundingBox());
 }
 
 } // namespace blink