Explicitly use SkPaint(s) in SVGInlineTextBoxPainter

Source/core/layout/svg/SVGLayoutSupport.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-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
@@ skipping 338 matching lines @@
 }
 
 DashArray SVGLayoutSupport::resolveSVGDashArray(const SVGDashArray& svgDashArray, const ComputedStyle& style, const SVGLengthContext& lengthContext)
 {
     DashArray dashArray;
     for (const Length& dashLength : svgDashArray.vector())
         dashArray.append(lengthContext.valueForLength(dashLength, style));
     return dashArray;
 }
 
-void SVGLayoutSupport::applyStrokeStyleToContext(GraphicsContext& context, const ComputedStyle& style, const LayoutObject& object)
-{
-    ASSERT(object.node());
-    ASSERT(object.node()->isSVGElement());
-
-    const SVGComputedStyle& svgStyle = style.svgStyle();
-
-    SVGLengthContext lengthContext(toSVGElement(object.node()));
-    context.setStrokeThickness(lengthContext.valueForLength(svgStyle.strokeWidth()));
-    context.setLineCap(svgStyle.capStyle());
-    context.setLineJoin(svgStyle.joinStyle());
-    context.setMiterLimit(svgStyle.strokeMiterLimit());
-
-    DashArray dashArray = resolveSVGDashArray(*svgStyle.strokeDashArray(), style, lengthContext);
-    context.setLineDash(dashArray, lengthContext.valueForLength(svgStyle.strokeDashOffset(), style));
-}
-
 void SVGLayoutSupport::applyStrokeStyleToStrokeData(StrokeData& strokeData, const ComputedStyle& style, const LayoutObject& object)
 {
     ASSERT(object.node());
     ASSERT(object.node()->isSVGElement());
 
     const SVGComputedStyle& svgStyle = style.svgStyle();
 
     SVGLengthContext lengthContext(toSVGElement(object.node()));
     strokeData.setThickness(lengthContext.valueForLength(svgStyle.strokeWidth()));
     strokeData.setLineCap(svgStyle.capStyle());
     strokeData.setLineJoin(svgStyle.joinStyle());
     strokeData.setMiterLimit(svgStyle.strokeMiterLimit());
 
     DashArray dashArray = resolveSVGDashArray(*svgStyle.strokeDashArray(), style, lengthContext);
     strokeData.setLineDash(dashArray, lengthContext.valueForLength(svgStyle.strokeDashOffset(), style));
 }
 
-bool SVGLayoutSupport::updateGraphicsContext(const PaintInfo& paintInfo, GraphicsContextStateSaver& stateSaver, const ComputedStyle& style, LayoutObject& layoutObject, LayoutSVGResourceMode resourceMode, const AffineTransform* additionalPaintServerTransform)
-{
-    ASSERT(paintInfo.context == stateSaver.context());
-
-    GraphicsContext& context = *paintInfo.context;
-    if (paintInfo.isRenderingClipPathAsMaskImage()) {
-        if (resourceMode == ApplyToStrokeMode)
-            return false;
-        context.setFillColor(SVGComputedStyle::initialFillPaintColor());
-        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.apply(context, resourceMode, paintAlpha, stateSaver);
-
-    if (resourceMode == ApplyToFillMode)
-        context.setFillRule(svgStyle.fillRule());
-    else
-        applyStrokeStyleToContext(context, style, layoutObject);
-
-    return true;
-}
-
 bool SVGLayoutSupport::isLayoutableTextNode(const LayoutObject* object)
 {
     ASSERT(object->isText());
     // <br> is marked as text, but is not handled by the SVG layout code-path.
     return object->isSVGInlineText() && !toLayoutSVGInlineText(object)->hasEmptyText();
 }
 
 bool SVGLayoutSupport::willIsolateBlendingDescendantsForStyle(const ComputedStyle& style)
 {
     const SVGComputedStyle& svgStyle = style.svgStyle();
@@ skipping 70 matching lines @@
 
         layer = layer->parent();
     }
 
     ctm.scale(deviceScaleFactor);
 
     return narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
 }
 
 }