summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLTableCellElement.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-18 14:03:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-18 14:03:11 +0200
commit8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch)
treecdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebCore/html/HTMLTableCellElement.cpp
parent1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff)
downloadqtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebCore/html/HTMLTableCellElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLTableCellElement.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/WebCore/html/HTMLTableCellElement.cpp b/Source/WebCore/html/HTMLTableCellElement.cpp
index ff0b3c8ed..c75ecc8a1 100644
--- a/Source/WebCore/html/HTMLTableCellElement.cpp
+++ b/Source/WebCore/html/HTMLTableCellElement.cpp
@@ -82,36 +82,36 @@ bool HTMLTableCellElement::isPresentationAttribute(const QualifiedName& name) co
return HTMLTablePartElement::isPresentationAttribute(name);
}
-void HTMLTableCellElement::collectStyleForAttribute(Attribute* attr, StylePropertySet* style)
+void HTMLTableCellElement::collectStyleForAttribute(const Attribute& attribute, StylePropertySet* style)
{
- if (attr->name() == nowrapAttr) {
+ if (attribute.name() == nowrapAttr) {
addPropertyToAttributeStyle(style, CSSPropertyWhiteSpace, CSSValueWebkitNowrap);
- } else if (attr->name() == widthAttr) {
- if (!attr->value().isEmpty()) {
- int widthInt = attr->value().toInt();
+ } else if (attribute.name() == widthAttr) {
+ if (!attribute.value().isEmpty()) {
+ int widthInt = attribute.value().toInt();
if (widthInt > 0) // width="0" is ignored for compatibility with WinIE.
- addHTMLLengthToStyle(style, CSSPropertyWidth, attr->value());
+ addHTMLLengthToStyle(style, CSSPropertyWidth, attribute.value());
}
- } else if (attr->name() == heightAttr) {
- if (!attr->value().isEmpty()) {
- int heightInt = attr->value().toInt();
+ } else if (attribute.name() == heightAttr) {
+ if (!attribute.value().isEmpty()) {
+ int heightInt = attribute.value().toInt();
if (heightInt > 0) // height="0" is ignored for compatibility with WinIE.
- addHTMLLengthToStyle(style, CSSPropertyHeight, attr->value());
+ addHTMLLengthToStyle(style, CSSPropertyHeight, attribute.value());
}
} else
- HTMLTablePartElement::collectStyleForAttribute(attr, style);
+ HTMLTablePartElement::collectStyleForAttribute(attribute, style);
}
-void HTMLTableCellElement::parseAttribute(Attribute* attr)
+void HTMLTableCellElement::parseAttribute(const Attribute& attribute)
{
- if (attr->name() == rowspanAttr) {
+ if (attribute.name() == rowspanAttr) {
if (renderer() && renderer()->isTableCell())
toRenderTableCell(renderer())->colSpanOrRowSpanChanged();
- } else if (attr->name() == colspanAttr) {
+ } else if (attribute.name() == colspanAttr) {
if (renderer() && renderer()->isTableCell())
toRenderTableCell(renderer())->colSpanOrRowSpanChanged();
} else
- HTMLTablePartElement::parseAttribute(attr);
+ HTMLTablePartElement::parseAttribute(attribute);
}
StylePropertySet* HTMLTableCellElement::additionalAttributeStyle()