Make SVG painting independent of GraphicsContext's alpha state

Source/core/rendering/svg/SVGRenderSupport.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 389 matching lines @@
 }
 
 bool SVGRenderSupport::updateGraphicsContext(const PaintInfo& paintInfo, GraphicsContextStateSaver& stateSaver, const RenderStyle& style, RenderObject& renderer, RenderSVGResourceMode resourceMode, const AffineTransform* additionalPaintServerTransform)
 {
     ASSERT(paintInfo.context == stateSaver.context());
 
     GraphicsContext* context = paintInfo.context;
     if (paintInfo.isRenderingClipPathAsMaskImage()) {
         if (resourceMode == ApplyToStrokeMode)
             return false;
-        context->setAlphaAsFloat(1);
         context->setFillColor(SVGRenderStyle::initialFillPaintColor());
         return true;
     }
 
     SVGPaintServer paintServer = SVGPaintServer::requestForRenderer(renderer, style, resourceMode);
     if (!paintServer.isValid())
         return false;
 
     if (additionalPaintServerTransform && paintServer.isTransformDependent())
         paintServer.prependTransform(*additionalPaintServerTransform);
 
-    paintServer.apply(*context, resourceMode, &stateSaver);
+    const SVGRenderStyle& svgStyle = style.svgStyle();
+    float paintAlpha = resourceMode == ApplyToFillMode ? svgStyle.fillOpacity() : svgStyle.strokeOpacity();
+    paintServer.apply(*context, resourceMode, paintAlpha, stateSaver);
 
-    const SVGRenderStyle& svgStyle = style.svgStyle();
+    if (resourceMode == ApplyToFillMode)
+        context->setFillRule(svgStyle.fillRule());
+    else
+        applyStrokeStyleToContext(context, style, &renderer);
 
-    if (resourceMode == ApplyToFillMode) {
-        context->setAlphaAsFloat(svgStyle.fillOpacity());
-        context->setFillRule(svgStyle.fillRule());
-    } else {
-        context->setAlphaAsFloat(svgStyle.strokeOpacity());
-        applyStrokeStyleToContext(context, style, &renderer);
-    }
     return true;
 }
 
 bool SVGRenderSupport::isRenderableTextNode(const RenderObject* object)
 {
     ASSERT(object->isText());
     // <br> is marked as text, but is not handled by the SVG rendering code-path.
     return object->isSVGInlineText() && !toRenderSVGInlineText(object)->hasEmptyText();
 }
 
@@ skipping 14 matching lines @@
         return false;
     return willIsolateBlendingDescendantsForStyle(object->style());
 }
 
 bool SVGRenderSupport::isIsolationRequired(const RenderObject* object)
 {
     return willIsolateBlendingDescendantsForObject(object) && object->hasNonIsolatedBlendingDescendants();
 }
 
 }