Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 15 insertions, 17 deletions

diff --git a/WebCore/html/HTMLTableColElement.h b/WebCore/html/HTMLTableColElement.h
index 3710c11..07b0ae8 100644
--- a/WebCore/html/HTMLTableColElement.h
+++ b/WebCore/html/HTMLTableColElement.h
@@ -4,7 +4,7 @@
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,23 +30,11 @@
 
 namespace WebCore {
 
-class HTMLTableElement;
-
 class HTMLTableColElement : public HTMLTablePartElement {
 public:
-    HTMLTableColElement(const QualifiedName& tagName, Document*);
-
-    virtual HTMLTagStatus endTagRequirement() const;
-    virtual int tagPriority() const;
-    virtual bool checkDTD(const Node*);
+    static PassRefPtr<HTMLTableColElement> create(const QualifiedName& tagName, Document*);
 
-    // overrides
-    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(Attribute*);
-    virtual bool canHaveAdditionalAttributeStyleDecls() const { return true; }
-    virtual void additionalAttributeStyleDecls(Vector<CSSMutableStyleDeclaration*>&);
-   
-    int span() const { return _span; }
+    int span() const { return m_span; }
 
     String align() const;
     void setAlign(const String&);
@@ -65,8 +53,18 @@ public:
     String width() const;
     void setWidth(const String&);
 
-protected:
-    int _span;
+private:
+    HTMLTableColElement(const QualifiedName& tagName, Document*);
+
+    virtual HTMLTagStatus endTagRequirement() const;
+    virtual int tagPriority() const;
+    virtual bool checkDTD(const Node*);
+    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    virtual void parseMappedAttribute(Attribute*);
+    virtual bool canHaveAdditionalAttributeStyleDecls() const { return true; }
+    virtual void additionalAttributeStyleDecls(Vector<CSSMutableStyleDeclaration*>&);
+   
+    int m_span;
 };
 
 } //namespace