From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 14:57:50 +0000 Subject: Merge webkit.org at r54127 : Initial merge by git Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 --- WebCore/svg/SVGTextPathElement.cpp | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'WebCore/svg/SVGTextPathElement.cpp') diff --git a/WebCore/svg/SVGTextPathElement.cpp b/WebCore/svg/SVGTextPathElement.cpp index 8a01ad9..eec6fc8 100644 --- a/WebCore/svg/SVGTextPathElement.cpp +++ b/WebCore/svg/SVGTextPathElement.cpp @@ -36,10 +36,9 @@ namespace WebCore { SVGTextPathElement::SVGTextPathElement(const QualifiedName& tagName, Document* doc) : SVGTextContentElement(tagName, doc) , SVGURIReference() - , m_startOffset(this, SVGNames::startOffsetAttr, LengthModeOther) - , m_method(this, SVGNames::methodAttr, SVG_TEXTPATH_METHODTYPE_ALIGN) - , m_spacing(this, SVGNames::spacingAttr, SVG_TEXTPATH_SPACINGTYPE_EXACT) - , m_href(this, XLinkNames::hrefAttr) + , m_startOffset(LengthModeOther) + , m_method(SVG_TEXTPATH_METHODTYPE_ALIGN) + , m_spacing(SVG_TEXTPATH_SPACINGTYPE_EXACT) { } @@ -70,6 +69,28 @@ void SVGTextPathElement::parseMappedAttribute(MappedAttribute* attr) } } +void SVGTextPathElement::synchronizeProperty(const QualifiedName& attrName) +{ + SVGTextContentElement::synchronizeProperty(attrName); + + if (attrName == anyQName()) { + synchronizeStartOffset(); + synchronizeMethod(); + synchronizeSpacing(); + synchronizeHref(); + return; + } + + if (attrName == SVGNames::startOffsetAttr) + synchronizeStartOffset(); + else if (attrName == SVGNames::methodAttr) + synchronizeMethod(); + else if (attrName == SVGNames::spacingAttr) + synchronizeSpacing(); + else if (SVGURIReference::isKnownAttribute(attrName)) + synchronizeHref(); +} + RenderObject* SVGTextPathElement::createRenderer(RenderArena* arena, RenderStyle*) { return new (arena) RenderSVGTextPath(this); @@ -102,5 +123,3 @@ void SVGTextPathElement::insertedIntoDocument() } #endif // ENABLE(SVG) - -// vim:ts=4:noet -- cgit v1.1