X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fsvg%2FSVGMPathElement.cpp;h=155f96b6fade3b3d583588da2eb5e1b55bbf7d8f;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=8fb5460edd357d6103e1b69d5d59a437d2fb826c;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp index 8fb5460..155f96b 100644 --- a/src/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp +++ b/src/third_party/WebKit/Source/core/svg/SVGMPathElement.cpp @@ -30,14 +30,13 @@ namespace WebCore { // Animated property definitions -DEFINE_ANIMATED_STRING(SVGMPathElement, XLinkNames::hrefAttr, Href, href) BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGMPathElement) - REGISTER_LOCAL_ANIMATED_PROPERTY(href) END_REGISTER_ANIMATED_PROPERTIES inline SVGMPathElement::SVGMPathElement(Document& document) : SVGElement(SVGNames::mpathTag, document) + , SVGURIReference(this) { ScriptWrappable::init(this); registerAnimatedPropertiesForSVGMPathElement(); @@ -60,7 +59,7 @@ void SVGMPathElement::buildPendingResource() return; AtomicString id; - Element* target = SVGURIReference::targetElementFromIRIString(hrefCurrentValue(), document(), &id); + Element* target = SVGURIReference::targetElementFromIRIString(hrefString(), document(), &id); if (!target) { // Do not register as pending if we are already pending this resource. if (document().accessSVGExtensions()->isElementPendingResource(this, id)) @@ -111,15 +110,16 @@ bool SVGMPathElement::isSupportedAttribute(const QualifiedName& attrName) void SVGMPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value) { + SVGParsingError parseError = NoError; + if (!isSupportedAttribute(name)) { SVGElement::parseAttribute(name, value); - return; + } else if (SVGURIReference::parseAttribute(name, value, parseError)) { + } else { + ASSERT_NOT_REACHED(); } - if (SVGURIReference::parseAttribute(name, value)) - return; - - ASSERT_NOT_REACHED(); + reportAttributeParsingError(parseError, name, value); } void SVGMPathElement::svgAttributeChanged(const QualifiedName& attrName) @@ -141,7 +141,7 @@ void SVGMPathElement::svgAttributeChanged(const QualifiedName& attrName) SVGPathElement* SVGMPathElement::pathElement() { - Element* target = targetElementFromIRIString(hrefCurrentValue(), document()); + Element* target = targetElementFromIRIString(hrefString(), document()); if (target && target->hasTagName(SVGNames::pathTag)) return toSVGPathElement(target); return 0;