Explicitly use SkPaint(s) in SVGInlineTextBoxPainter

Source/core/paint/SVGShapePainter.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/SVGShapePainter.h"
 
 #include "core/layout/PaintInfo.h"
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
@@ skipping 17 matching lines @@
 static bool setupNonScalingStrokeContext(AffineTransform& strokeTransform, GraphicsContextStateSaver& stateSaver)
 {
     if (!strokeTransform.isInvertible())
         return false;
 
     stateSaver.save();
     stateSaver.context()->concatCTM(strokeTransform.inverse());
     return true;
 }
 
-static bool paintForLayoutObject(const PaintInfo& paintInfo, const ComputedStyle& style, LayoutObject& layoutObject, LayoutSVGResourceMode resourceMode, SkPaint& paint, const AffineTransform* additionalPaintServerTransform = nullptr)
-{
-    if (paintInfo.isRenderingClipPathAsMaskImage()) {
-        if (resourceMode == ApplyToStrokeMode)
-            return false;
-        paint.setColor(SVGComputedStyle::initialFillPaintColor().rgb());
-        paint.setShader(nullptr);
-        return true;
-    }
-
-    SVGPaintServer paintServer = SVGPaintServer::requestForLayoutObject(layoutObject, style, resourceMode);
-    if (!paintServer.isValid())
-        return false;
-
-    if (additionalPaintServerTransform && paintServer.isTransformDependent())
-        paintServer.prependTransform(*additionalPaintServerTransform);
-
-    const SVGComputedStyle& svgStyle = style.svgStyle();
-    float paintAlpha = resourceMode == ApplyToFillMode ? svgStyle.fillOpacity() : svgStyle.strokeOpacity();
-    paintServer.applyToSkPaint(paint, paintAlpha);
-
-    paint.setFilterQuality(WebCoreInterpolationQualityToSkFilterQuality(InterpolationDefault));
-
-    // TODO(fs): The color filter can set when generating a picture for a mask -
-    // due to color-interpolation. We could also just apply the
-    // color-interpolation property from the the shape itself (which could mean
-    // the paintserver if it has it specified), since that would be more in line
-    // with the spec for color-interpolation. For now, just steal it from the GC
-    // though.
-    // Additionally, it's not really safe/guaranteed to be correct, as
-    // something down the paint pipe may want to farther tweak the color
-    // filter, which could yield incorrect results. (Consider just using
-    // saveLayer() w/ this color filter explicitly instead.)
-    paint.setColorFilter(paintInfo.context->colorFilter());
-    return true;
-}
-
 static SkPath::FillType fillRuleFromStyle(const PaintInfo& paintInfo, const SVGComputedStyle& svgStyle)
 {
     return WebCoreWindRuleToSkFillType(paintInfo.isRenderingClipPathAsMaskImage() ? svgStyle.clipRule() : svgStyle.fillRule());
 }
 
 void SVGShapePainter::paint(const PaintInfo& paintInfo)
 {
     ANNOTATE_GRAPHICS_CONTEXT(paintInfo, &m_renderSVGShape);
     if (paintInfo.phase != PaintPhaseForeground
         || m_renderSVGShape.style()->visibility() == HIDDEN
@@ skipping 10 matching lines @@
             LayoutObjectDrawingRecorder recorder(*paintContext.paintInfo().context, m_renderSVGShape, paintContext.paintInfo().phase, boundingBox);
             if (!recorder.canUseCachedDrawing()) {
                 const SVGComputedStyle& svgStyle = m_renderSVGShape.style()->svgStyle();
 
                 bool shouldAntiAlias = svgStyle.shapeRendering() != SR_CRISPEDGES;
 
                 for (int i = 0; i < 3; i++) {
                     switch (svgStyle.paintOrderType(i)) {
                     case PT_FILL: {
                         SkPaint fillPaint;
-                        if (!paintForLayoutObject(paintContext.paintInfo(), m_renderSVGShape.styleRef(), m_renderSVGShape, ApplyToFillMode, fillPaint))
+                        if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_renderSVGShape.styleRef(), m_renderSVGShape, ApplyToFillMode, fillPaint))
                             break;
                         fillPaint.setAntiAlias(shouldAntiAlias);
                         fillShape(paintContext.paintInfo().context, fillPaint, fillRuleFromStyle(paintContext.paintInfo(), svgStyle));
                         break;
                     }
                     case PT_STROKE:
                         if (svgStyle.hasVisibleStroke()) {
                             GraphicsContextStateSaver stateSaver(*paintContext.paintInfo().context, false);
                             AffineTransform nonScalingTransform;
                             const AffineTransform* additionalPaintServerTransform = 0;
 
                             if (m_renderSVGShape.hasNonScalingStroke()) {
                                 nonScalingTransform = m_renderSVGShape.nonScalingStrokeTransform();
                                 if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
                                     return;
 
                                 // Non-scaling stroke needs to reset the transform back to the host transform.
                                 additionalPaintServerTransform = &nonScalingTransform;
                             }
 
                             SkPaint strokePaint;
-                            if (!paintForLayoutObject(paintContext.paintInfo(), m_renderSVGShape.styleRef(), m_renderSVGShape, ApplyToStrokeMode, strokePaint, additionalPaintServerTransform))
+                            if (!SVGPaintContext::paintForLayoutObject(paintContext.paintInfo(), m_renderSVGShape.styleRef(), m_renderSVGShape, ApplyToStrokeMode, strokePaint, additionalPaintServerTransform))
                                 break;
                             strokePaint.setAntiAlias(shouldAntiAlias);
 
                             StrokeData strokeData;
                             SVGLayoutSupport::applyStrokeStyleToStrokeData(strokeData, m_renderSVGShape.styleRef(), m_renderSVGShape);
                             strokeData.setupPaint(&strokePaint);
 
                             strokeShape(paintContext.paintInfo().context, strokePaint);
                         }
                         break;
@@ skipping 146 matching lines @@
         // This open-codes LayoutSVGShape::nonScalingStrokePath, because the
         // requirements here differ (we have a temporary path that we can
         // mutate.)
         if (m_renderSVGShape.hasNonScalingStroke())
             tempPath.transform(nonScalingTransform);
         context->drawPath(tempPath.skPath(), fillPaint);
     }
 }
 
 } // namespace blink