Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
index fcc0763..cae6667 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
+++ b/src/third_party/WebKit/Source/core/svg/SVGTextContentElement.cpp
@@ -31,7 +31,6 @@
 #include "core/editing/FrameSelection.h"
 #include "core/frame/LocalFrame.h"
 #include "core/rendering/RenderObject.h"
-#include "core/rendering/svg/RenderSVGResource.h"
 #include "core/rendering/svg/SVGTextQuery.h"
 
 namespace blink {
@@ -48,14 +47,14 @@ template<> const SVGEnumerationStringEntries& getStaticStringEntries<SVGLengthAd
 
 // SVGTextContentElement's 'textLength' attribute needs special handling.
 // It should return getComputedTextLength() when textLength is not specified manually.
-class SVGAnimatedTextLength FINAL : public SVGAnimatedLength {
+class SVGAnimatedTextLength final : public SVGAnimatedLength {
 public:
     static PassRefPtr<SVGAnimatedTextLength> create(SVGTextContentElement* contextElement)
     {
         return adoptRef(new SVGAnimatedTextLength(contextElement));
     }
 
-    virtual SVGLengthTearOff* baseVal() OVERRIDE
+    virtual SVGLengthTearOff* baseVal() override
     {
         SVGTextContentElement* textContentElement = toSVGTextContentElement(contextElement());
         if (!textContentElement->textLengthIsSpecifiedByUser())
@@ -227,19 +226,7 @@ void SVGTextContentElement::collectStyleForPresentationAttribute(const Qualified
 
 void SVGTextContentElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    SVGParsingError parseError = NoError;
-
-    if (!isSupportedAttribute(name))
-        SVGGraphicsElement::parseAttribute(name, value);
-    else if (name == SVGNames::lengthAdjustAttr) {
-        m_lengthAdjust->setBaseValueAsString(value, parseError);
-    } else if (name == SVGNames::textLengthAttr) {
-        m_textLength->setBaseValueAsString(value, parseError);
-    } else if (name.matches(XMLNames::spaceAttr)) {
-    } else
-        ASSERT_NOT_REACHED();
-
-    reportAttributeParsingError(parseError, name, value);
+    parseAttributeNew(name, value);
 }
 
 void SVGTextContentElement::svgAttributeChanged(const QualifiedName& attrName)
@@ -255,7 +242,7 @@ void SVGTextContentElement::svgAttributeChanged(const QualifiedName& attrName)
     SVGElement::InvalidationGuard invalidationGuard(this);
 
     if (RenderObject* renderer = this->renderer())
-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
+        markForLayoutAndParentResourceInvalidation(renderer);
 }
 
 bool SVGTextContentElement::selfHasRelativeLengths() const