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

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

Issue 571923002: Move geometry generation out of RenderSVGResource*::postApplyResource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop curly braces. Created 6 years, 3 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/RenderSVGShape.cpp
diff --git a/Source/core/rendering/svg/RenderSVGShape.cpp b/Source/core/rendering/svg/RenderSVGShape.cpp
index 9084bbedd45ea5f391be682e4d9fd39897323805..b130070f74fc44d3540acaaad2d71745985af707 100644
--- a/Source/core/rendering/svg/RenderSVGShape.cpp
+++ b/Source/core/rendering/svg/RenderSVGShape.cpp
@@ -205,11 +205,14 @@ void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
bool hasFallback;
if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(this, style, hasFallback)) {
if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode)) {
- fillPaintingResource->postApplyResource(this, context, ApplyToFillMode, 0, this);
+ fillShape(context);
+ fillPaintingResource->postApplyResource(this, context);
} else if (hasFallback) {
RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
- if (fallbackResource->applyResource(this, style, context, ApplyToFillMode))
- fallbackResource->postApplyResource(this, context, ApplyToFillMode, 0, this);
+ if (fallbackResource->applyResource(this, style, context, ApplyToFillMode)) {
+ fillShape(context);
+ fallbackResource->postApplyResource(this, context);
+ }
}
}
}
@@ -219,11 +222,14 @@ void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
bool hasFallback;
if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style, hasFallback)) {
if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode)) {
- strokePaintingResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
+ strokeShape(context);
+ strokePaintingResource->postApplyResource(this, context);
} else if (hasFallback) {
RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
- if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode))
- fallbackResource->postApplyResource(this, context, ApplyToStrokeMode, 0, this);
+ if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode)) {
+ strokeShape(context);
+ fallbackResource->postApplyResource(this, context);
+ }
}
}
}
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceSolidColor.cpp ('k') | Source/core/rendering/svg/SVGInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698