Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 7 insertions, 10 deletions

diff --git a/Source/WebCore/html/HTMLTableElement.h b/Source/WebCore/html/HTMLTableElement.h
index deed9518d..cfde1df95 100644
--- a/Source/WebCore/html/HTMLTableElement.h
+++ b/Source/WebCore/html/HTMLTableElement.h
@@ -66,8 +66,8 @@ public:
 
     virtual void attach();
 
-    void addSharedCellDecls(Vector<CSSMutableStyleDeclaration*>&);
-    void addSharedGroupDecls(bool rows, Vector<CSSMutableStyleDeclaration*>&);
+    PassRefPtr<CSSMutableStyleDeclaration> additionalCellStyle();
+    PassRefPtr<CSSMutableStyleDeclaration> additionalGroupStyle(bool rows);
 
 private:
     HTMLTableElement(const QualifiedName&, Document*);
@@ -76,21 +76,18 @@ private:
     virtual void parseMappedAttribute(Attribute*);
     virtual bool isURLAttribute(Attribute*) const;
 
-    // Used to obtain either a solid or outset border decl and to deal with the frame
-    // and rules attributes.
-    virtual bool canHaveAdditionalAttributeStyleDecls() const { return true; }
-    virtual void additionalAttributeStyleDecls(Vector<CSSMutableStyleDeclaration*>&);
+    // Used to obtain either a solid or outset border decl and to deal with the frame and rules attributes.
+    virtual PassRefPtr<CSSMutableStyleDeclaration> additionalAttributeStyle() OVERRIDE;
 
     virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
-    void addSharedCellBordersDecl(Vector<CSSMutableStyleDeclaration*>&);
-    void addSharedCellPaddingDecl(Vector<CSSMutableStyleDeclaration*>&);
-    
     enum TableRules { UnsetRules, NoneRules, GroupsRules, RowsRules, ColsRules, AllRules };
     enum CellBorders { NoBorders, SolidBorders, InsetBorders, SolidBordersColsOnly, SolidBordersRowsOnly };
 
     CellBorders cellBorders() const;
 
+    PassRefPtr<CSSMutableStyleDeclaration> createSharedCellStyle();
+
     HTMLTableSectionElement* lastBody() const;
 
     bool m_borderAttr;          // Sets a precise border width and creates an outset border for the table and for its cells.
@@ -100,8 +97,8 @@ private:
                                 // are present, to none otherwise).
 
     unsigned short m_padding;
-    RefPtr<CSSMappedAttributeDeclaration> m_paddingDecl;
     OwnPtr<HTMLTableRowsCollection> m_rowsCollection;
+    RefPtr<CSSMutableStyleDeclaration> m_sharedCellStyle;
 };
 
 } //namespace