Explicitly use SkPaint(s) in SVGInlineTextBoxPainter

Source/core/layout/svg/SVGLayoutSupport.h

 /**
  * Copyright (C) 2007 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) 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGLayoutSupport_h
 #define SVGLayoutSupport_h
 
-#include "core/layout/svg/LayoutSVGResourcePaintServer.h"
+#include "core/layout/LayoutObject.h"
+#include "core/style/SVGComputedStyleDefs.h"
 #include "platform/graphics/DashArray.h"
 
 namespace blink {
 
 class AffineTransform;
 class FloatPoint;
 class FloatRect;
-class GraphicsContext;
-class GraphicsContextStateSaver;
 class PaintInvalidationState;
 class LayoutRect;
-struct PaintInfo;
 class LayoutGeometryMap;
 class LayoutBoxModelObject;
 class LayoutObject;
 class ComputedStyle;
 class LayoutSVGRoot;
 class SVGLengthContext;
 class StrokeData;
 class TransformState;
 
 class SVGLayoutSupport {
@@ skipping 23 matching lines @@
 
     static void computeContainerBoundingBoxes(const LayoutObject* container, FloatRect& objectBoundingBox, bool& objectBoundingBoxValid, FloatRect& strokeBoundingBox, FloatRect& paintInvalidationBoundingBox);
 
     // Important functions used by nearly all SVG layoutObjects centralizing coordinate transformations / paint invalidation rect calculations
     static LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutObject*, const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState*);
     static const LayoutSVGRoot& mapRectToSVGRootForPaintInvalidation(const LayoutObject*, const FloatRect& localPaintInvalidationRect, LayoutRect&);
     static void mapLocalToContainer(const LayoutObject*, const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, bool* wasFixed = 0, const PaintInvalidationState* = 0);
     static const LayoutObject* pushMappingToContainer(const LayoutObject*, const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&);
 
     // Shared between SVG layoutObjects and resources.
-    static void applyStrokeStyleToContext(GraphicsContext&, const ComputedStyle&, const LayoutObject&);
     static void applyStrokeStyleToStrokeData(StrokeData&, const ComputedStyle&, const LayoutObject&);
 
     static DashArray resolveSVGDashArray(const SVGDashArray&, const ComputedStyle&, const SVGLengthContext&);
 
-    // Update the GC state (on |paintInfo.context|) for painting |layoutObject|
-    // using |style|. |resourceMode| is used to decide between fill/stroke.
-    // Previous state will be saved (if needed) using |stateSaver|.
-    static bool updateGraphicsContext(const PaintInfo&, GraphicsContextStateSaver&, const ComputedStyle&, LayoutObject&, LayoutSVGResourceMode, const AffineTransform* additionalPaintServerTransform = 0);
-
     // Determines if any ancestor's transform has changed.
     static bool transformToRootChanged(LayoutObject*);
 
     // FIXME: These methods do not belong here.
     static const LayoutSVGRoot* findTreeRootObject(const LayoutObject*);
 
     // Helper method for determining if a LayoutObject marked as text (isText()== true)
     // can/will be laid out as part of a <text>.
     static bool isLayoutableTextNode(const LayoutObject*);
 
@@ skipping 28 matching lines @@
             return true;
         if (child->hasNonIsolatedBlendingDescendants() && !willIsolateBlendingDescendantsForObject(child))
             return true;
     }
     return false;
 }
 
 } // namespace blink
 
 #endif // SVGLayoutSupport_h