| Index: third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
|
| index fad3999c44a71b3044622b7b5f22520979ce797f..331133a05b70386e3d33441c8fc5ab21623daf64 100644
|
| --- a/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp
|
| @@ -48,13 +48,13 @@ class FilterInputKeywords {
|
| return s_sourceAlphaName;
|
| }
|
|
|
| - static const AtomicString& fillPaint() {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, s_fillPaintName, ("FillPaint"));
|
| + static const AtomicString& fillFlags() {
|
| + DEFINE_STATIC_LOCAL(const AtomicString, s_fillPaintName, ("fillFlags"));
|
| return s_fillPaintName;
|
| }
|
|
|
| - static const AtomicString& strokePaint() {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, s_strokePaintName, ("StrokePaint"));
|
| + static const AtomicString& strokeFlags() {
|
| + DEFINE_STATIC_LOCAL(const AtomicString, s_strokePaintName, ("strokeFlags"));
|
| return s_strokePaintName;
|
| }
|
| };
|
| @@ -107,22 +107,24 @@ DEFINE_TRACE(SVGFilterGraphNodeMap) {
|
|
|
| SVGFilterBuilder::SVGFilterBuilder(FilterEffect* sourceGraphic,
|
| SVGFilterGraphNodeMap* nodeMap,
|
| - const PaintFlags* fillPaint,
|
| - const PaintFlags* strokePaint)
|
| + const PaintFlags* fillFlags,
|
| + const PaintFlags* strokeFlags)
|
| : m_nodeMap(nodeMap) {
|
| FilterEffect* sourceGraphicRef = sourceGraphic;
|
| m_builtinEffects.insert(FilterInputKeywords::getSourceGraphic(),
|
| sourceGraphicRef);
|
| m_builtinEffects.insert(FilterInputKeywords::sourceAlpha(),
|
| SourceAlpha::create(sourceGraphicRef));
|
| - if (fillPaint)
|
| + if (fillFlags) {
|
| m_builtinEffects.insert(
|
| - FilterInputKeywords::fillPaint(),
|
| - PaintFilterEffect::create(sourceGraphicRef->getFilter(), *fillPaint));
|
| - if (strokePaint)
|
| + FilterInputKeywords::fillFlags(),
|
| + PaintFilterEffect::create(sourceGraphicRef->getFilter(), *fillFlags));
|
| + }
|
| + if (strokeFlags) {
|
| m_builtinEffects.insert(
|
| - FilterInputKeywords::strokePaint(),
|
| - PaintFilterEffect::create(sourceGraphicRef->getFilter(), *strokePaint));
|
| + FilterInputKeywords::strokeFlags(),
|
| + PaintFilterEffect::create(sourceGraphicRef->getFilter(), *strokeFlags));
|
| + }
|
| addBuiltinEffects();
|
| }
|
|
|
|
|