Explicitly use SkPaint(s) in SVGShapePainter

Source/core/layout/svg/LayoutSVGResourcePaintServer.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.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 10 matching lines @@
  */
 
 #include "config.h"
 #include "core/layout/svg/LayoutSVGResourcePaintServer.h"
 
 #include "core/style/ComputedStyle.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
+#include "third_party/skia/include/core/SkPaint.h"
 
 namespace blink {
 
 SVGPaintServer::SVGPaintServer(Color color)
     : m_color(color)
 {
 }
 
 SVGPaintServer::SVGPaintServer(PassRefPtr<Gradient> gradient)
     : m_gradient(gradient)
     , m_color(Color::black)
 {
 }
 
 SVGPaintServer::SVGPaintServer(PassRefPtr<Pattern> pattern)
     : m_pattern(pattern)
     , m_color(Color::black)
 {
 }
 
+void SVGPaintServer::transferToSkPaint(SkPaint& paint, float paintAlpha)

[f(malita), 2015/04/02 15:51:12]

Naming nit: applyToSkPaint maybe? ("transfer" sounds like it may invalidate the
current object).

[fs, 2015/04/07 12:03:56]

Done.

+{
+    SkColor baseColor = m_gradient || m_pattern ? SK_ColorBLACK : m_color.rgb();
+    paint.setColor(scaleAlpha(baseColor, paintAlpha));
+    if (m_pattern)
+        paint.setShader(m_pattern->shader());
+    else if (m_gradient)
+        paint.setShader(m_gradient->shader());
+    else
+        paint.setShader(nullptr);
+}
+
 void SVGPaintServer::apply(GraphicsContext& context, LayoutSVGResourceMode resourceMode, float paintAlpha, GraphicsContextStateSaver& stateSaver)
 {
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     if (m_gradient || m_pattern)
         stateSaver.saveIfNeeded();
 
     if (resourceMode == ApplyToFillMode) {
         if (m_pattern)
             context.setFillPattern(m_pattern, paintAlpha);
@@ skipping 122 matching lines @@
 LayoutSVGResourcePaintServer::~LayoutSVGResourcePaintServer()
 {
 }
 
 SVGPaintDescription LayoutSVGResourcePaintServer::requestPaintDescription(const LayoutObject& layoutObject, const ComputedStyle& style, LayoutSVGResourceMode resourceMode)
 {
     return requestPaint(layoutObject, style, resourceMode);
 }
 
 }