Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1432)

Unified Diff: Source/core/rendering/svg/SVGRenderSupport.cpp

Issue 900463002: Make SVG painting independent of GraphicsContext's alpha state (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/SVGRenderSupport.cpp
diff --git a/Source/core/rendering/svg/SVGRenderSupport.cpp b/Source/core/rendering/svg/SVGRenderSupport.cpp
index dab8321b6a31d2fe7dd1c161b14806576053713d..98b2515f0bc19a8f69420c6122ca85e791ffdee0 100644
--- a/Source/core/rendering/svg/SVGRenderSupport.cpp
+++ b/Source/core/rendering/svg/SVGRenderSupport.cpp
@@ -409,7 +409,6 @@ bool SVGRenderSupport::updateGraphicsContext(const PaintInfo& paintInfo, Graphic
if (paintInfo.isRenderingClipPathAsMaskImage()) {
if (resourceMode == ApplyToStrokeMode)
return false;
- context->setAlphaAsFloat(1);
context->setFillColor(SVGRenderStyle::initialFillPaintColor());
return true;
}
@@ -421,17 +420,14 @@ bool SVGRenderSupport::updateGraphicsContext(const PaintInfo& paintInfo, Graphic
if (additionalPaintServerTransform && paintServer.isTransformDependent())
paintServer.prependTransform(*additionalPaintServerTransform);
- paintServer.apply(*context, resourceMode, &stateSaver);
-
const SVGRenderStyle& svgStyle = style->svgStyle();
+ paintServer.apply(*context, resourceMode, svgStyle, stateSaver);
- if (resourceMode == ApplyToFillMode) {
- context->setAlphaAsFloat(svgStyle.fillOpacity());
+ if (resourceMode == ApplyToFillMode)
context->setFillRule(svgStyle.fillRule());
- } else {
- context->setAlphaAsFloat(svgStyle.strokeOpacity());
+ else
applyStrokeStyleToContext(context, style, &renderer);
- }
+
return true;
}

Powered by Google App Engine
This is Rietveld 408576698