Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I01166d4072567f174b02707d7a0850cb3fe1fd8a
diff --git a/Source/core/svg/SVGRectElement.cpp b/Source/core/svg/SVGRectElement.cpp
index 8142d91..1a3399e 100644
--- a/Source/core/svg/SVGRectElement.cpp
+++ b/Source/core/svg/SVGRectElement.cpp
@@ -31,12 +31,12 @@
inline SVGRectElement::SVGRectElement(Document& document)
: SVGGeometryElement(SVGNames::rectTag, document)
- , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(LengthModeWidth)))
- , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(LengthModeHeight)))
- , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(LengthModeWidth)))
- , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(LengthModeHeight)))
- , m_rx(SVGAnimatedLength::create(this, SVGNames::rxAttr, SVGLength::create(LengthModeWidth)))
- , m_ry(SVGAnimatedLength::create(this, SVGNames::ryAttr, SVGLength::create(LengthModeHeight)))
+ , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(LengthModeWidth), AllowNegativeLengths))
+ , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(LengthModeHeight), AllowNegativeLengths))
+ , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(LengthModeWidth), ForbidNegativeLengths))
+ , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(LengthModeHeight), ForbidNegativeLengths))
+ , m_rx(SVGAnimatedLength::create(this, SVGNames::rxAttr, SVGLength::create(LengthModeWidth), ForbidNegativeLengths))
+ , m_ry(SVGAnimatedLength::create(this, SVGNames::ryAttr, SVGLength::create(LengthModeHeight), ForbidNegativeLengths))
{
ScriptWrappable::init(this);
@@ -74,17 +74,17 @@
if (!isSupportedAttribute(name))
SVGGeometryElement::parseAttribute(name, value);
else if (name == SVGNames::xAttr)
- m_x->setBaseValueAsString(value, AllowNegativeLengths, parseError);
+ m_x->setBaseValueAsString(value, parseError);
else if (name == SVGNames::yAttr)
- m_y->setBaseValueAsString(value, AllowNegativeLengths, parseError);
+ m_y->setBaseValueAsString(value, parseError);
else if (name == SVGNames::rxAttr)
- m_rx->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+ m_rx->setBaseValueAsString(value, parseError);
else if (name == SVGNames::ryAttr)
- m_ry->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+ m_ry->setBaseValueAsString(value, parseError);
else if (name == SVGNames::widthAttr)
- m_width->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+ m_width->setBaseValueAsString(value, parseError);
else if (name == SVGNames::heightAttr)
- m_height->setBaseValueAsString(value, ForbidNegativeLengths, parseError);
+ m_height->setBaseValueAsString(value, parseError);
else
ASSERT_NOT_REACHED();