Make SVG painting independent of GraphicsContext's alpha state

Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp

Index: Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp
diff --git a/Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp b/Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp
index 9feff75bff1f687567e51c42f89eb64a0ddc3146..a4adbc36639fcff2a2adecdbb02f88cf8d740cf4 100644
--- a/Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp
+++ b/Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp
@@ -48,26 +48,27 @@ SVGPaintServer::SVGPaintServer(PassRefPtr<Pattern> pattern)
 {
 }
 
-void SVGPaintServer::apply(GraphicsContext& context, RenderSVGResourceMode resourceMode, GraphicsContextStateSaver* stateSaver)
+void SVGPaintServer::apply(GraphicsContext& context, RenderSVGResourceMode resourceMode, const SVGRenderStyle& svgStyle, GraphicsContextStateSaver& stateSaver)

[fs, 2015/02/03 10:08:49]

According to my doctrine this would rather be 'float paintAlpha' or some such.
(And I do find having to pass RenderSVGResourceMode here at all a bit of a
nuisance...)
(Only to consider if you do end up making other changes anyway though...)

[pdr., 2015/02/04 04:04:31]

Done

 {
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
-    if (stateSaver && (m_gradient || m_pattern))
-        stateSaver->saveIfNeeded();
+
+    if (m_gradient || m_pattern)
+        stateSaver.saveIfNeeded();
 
     if (resourceMode == ApplyToFillMode) {
         if (m_pattern)
-            context.setFillPattern(m_pattern);
+            context.setFillPattern(m_pattern, svgStyle.fillOpacity());
         else if (m_gradient)
-            context.setFillGradient(m_gradient);
+            context.setFillGradient(m_gradient, svgStyle.fillOpacity());
         else
-            context.setFillColor(m_color);
+            context.setFillColor(GraphicsContext::combineWithAlpha(m_color.rgb(), svgStyle.fillOpacity()));

[f(malita), 2015/02/03 00:33:28]

Implicit SkColor -> Color conversion seems fragile. OTOH this is probably not
the only place where we do this. Methinks Color needs to die a quick death.

[pdr., 2015/02/04 04:04:31]

+1

     } else {
         if (m_pattern)
-            context.setStrokePattern(m_pattern);
+            context.setStrokePattern(m_pattern, svgStyle.strokeOpacity());
         else if (m_gradient)
-            context.setStrokeGradient(m_gradient);
+            context.setStrokeGradient(m_gradient, svgStyle.strokeOpacity());
         else
-            context.setStrokeColor(m_color);
+            context.setStrokeColor(GraphicsContext::combineWithAlpha(m_color.rgb(), svgStyle.strokeOpacity()));
     }
 }