Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderMultiColumnFlowThreadTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/rendering/RenderMultiColumnFlowThread.h"
 
 #include "core/rendering/RenderMultiColumnSet.h"
 #include "core/rendering/RenderMultiColumnSpannerPlaceholder.h"
@@ skipping 327 matching lines @@
     RenderMultiColumnSet* thirdRow = secondRow->nextSiblingMultiColumnSet();
     EXPECT_EQ(flowThread->columnSetAtBlockOffset(LayoutUnit(800)), thirdRow);
     EXPECT_EQ(flowThread->columnSetAtBlockOffset(LayoutUnit(899)), thirdRow); // bottom of last row
     EXPECT_EQ(flowThread->columnSetAtBlockOffset(LayoutUnit(10000)), thirdRow); // overflow
 }
 
 class MultiColumnTreeModifyingTest : public MultiColumnRenderingTest {
 public:
     void setMulticolHTML(const char*);
     void reparentRenderer(const char* newParentId, const char* childId, const char* insertBeforeId = 0);
-    void destroyRenderer(RenderObject* child);
+    void destroyRenderer(LayoutObject* child);
     void destroyRenderer(const char* childId);
 };
 
 void MultiColumnTreeModifyingTest::setMulticolHTML(const char* html)
 {
     MultiColumnRenderingTest::setMulticolHTML(html);
     // Allow modifications to the render tree structure, because that's what we want to test.
     document().lifecycle().advanceTo(DocumentLifecycle::InStyleRecalc);
 }
 
 void MultiColumnTreeModifyingTest::reparentRenderer(const char* newParentId, const char* childId, const char* insertBeforeId)
 {
-    RenderObject* newParent = document().getElementById(newParentId)->renderer();
-    RenderObject* child = document().getElementById(childId)->renderer();
-    RenderObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->renderer() : 0;
+    LayoutObject* newParent = document().getElementById(newParentId)->renderer();
+    LayoutObject* child = document().getElementById(childId)->renderer();
+    LayoutObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->renderer() : 0;
     child->remove();
     newParent->addChild(child, insertBefore);
 }
 
-void MultiColumnTreeModifyingTest::destroyRenderer(RenderObject* child)
+void MultiColumnTreeModifyingTest::destroyRenderer(LayoutObject* child)
 {
     // Remove and destroy in separate steps, so that we get to test removal of subtrees.
     child->remove();
     child->node()->detach();
 }
 
 void MultiColumnTreeModifyingTest::destroyRenderer(const char* childId)
 {
     destroyRenderer(document().getElementById(childId)->renderer());
 }
@@ skipping 418 matching lines @@
 {
     setMulticolHTML("<div id='mc'>text<div id='spanner'><div class='s'></div></div>text</div>");
     EXPECT_EQ(columnSetSignature("mc"), "csc");
     destroyRenderer("spanner");
     EXPECT_EQ(columnSetSignature("mc"), "c");
 }
 
 } // anonymous namespace
 
 } // namespace blink