Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp b/src/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp
index 9e89274..32b6e3b 100644 (file)
--- a/src/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp
+++ b/src/third_party/WebKit/Source/core/svg/SVGTextPositioningElement.cpp
@@ -23,7 +23,6 @@
 #include "core/svg/SVGTextPositioningElement.h"
 
 #include "core/SVGNames.h"
-#include "core/rendering/svg/RenderSVGResource.h"
 #include "core/rendering/svg/RenderSVGText.h"
 #include "core/svg/SVGLengthList.h"
 #include "core/svg/SVGNumberList.h"
@@ -60,27 +59,7 @@ bool SVGTextPositioningElement::isSupportedAttribute(const QualifiedName& attrNa
 
 void SVGTextPositioningElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    if (!isSupportedAttribute(name)) {
-        SVGTextContentElement::parseAttribute(name, value);
-        return;
-    }
-
-    SVGParsingError parseError = NoError;
-
-    if (name == SVGNames::xAttr)
-        m_x->setBaseValueAsString(value, parseError);
-    else if (name == SVGNames::yAttr)
-        m_y->setBaseValueAsString(value, parseError);
-    else if (name == SVGNames::dxAttr)
-        m_dx->setBaseValueAsString(value, parseError);
-    else if (name == SVGNames::dyAttr)
-        m_dy->setBaseValueAsString(value, parseError);
-    else if (name == SVGNames::rotateAttr)
-        m_rotate->setBaseValueAsString(value, parseError);
-    else
-        ASSERT_NOT_REACHED();
-
-    reportAttributeParsingError(parseError, name, value);
+    parseAttributeNew(name, value);
 }
 
 void SVGTextPositioningElement::svgAttributeChanged(const QualifiedName& attrName)
@@ -104,14 +83,11 @@ void SVGTextPositioningElement::svgAttributeChanged(const QualifiedName& attrNam
     if (!renderer)
         return;
 
-    if (updateRelativeLengths || attrName == SVGNames::rotateAttr) {
-        if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(renderer))
-            textRenderer->setNeedsPositioningValuesUpdate();
-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
-        return;
-    }
+    ASSERT(updateRelativeLengths || attrName == SVGNames::rotateAttr);
 
-    ASSERT_NOT_REACHED();
+    if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(renderer))
+        textRenderer->setNeedsPositioningValuesUpdate();
+    markForLayoutAndParentResourceInvalidation(renderer);
 }
 
 SVGTextPositioningElement* SVGTextPositioningElement::elementFromRenderer(RenderObject* renderer)