[CTTE] RenderTableCol is never anonymous.

<https://webkit.org/b/121286>

Reviewed by Antti Koivisto.

Hide element() and provide existingElement() instead, returning an Element&.
Removed one bogus null check that was exposed.

Canonical link: https://commits.webkit.org/139242@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155685 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,13 @@
+2013-09-13  Andreas Kling  <akling@apple.com>
+
+        [CTTE] RenderTableCol is never anonymous.
+        <https://webkit.org/b/121286>
+
+        Reviewed by Antti Koivisto.
+
+        Hide element() and provide existingElement() instead, returning an Element&.
+        Removed one bogus null check that was exposed.
+
 2013-09-13  Andreas Kling  <akling@apple.com>
 
         [CTTE] RenderListItem is never anonymous.

Source/WebCore/rendering/RenderObject.cpp

@@ -221,7 +221,7 @@ RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
         return new (arena) RenderTableRow(element);
     case TABLE_COLUMN_GROUP:
     case TABLE_COLUMN:
-        return new (arena) RenderTableCol(element);
+        return new (arena) RenderTableCol(*element);
     case TABLE_CELL:
         return new (arena) RenderTableCell(element);
     case TABLE_CAPTION:

Source/WebCore/rendering/RenderTableCol.cpp

@@ -35,8 +35,8 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderTableCol::RenderTableCol(Element* element)
-    : RenderBox(element)
+RenderTableCol::RenderTableCol(Element& element)
+    : RenderBox(&element)
     , m_span(1)
 {
     // init RenderObject attributes
@@ -59,10 +59,9 @@ void RenderTableCol::styleDidChange(StyleDifference diff, const RenderStyle* old
 void RenderTableCol::updateFromElement()
 {
     unsigned oldSpan = m_span;
-    Element* element = this->element();
-    if (element && (element->hasTagName(colTag) || element->hasTagName(colgroupTag))) {
-        HTMLTableColElement* tc = static_cast<HTMLTableColElement*>(element);
-        m_span = tc->span();
+    if (existingElement().hasTagName(colTag) || existingElement().hasTagName(colgroupTag)) {
+        HTMLTableColElement& tc = static_cast<HTMLTableColElement&>(existingElement());
+        m_span = tc.span();
     } else
         m_span = !(style() && style()->display() == TABLE_COLUMN_GROUP);
     if (m_span != oldSpan && style() && parent())

Source/WebCore/rendering/RenderTableCol.h

@@ -35,7 +35,8 @@ class RenderTableCell;
 
 class RenderTableCol FINAL : public RenderBox {
 public:
-    explicit RenderTableCol(Element*);
+    explicit RenderTableCol(Element&);
+    Element& existingElement() const { return *RenderBox::element(); }
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
     RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
@@ -77,6 +78,8 @@ class RenderTableCol FINAL : public RenderBox {
     const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
 
 private:
+    void element() const WTF_DELETED_FUNCTION;
+
     virtual RenderObjectChildList* virtualChildren() { return children(); }
     virtual const RenderObjectChildList* virtualChildren() const { return children(); }