Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutTableCol.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (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, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 21 matching lines @@
 #include "core/layout/LayoutTableCell.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 LayoutTableCol::LayoutTableCol(Element* element)
     : RenderBox(element)
     , m_span(1)
 {
-    // init RenderObject attributes
+    // init LayoutObject attributes
     setInline(true); // our object is not Inline
     updateFromElement();
 }
 
 void LayoutTableCol::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
 
     // If border was changed, notify table.
     if (parent()) {
         LayoutTable* table = this->table();
         if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout() && oldStyle && oldStyle->border() != style()->border()) {
             table->invalidateCollapsedBorders();
         } else if (oldStyle && oldStyle->logicalWidth() != style()->logicalWidth()) {
             // FIXME : setPreferredLogicalWidthsDirty is done for all cells as of now.
             // Need to find a better way so that only the cells which are changed by
             // the col width should have preferred logical widths recomputed.
-            for (RenderObject* child = table->children()->firstChild(); child; child = child->nextSibling()) {
+            for (LayoutObject* child = table->children()->firstChild(); child; child = child->nextSibling()) {
                 if (!child->isTableSection())
                     continue;
                 LayoutTableSection* section = toLayoutTableSection(child);
                 for (LayoutTableRow* row = section->firstRow(); row; row = row->nextRow()) {
                     for (LayoutTableCell* cell = row->firstCell(); cell; cell = cell->nextCell())
                         cell->setPreferredLogicalWidthsDirty();
                 }
             }
         }
     }
@@ skipping 18 matching lines @@
     RenderBox::insertedIntoTree();
     table()->addColumn(this);
 }
 
 void LayoutTableCol::willBeRemovedFromTree()
 {
     RenderBox::willBeRemovedFromTree();
     table()->removeColumn(this);
 }
 
-bool LayoutTableCol::isChildAllowed(RenderObject* child, const RenderStyle& style) const
+bool LayoutTableCol::isChildAllowed(LayoutObject* child, const RenderStyle& style) const
 {
     // We cannot use isTableColumn here as style() may return 0.
     return child->isLayoutTableCol() && style.display() == TABLE_COLUMN;
 }
 
 bool LayoutTableCol::canHaveChildren() const
 {
     // Cols cannot have children. This is actually necessary to fix a bug
     // with libraries.uc.edu, which makes a <p> be a table-column.
     return isTableColumnGroup();
@@ skipping 15 matching lines @@
 void LayoutTableCol::imageChanged(WrappedImagePtr, const IntRect*)
 {
     // FIXME: Issue paint invalidation of only the rect the image paints in.
     setShouldDoFullPaintInvalidation();
 }
 
 void LayoutTableCol::clearPreferredLogicalWidthsDirtyBits()
 {
     clearPreferredLogicalWidthsDirty();
 
-    for (RenderObject* child = firstChild(); child; child = child->nextSibling())
+    for (LayoutObject* child = firstChild(); child; child = child->nextSibling())
         child->clearPreferredLogicalWidthsDirty();
 }
 
 LayoutTable* LayoutTableCol::table() const
 {
-    RenderObject* table = parent();
+    LayoutObject* table = parent();
     if (table && !table->isTable())
         table = table->parent();
     return table && table->isTable() ? toLayoutTable(table) : 0;
 }
 
 LayoutTableCol* LayoutTableCol::enclosingColumnGroup() const
 {
     if (!parent()->isLayoutTableCol())
         return 0;
 
     LayoutTableCol* parentColumnGroup = toLayoutTableCol(parent());
     ASSERT(parentColumnGroup->isTableColumnGroup());
     ASSERT(isTableColumn());
     return parentColumnGroup;
 }
 
 LayoutTableCol* LayoutTableCol::nextColumn() const
 {
     // If |this| is a column-group, the next column is the colgroup's first child column.
-    if (RenderObject* firstChild = this->firstChild())
+    if (LayoutObject* firstChild = this->firstChild())
         return toLayoutTableCol(firstChild);
 
     // Otherwise it's the next column along.
-    RenderObject* next = nextSibling();
+    LayoutObject* next = nextSibling();
 
     // Failing that, the child is the last column in a column-group, so the next column is the next column/column-group after its column-group.
     if (!next && parent()->isLayoutTableCol())
         next = parent()->nextSibling();
 
     for (; next && !next->isLayoutTableCol(); next = next->nextSibling()) { }
 
     return toLayoutTableCol(next);
 }
 
@@ skipping 13 matching lines @@
     return style()->borderStart();
 }
 
 const BorderValue& LayoutTableCol::borderAdjoiningCellAfter(const LayoutTableCell* cell) const
 {
     ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this);
     return style()->borderEnd();
 }
 
 }