Move rendering/RenderObject to layout/LayoutObject.

Source/core/layout/LayoutTableSection.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, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 71 matching lines @@
     , m_cCol(0)
     , m_cRow(0)
     , m_outerBorderStart(0)
     , m_outerBorderEnd(0)
     , m_outerBorderBefore(0)
     , m_outerBorderAfter(0)
     , m_needsCellRecalc(false)
     , m_forceSlowPaintPathWithOverflowingCell(false)
     , m_hasMultipleCellLevels(false)
 {
-    // init RenderObject attributes
+    // init LayoutObject attributes
     setInline(false); // our object is not Inline
 }
 
 LayoutTableSection::~LayoutTableSection()
 {
 }
 
 void LayoutTableSection::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
     propagateStyleToAnonymousChildren();
 
     // If border was changed, notify table.
     LayoutTable* table = this->table();
     if (table && !table->selfNeedsLayout() && !table->normalChildNeedsLayout() && oldStyle && oldStyle->border() != style()->border())
         table->invalidateCollapsedBorders();
 }
 
 void LayoutTableSection::willBeRemovedFromTree()
 {
     RenderBox::willBeRemovedFromTree();
 
     // Preventively invalidate our cells as we may be re-inserted into
     // a new table which would require us to rebuild our structure.
     setNeedsCellRecalc();
 }
 
-void LayoutTableSection::addChild(RenderObject* child, RenderObject* beforeChild)
+void LayoutTableSection::addChild(LayoutObject* child, LayoutObject* beforeChild)
 {
     if (!child->isTableRow()) {
-        RenderObject* last = beforeChild;
+        LayoutObject* last = beforeChild;
         if (!last)
             last = lastRow();
         if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
             if (beforeChild == last)
                 beforeChild = last->slowFirstChild();
             last->addChild(child, beforeChild);
             return;
         }
 
         if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == this) {
-            RenderObject* row = beforeChild->previousSibling();
+            LayoutObject* row = beforeChild->previousSibling();
             if (row && row->isTableRow() && row->isAnonymous()) {
                 row->addChild(child);
                 return;
             }
         }
 
         // If beforeChild is inside an anonymous cell/row, insert into the cell or into
         // the anonymous row containing it, if there is one.
-        RenderObject* lastBox = last;
+        LayoutObject* lastBox = last;
         while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableRow())
             lastBox = lastBox->parent();
         if (lastBox && lastBox->isAnonymous() && !lastBox->isBeforeOrAfterContent()) {
             lastBox->addChild(child, beforeChild);
             return;
         }
 
-        RenderObject* row = LayoutTableRow::createAnonymousWithParentRenderer(this);
+        LayoutObject* row = LayoutTableRow::createAnonymousWithParentRenderer(this);
         addChild(row, beforeChild);
         row->addChild(child);
         return;
     }
 
     if (beforeChild)
         setNeedsCellRecalc();
 
     unsigned insertionRow = m_cRow;
     ++m_cRow;
@@ skipping 746 matching lines @@
             totalPercent += m_grid[r].logicalHeight.percent();
     }
 
     int remainingExtraLogicalHeight = extraLogicalHeight;
     distributeExtraLogicalHeightToPercentRows(remainingExtraLogicalHeight, totalPercent);
     distributeExtraLogicalHeightToAutoRows(remainingExtraLogicalHeight, autoRowsCount);
     distributeRemainingExtraLogicalHeight(remainingExtraLogicalHeight);
     return extraLogicalHeight - remainingExtraLogicalHeight;
 }
 
-static bool shouldFlexCellChild(RenderObject* cellDescendant)
+static bool shouldFlexCellChild(LayoutObject* cellDescendant)
 {
     return cellDescendant->isReplaced() || (cellDescendant->isBox() && toRenderBox(cellDescendant)->scrollsOverflow());
 }
 
 void LayoutTableSection::layoutRows()
 {
 #if ENABLE(ASSERT)
     SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
 #endif
 
@@ skipping 48 matching lines @@
             // time only).  We may also not be handling row-spanning cells correctly.
             //
             // Note also the oddity where replaced elements always flex, and yet blocks/tables do
             // not necessarily flex.  WinIE is crazy and inconsistent, and we can't hope to
             // match the behavior perfectly, but we'll continue to refine it as we discover new
             // bugs. :)
             bool cellChildrenFlex = false;
             bool flexAllChildren = cell->style()->logicalHeight().isFixed()
                 || (!table()->style()->logicalHeight().isAuto() && rHeight != cell->logicalHeight());
 
-            for (RenderObject* child = cell->firstChild(); child; child = child->nextSibling()) {
+            for (LayoutObject* child = cell->firstChild(); child; child = child->nextSibling()) {
                 if (!child->isText() && child->style()->logicalHeight().isPercent()
                     && (flexAllChildren || shouldFlexCellChild(child))
                     && (!child->isTable() || toLayoutTable(child)->hasSections())) {
                     cellChildrenFlex = true;
                     break;
                 }
             }
 
             if (!cellChildrenFlex) {
                 if (TrackedRendererListHashSet* percentHeightDescendants = cell->percentHeightDescendants()) {
@@ skipping 544 matching lines @@
             CellStruct& current = cellAt(hitRow, hitColumn);
 
             // If the cell is empty, there's nothing to do
             if (!current.hasCells())
                 continue;
 
             for (unsigned i = current.cells.size() ; i; ) {
                 --i;
                 LayoutTableCell* cell = current.cells[i];
                 LayoutPoint cellPoint = flipForWritingModeForChild(cell, adjustedLocation);
-                if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, locationInContainer, cellPoint, action)) {
+                if (static_cast<LayoutObject*>(cell)->nodeAtPoint(request, result, locationInContainer, cellPoint, action)) {
                     updateHitTestResult(result, locationInContainer.point() - toLayoutSize(cellPoint));
                     return true;
                 }
             }
             if (!result.isRectBasedTest())
                 break;
         }
         if (!result.isRectBasedTest())
             break;
     }
@@ skipping 17 matching lines @@
 }
 
 CollapsedBorderValue& LayoutTableSection::cachedCollapsedBorder(const LayoutTableCell* cell, CollapsedBorderSide side)
 {
     ASSERT(table()->collapseBorders());
     HashMap<pair<const LayoutTableCell*, int>, CollapsedBorderValue>::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
     ASSERT_WITH_SECURITY_IMPLICATION(it != m_cellsCollapsedBorders.end());
     return it->value;
 }
 
-LayoutTableSection* LayoutTableSection::createAnonymousWithParentRenderer(const RenderObject* parent)
+LayoutTableSection* LayoutTableSection::createAnonymousWithParentRenderer(const LayoutObject* parent)
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay(parent->style(), TABLE_ROW_GROUP);
     LayoutTableSection* newSection = new LayoutTableSection(0);
     newSection->setDocumentForAnonymous(&parent->document());
     newSection->setStyle(newStyle.release());
     return newSection;
 }
 
 void LayoutTableSection::setLogicalPositionForCell(LayoutTableCell* cell, unsigned effectiveColumn) const
 {
     LayoutPoint cellLocation(0, m_rowPos[cell->rowIndex()]);
     int horizontalBorderSpacing = table()->hBorderSpacing();
 
     // FIXME: The table's direction should determine our row's direction, not the section's (see bug 96691).
     if (!style()->isLeftToRightDirection())
         cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - table()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing);
     else
         cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizontalBorderSpacing);
 
     cell->setLogicalLocation(cellLocation);
 }
 
 } // namespace blink