diff options
Diffstat (limited to 'WebCore/svg/SVGCircleElement.cpp')
| -rw-r--r-- | WebCore/svg/SVGCircleElement.cpp | 80 |
1 files changed, 50 insertions, 30 deletions
diff --git a/WebCore/svg/SVGCircleElement.cpp b/WebCore/svg/SVGCircleElement.cpp index 10da742..ffbaa7b 100644 --- a/WebCore/svg/SVGCircleElement.cpp +++ b/WebCore/svg/SVGCircleElement.cpp @@ -1,31 +1,32 @@ /* - Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> - 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ + * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> + * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ #include "config.h" #if ENABLE(SVG) #include "SVGCircleElement.h" +#include "Attribute.h" #include "FloatPoint.h" -#include "MappedAttribute.h" #include "RenderPath.h" +#include "RenderSVGResource.h" #include "SVGLength.h" #include "SVGNames.h" @@ -46,7 +47,7 @@ SVGCircleElement::~SVGCircleElement() { } -void SVGCircleElement::parseMappedAttribute(MappedAttribute* attr) +void SVGCircleElement::parseMappedAttribute(Attribute* attr) { if (attr->name() == SVGNames::cxAttr) setCxBaseValue(SVGLength(LengthModeWidth, attr->value())); @@ -71,16 +72,33 @@ void SVGCircleElement::svgAttributeChanged(const QualifiedName& attrName) { SVGStyledTransformableElement::svgAttributeChanged(attrName); - if (!renderer()) + bool isLengthAttribute = attrName == SVGNames::cxAttr + || attrName == SVGNames::cyAttr + || attrName == SVGNames::rAttr; + + if (isLengthAttribute) + updateRelativeLengthsInformation(); + + RenderPath* renderer = static_cast<RenderPath*>(this->renderer()); + if (!renderer) return; - if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr || - attrName == SVGNames::rAttr || - SVGTests::isKnownAttribute(attrName) || - SVGLangSpace::isKnownAttribute(attrName) || - SVGExternalResourcesRequired::isKnownAttribute(attrName) || - SVGStyledTransformableElement::isKnownAttribute(attrName)) - renderer()->setNeedsLayout(true); + if (SVGStyledTransformableElement::isKnownAttribute(attrName)) { + renderer->setNeedsTransformUpdate(); + RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); + return; + } + + if (isLengthAttribute) { + renderer->setNeedsPathUpdate(); + RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); + return; + } + + if (SVGTests::isKnownAttribute(attrName) + || SVGLangSpace::isKnownAttribute(attrName) + || SVGExternalResourcesRequired::isKnownAttribute(attrName)) + RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); } void SVGCircleElement::synchronizeProperty(const QualifiedName& attrName) @@ -110,9 +128,11 @@ Path SVGCircleElement::toPathData() const return Path::createCircle(FloatPoint(cx().value(this), cy().value(this)), r().value(this)); } -bool SVGCircleElement::hasRelativeValues() const +bool SVGCircleElement::selfHasRelativeLengths() const { - return (cx().isRelative() || cy().isRelative() || r().isRelative()); + return cx().isRelative() + || cy().isRelative() + || r().isRelative(); } } |