diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebCore/html/HTMLFrameSetElement.cpp | |
parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebCore/html/HTMLFrameSetElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLFrameSetElement.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/Source/WebCore/html/HTMLFrameSetElement.cpp b/Source/WebCore/html/HTMLFrameSetElement.cpp index 978a72d7a..4af6342bd 100644 --- a/Source/WebCore/html/HTMLFrameSetElement.cpp +++ b/Source/WebCore/html/HTMLFrameSetElement.cpp @@ -64,17 +64,7 @@ PassRefPtr<HTMLFrameSetElement> HTMLFrameSetElement::create(const QualifiedName& return adoptRef(new HTMLFrameSetElement(tagName, document)); } -bool HTMLFrameSetElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const -{ - if (attrName == bordercolorAttr) { - result = eUniversal; - return true; - } - - return HTMLElement::mapToEntry(attrName, result); -} - -void HTMLFrameSetElement::parseMappedAttribute(Attribute* attr) +void HTMLFrameSetElement::parseAttribute(Attribute* attr) { if (attr->name() == rowsAttr) { if (!attr->isNull()) { @@ -109,11 +99,11 @@ void HTMLFrameSetElement::parseMappedAttribute(Attribute* attr) } else m_borderSet = false; } else if (attr->name() == bordercolorAttr) { - m_borderColorSet = attr->decl(); - if (!attr->decl() && !attr->isEmpty()) { - addCSSColor(attr, CSSPropertyBorderColor, attr->value()); - m_borderColorSet = true; - } + m_borderColorSet = !attr->isEmpty(); + if (attr->value().isNull()) + removeCSSProperty(CSSPropertyBorderColor); + else + addCSSColor(CSSPropertyBorderColor, attr->value()); } else if (attr->name() == onloadAttr) document()->setWindowAttributeEventListener(eventNames().loadEvent, createAttributeEventListener(document()->frame(), attr)); else if (attr->name() == onbeforeunloadAttr) @@ -147,7 +137,7 @@ void HTMLFrameSetElement::parseMappedAttribute(Attribute* attr) else if (attr->name() == onpopstateAttr) document()->setWindowAttributeEventListener(eventNames().popstateEvent, createAttributeEventListener(document()->frame(), attr)); else - HTMLElement::parseMappedAttribute(attr); + HTMLElement::parseAttribute(attr); } bool HTMLFrameSetElement::rendererIsNeeded(const NodeRenderingContext& context) |