From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 3 Feb 2012 09:55:33 +0100
Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961
 (http://svn.webkit.org/repository/webkit/trunk@106560)

---
 Source/WebCore/html/HTMLTableColElement.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Source/WebCore/html/HTMLTableColElement.cpp')

diff --git a/Source/WebCore/html/HTMLTableColElement.cpp b/Source/WebCore/html/HTMLTableColElement.cpp
index 96af70827..10657e682 100644
--- a/Source/WebCore/html/HTMLTableColElement.cpp
+++ b/Source/WebCore/html/HTMLTableColElement.cpp
@@ -77,17 +77,16 @@ void HTMLTableColElement::parseMappedAttribute(Attribute* attr)
         HTMLTablePartElement::parseMappedAttribute(attr);
 }
 
-// used by table columns and column groups to share style decls created by the enclosing table.
-void HTMLTableColElement::additionalAttributeStyleDecls(Vector<CSSMutableStyleDeclaration*>& results)
+PassRefPtr<CSSMutableStyleDeclaration> HTMLTableColElement::additionalAttributeStyle()
 {
     if (!hasLocalName(colgroupTag))
-        return;
+        return 0;
     ContainerNode* p = parentNode();
     while (p && !p->hasTagName(tableTag))
         p = p->parentNode();
     if (!p)
-        return;
-    static_cast<HTMLTableElement*>(p)->addSharedGroupDecls(false, results);
+        return 0;
+    return static_cast<HTMLTableElement*>(p)->additionalGroupStyle(false);
 }
 
 void HTMLTableColElement::setSpan(int n)
-- 
cgit v1.2.1