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/HTMLTableColElement.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/HTMLTableColElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLTableColElement.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/Source/WebCore/html/HTMLTableColElement.cpp b/Source/WebCore/html/HTMLTableColElement.cpp index 10657e682..0c83e781c 100644 --- a/Source/WebCore/html/HTMLTableColElement.cpp +++ b/Source/WebCore/html/HTMLTableColElement.cpp @@ -47,17 +47,7 @@ PassRefPtr<HTMLTableColElement> HTMLTableColElement::create(const QualifiedName& return adoptRef(new HTMLTableColElement(tagName, document)); } -bool HTMLTableColElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const -{ - if (attrName == widthAttr) { - result = eUniversal; - return false; - } - - return HTMLTablePartElement::mapToEntry(attrName, result); -} - -void HTMLTableColElement::parseMappedAttribute(Attribute* attr) +void HTMLTableColElement::parseAttribute(Attribute* attr) { if (attr->name() == spanAttr) { m_span = !attr->isNull() ? attr->value().toInt() : 1; @@ -65,19 +55,20 @@ void HTMLTableColElement::parseMappedAttribute(Attribute* attr) renderer()->updateFromElement(); } else if (attr->name() == widthAttr) { if (!attr->value().isEmpty()) { - addCSSLength(attr, CSSPropertyWidth, attr->value()); + addCSSLength(CSSPropertyWidth, attr->value()); if (renderer() && renderer()->isTableCol()) { RenderTableCol* col = toRenderTableCol(renderer()); int newWidth = width().toInt(); if (newWidth != col->width()) col->setNeedsLayoutAndPrefWidthsRecalc(); } - } + } else + removeCSSProperty(CSSPropertyWidth); } else - HTMLTablePartElement::parseMappedAttribute(attr); + HTMLTablePartElement::parseAttribute(attr); } -PassRefPtr<CSSMutableStyleDeclaration> HTMLTableColElement::additionalAttributeStyle() +StylePropertySet* HTMLTableColElement::additionalAttributeStyle() { if (!hasLocalName(colgroupTag)) return 0; |