Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / svg / SVGFEMergeNodeElement.cpp

diff --git a/src/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp
index 648f22e..45e5b9b 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp
+++ b/src/third_party/WebKit/Source/core/svg/SVGFEMergeNodeElement.cpp
@@ -22,30 +22,28 @@
 
 #include "core/svg/SVGFEMergeNodeElement.h"
 
-#include "SVGNames.h"
 #include "core/svg/SVGElementInstance.h"
 #include "core/svg/SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore {
 
 // Animated property definitions
-DEFINE_ANIMATED_STRING(SVGFEMergeNodeElement, SVGNames::inAttr, In1, in1)
 
 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEMergeNodeElement)
-    REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
 END_REGISTER_ANIMATED_PROPERTIES
 
-inline SVGFEMergeNodeElement::SVGFEMergeNodeElement(const QualifiedName& tagName, Document& document)
-    : SVGElement(tagName, document)
+inline SVGFEMergeNodeElement::SVGFEMergeNodeElement(Document& document)
+    : SVGElement(SVGNames::feMergeNodeTag, document)
+    , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create()))
 {
-    ASSERT(hasTagName(SVGNames::feMergeNodeTag));
     ScriptWrappable::init(this);
+    addToPropertyMap(m_in1);
     registerAnimatedPropertiesForSVGFEMergeNodeElement();
 }
 
-PassRefPtr<SVGFEMergeNodeElement> SVGFEMergeNodeElement::create(const QualifiedName& tagName, Document& document)
+PassRefPtr<SVGFEMergeNodeElement> SVGFEMergeNodeElement::create(Document& document)
 {
-    return adoptRef(new SVGFEMergeNodeElement(tagName, document));
+    return adoptRef(new SVGFEMergeNodeElement(document));
 }
 
 bool SVGFEMergeNodeElement::isSupportedAttribute(const QualifiedName& attrName)
@@ -63,12 +61,14 @@ void SVGFEMergeNodeElement::parseAttribute(const QualifiedName& name, const Atom
         return;
     }
 
-    if (name == SVGNames::inAttr) {
-        setIn1BaseValue(value);
-        return;
-    }
+    SVGParsingError parseError = NoError;
 
-    ASSERT_NOT_REACHED();
+    if (name == SVGNames::inAttr)
+        m_in1->setBaseValueAsString(value, parseError);
+    else
+        ASSERT_NOT_REACHED();
+
+    reportAttributeParsingError(parseError, name, value);
 }
 
 void SVGFEMergeNodeElement::svgAttributeChanged(const QualifiedName& attrName)