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

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

Issue 577583002: Drop RenderSVGResource::{fill,stroke}PaintingResource shims (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResource.h ('k') | Source/core/rendering/svg/SVGInlineTextBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGShape.cpp
diff --git a/Source/core/rendering/svg/RenderSVGShape.cpp b/Source/core/rendering/svg/RenderSVGShape.cpp
index b130070f74fc44d3540acaaad2d71745985af707..5808cd44716e3d299ae62c22813f537934a94ff3 100644
--- a/Source/core/rendering/svg/RenderSVGShape.cpp
+++ b/Source/core/rendering/svg/RenderSVGShape.cpp
@@ -113,7 +113,7 @@ bool RenderSVGShape::fillContains(const FloatPoint& point, bool requiresFill, co
return false;
bool hasFallback;
- if (requiresFill && !RenderSVGResource::fillPaintingResource(this, style(), hasFallback))
+ if (requiresFill && !RenderSVGResource::requestPaintingResource(ApplyToFillMode, this, style(), hasFallback))
return false;
return shapeDependentFillContains(point, fillRule);
@@ -125,7 +125,7 @@ bool RenderSVGShape::strokeContains(const FloatPoint& point, bool requiresStroke
return false;
bool hasFallback;
- if (requiresStroke && !RenderSVGResource::strokePaintingResource(this, style(), hasFallback))
+ if (requiresStroke && !RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, this, style(), hasFallback))
return false;
return shapeDependentStrokeContains(point);
@@ -203,7 +203,7 @@ bool RenderSVGShape::shouldGenerateMarkerPositions() const
void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
{
bool hasFallback;
- if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(this, style, hasFallback)) {
+ if (RenderSVGResource* fillPaintingResource = RenderSVGResource::requestPaintingResource(ApplyToFillMode, this, style, hasFallback)) {
if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode)) {
fillShape(context);
fillPaintingResource->postApplyResource(this, context);
@@ -220,7 +220,7 @@ void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
{
bool hasFallback;
- if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style, hasFallback)) {
+ if (RenderSVGResource* strokePaintingResource = RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, this, style, hasFallback)) {
if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode)) {
strokeShape(context);
strokePaintingResource->postApplyResource(this, context);
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResource.h ('k') | Source/core/rendering/svg/SVGInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698