Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/Source/WebCore/html/HTMLTableColElement.cpp b/Source/WebCore/html/HTMLTableColElement.cpp
index 2830dfa48..9af84376c 100644
--- a/Source/WebCore/html/HTMLTableColElement.cpp
+++ b/Source/WebCore/html/HTMLTableColElement.cpp
@@ -54,22 +54,22 @@ bool HTMLTableColElement::isPresentationAttribute(const QualifiedName& name) con
     return HTMLTablePartElement::isPresentationAttribute(name);
 }
 
-void HTMLTableColElement::collectStyleForAttribute(const Attribute& attribute, StylePropertySet* style)
+void HTMLTableColElement::collectStyleForPresentationAttribute(const Attribute& attribute, StylePropertySet* style)
 {
     if (attribute.name() == widthAttr)
         addHTMLLengthToStyle(style, CSSPropertyWidth, attribute.value());
     else
-        HTMLTablePartElement::collectStyleForAttribute(attribute, style);
+        HTMLTablePartElement::collectStyleForPresentationAttribute(attribute, style);
 }
 
-void HTMLTableColElement::parseAttribute(const Attribute& attribute)
+void HTMLTableColElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    if (attribute.name() == spanAttr) {
-        m_span = !attribute.isNull() ? attribute.value().toInt() : 1;
+    if (name == spanAttr) {
+        m_span = !value.isNull() ? value.toInt() : 1;
         if (renderer() && renderer()->isRenderTableCol())
             renderer()->updateFromElement();
-    } else if (attribute.name() == widthAttr) {
-        if (!attribute.isEmpty()) {
+    } else if (name == widthAttr) {
+        if (!value.isEmpty()) {
             if (renderer() && renderer()->isRenderTableCol()) {
                 RenderTableCol* col = toRenderTableCol(renderer());
                 int newWidth = width().toInt();
@@ -78,10 +78,10 @@ void HTMLTableColElement::parseAttribute(const Attribute& attribute)
             }
         }
     } else
-        HTMLTablePartElement::parseAttribute(attribute);
+        HTMLTablePartElement::parseAttribute(name, value);
 }
 
-const StylePropertySet* HTMLTableColElement::additionalAttributeStyle()
+const StylePropertySet* HTMLTableColElement::additionalPresentationAttributeStyle()
 {
     if (!hasLocalName(colgroupTag))
         return 0;