diff options
Diffstat (limited to 'WebCore/svg/SVGStyleElement.cpp')
| -rw-r--r-- | WebCore/svg/SVGStyleElement.cpp | 74 |
1 files changed, 30 insertions, 44 deletions
diff --git a/WebCore/svg/SVGStyleElement.cpp b/WebCore/svg/SVGStyleElement.cpp index 2a21670..bb50e67 100644 --- a/WebCore/svg/SVGStyleElement.cpp +++ b/WebCore/svg/SVGStyleElement.cpp @@ -1,45 +1,43 @@ /* - Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org> - 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> - Copyright (C) 2006 Apple Computer, Inc. - Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> - - 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 Nikolas Zimmermann <zimmermann@kde.org> + * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> + * Copyright (C) 2006 Apple Inc. All rights reserved. + * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> + * + * 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 "SVGStyleElement.h" +#include "Attribute.h" #include "CSSStyleSheet.h" #include "Document.h" #include "ExceptionCode.h" -#include "MappedAttribute.h" #include "SVGNames.h" #include <wtf/StdLibExtras.h> namespace WebCore { -using namespace SVGNames; - -SVGStyleElement::SVGStyleElement(const QualifiedName& tagName, Document* doc, bool createdByParser) - : SVGElement(tagName, doc) - , SVGLangSpace() - , m_createdByParser(createdByParser) +SVGStyleElement::SVGStyleElement(const QualifiedName& tagName, Document* document, bool createdByParser) + : SVGElement(tagName, document) + , SVGLangSpace() + , StyleElement(document, createdByParser) { } @@ -77,7 +75,7 @@ void SVGStyleElement::setTitle(const AtomicString& title, ExceptionCode& ec) setAttribute(SVGNames::titleAttr, title, ec); } -void SVGStyleElement::parseMappedAttribute(MappedAttribute* attr) +void SVGStyleElement::parseMappedAttribute(Attribute* attr) { if (attr->name() == SVGNames::titleAttr && m_sheet) m_sheet->setTitle(attr->value()); @@ -90,31 +88,26 @@ void SVGStyleElement::parseMappedAttribute(MappedAttribute* attr) void SVGStyleElement::finishParsingChildren() { - StyleElement::sheet(this); - m_createdByParser = false; + StyleElement::finishParsingChildren(this); SVGElement::finishParsingChildren(); } void SVGStyleElement::insertedIntoDocument() { SVGElement::insertedIntoDocument(); - document()->addStyleSheetCandidateNode(this, m_createdByParser); - if (!m_createdByParser) - StyleElement::insertedIntoDocument(document(), this); + StyleElement::insertedIntoDocument(document(), this); } void SVGStyleElement::removedFromDocument() { SVGElement::removedFromDocument(); - if (document()->renderer()) - document()->removeStyleSheetCandidateNode(this); - StyleElement::removedFromDocument(document()); + StyleElement::removedFromDocument(document(), this); } void SVGStyleElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta) { + StyleElement::childrenChanged(this); SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta); - StyleElement::process(this); } StyleSheet* SVGStyleElement::sheet() @@ -122,13 +115,6 @@ StyleSheet* SVGStyleElement::sheet() return StyleElement::sheet(this); } -bool SVGStyleElement::sheetLoaded() -{ - document()->removePendingSheet(); - return true; -} - } -// vim:ts=4:noet #endif // ENABLE(SVG) |