diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/svg/SVGAnimatedEnumeration.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedEnumeration.cpp')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedEnumeration.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedEnumeration.cpp b/Source/WebCore/svg/SVGAnimatedEnumeration.cpp index b861b6033..819d257e6 100644 --- a/Source/WebCore/svg/SVGAnimatedEnumeration.cpp +++ b/Source/WebCore/svg/SVGAnimatedEnumeration.cpp @@ -18,8 +18,6 @@ */ #include "config.h" - -#if ENABLE(SVG) #include "SVGAnimatedEnumeration.h" #include "SVGAnimationElement.h" @@ -64,7 +62,6 @@ static inline unsigned enumerationValueForTargetAttribute(SVGElement* targetElem if (attrName == SVGNames::spreadMethodAttr) return SVGPropertyTraits<SVGSpreadMethodType>::fromString(value); -#if ENABLE(FILTERS) if (attrName == SVGNames::edgeModeAttr) return SVGPropertyTraits<EdgeModeType>::fromString(value); @@ -88,15 +85,17 @@ static inline unsigned enumerationValueForTargetAttribute(SVGElement* targetElem return SVGPropertyTraits<ComponentTransferType>::fromString(value); } - if (attrName == SVGNames::modeAttr) - return SVGPropertyTraits<BlendModeType>::fromString(value); + if (attrName == SVGNames::modeAttr) { + BlendMode mode = BlendModeNormal; + parseBlendMode(value, mode); + return mode; + } if (attrName == SVGNames::stitchTilesAttr) return SVGPropertyTraits<SVGStitchOptions>::fromString(value); if (attrName == SVGNames::xChannelSelectorAttr) return SVGPropertyTraits<ChannelSelectorType>::fromString(value); if (attrName == SVGNames::yChannelSelectorAttr) return SVGPropertyTraits<ChannelSelectorType>::fromString(value); -#endif ASSERT_NOT_REACHED(); return 0; @@ -125,7 +124,7 @@ void SVGAnimatedEnumerationAnimator::stopAnimValAnimation(const SVGElementAnimat stopAnimValAnimationForType<SVGAnimatedEnumeration>(animatedTypes); } -void SVGAnimatedEnumerationAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType* type) +void SVGAnimatedEnumerationAnimator::resetAnimValToBaseVal(const SVGElementAnimatedPropertyList& animatedTypes, SVGAnimatedType& type) { resetFromBaseValue<SVGAnimatedEnumeration>(animatedTypes, type, &SVGAnimatedType::enumeration); } @@ -164,5 +163,3 @@ float SVGAnimatedEnumerationAnimator::calculateDistance(const String&, const Str } } - -#endif // ENABLE(SVG) |