Rename renderer() to layoutObject().

Source/core/layout/LayoutMultiColumnFlowThreadTest.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/layout/LayoutMultiColumnFlowThread.h"
 
 #include "core/layout/LayoutMultiColumnSet.h"
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
@@ skipping 16 matching lines @@
     String columnSetSignature(const char* multicolId);
 
     void setMulticolHTML(const String&);
 };
 
 LayoutMultiColumnFlowThread* MultiColumnRenderingTest::findFlowThread(const char* id) const
 {
     Node* multicol = document().getElementById(id);
     if (!multicol)
         return 0;
-    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(multicol->renderer());
+    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(multicol->layoutObject());
     if (!multicolContainer)
         return 0;
     return multicolContainer->multiColumnFlowThread();
 }
 
 String MultiColumnRenderingTest::columnSetSignature(LayoutMultiColumnFlowThread* flowThread)
 {
     String signature = "";
     for (LayoutBox* columnBox = flowThread->firstMultiColumnBox();
         columnBox;
@@ skipping 22 matching lines @@
         "</style>";
     setBodyInnerHTML(style + html);
 }
 
 TEST_F(MultiColumnRenderingTest, OneBlockWithInDepthTreeStructureCheck)
 {
     // Examine the render tree established by a simple multicol container with a block with some text inside.
     setMulticolHTML("<div id='mc'><div>xxx</div></div>");
     Node* multicol = document().getElementById("mc");
     ASSERT_TRUE(multicol);
-    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(multicol->renderer());
+    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(multicol->layoutObject());
     ASSERT_TRUE(multicolContainer);
     LayoutMultiColumnFlowThread* flowThread = multicolContainer->multiColumnFlowThread();
     ASSERT_TRUE(flowThread);
     EXPECT_EQ(columnSetSignature(flowThread), "c");
     EXPECT_EQ(flowThread->parent(), multicolContainer);
     EXPECT_FALSE(flowThread->previousSibling());
     LayoutMultiColumnSet* columnSet = flowThread->firstMultiColumnSet();
     ASSERT_TRUE(columnSet);
     EXPECT_EQ(columnSet->previousSibling(), flowThread);
     EXPECT_FALSE(columnSet->nextSibling());
@@ skipping 12 matching lines @@
     EXPECT_EQ(columnSetSignature("mc"), "");
 }
 
 TEST_F(MultiColumnRenderingTest, OneBlock)
 {
     // There is some content, so we should create a column set.
     setMulticolHTML("<div id='mc'><div id='block'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "c");
     LayoutMultiColumnSet* columnSet = flowThread->firstMultiColumnSet();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block")->renderer()), columnSet);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block")->layoutObject()), columnSet);
 }
 
 TEST_F(MultiColumnRenderingTest, TwoBlocks)
 {
     // No matter how much content, we should only create one column set (unless there are spanners).
     setMulticolHTML("<div id='mc'><div id='block1'></div><div id='block2'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "c");
     LayoutMultiColumnSet* columnSet = flowThread->firstMultiColumnSet();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->renderer()), columnSet);
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->renderer()), columnSet);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->layoutObject()), columnSet);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->layoutObject()), columnSet);
 }
 
 TEST_F(MultiColumnRenderingTest, Spanner)
 {
     // With one spanner and no column content, we should create a spanner set.
     setMulticolHTML("<div id='mc'><div id='spanner'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "s");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->firstMultiColumnSet(), nullptr);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner")->renderer()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner")->layoutObject()->spannerPlaceholder(), columnBox);
 }
 
 TEST_F(MultiColumnRenderingTest, ContentThenSpanner)
 {
     // With some column content followed by a spanner, we need a column set followed by a spanner set.
     setMulticolHTML("<div id='mc'><div id='columnContent'></div><div id='spanner'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "cs");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->layoutObject()), nullptr);
 }
 
 TEST_F(MultiColumnRenderingTest, SpannerThenContent)
 {
     // With a spanner followed by some column content, we need a spanner set followed by a column set.
     setMulticolHTML("<div id='mc'><div id='spanner'></div><div id='columnContent'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "sc");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->layoutObject()), nullptr);
 }
 
 TEST_F(MultiColumnRenderingTest, ContentThenSpannerThenContent)
 {
     // With column content followed by a spanner followed by some column content, we need a column
     // set followed by a spanner set followed by a column set.
     setMulticolHTML("<div id='mc'><div id='columnContentBefore'></div><div id='spanner'></div><div id='columnContentAfter'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "csc");
     LayoutBox* columnBox = flowThread->firstMultiColumnSet();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentBefore")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentBefore")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentBefore")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentBefore")->layoutObject()), nullptr);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentAfter")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentAfter")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentAfter")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentAfter")->layoutObject()), nullptr);
 }
 
 TEST_F(MultiColumnRenderingTest, TwoSpanners)
 {
     // With two spanners and no column content, we need two spanner sets.
     setMulticolHTML("<div id='mc'><div id='spanner1'></div><div id='spanner2'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "ss");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->firstMultiColumnSet(), nullptr);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner1")->renderer()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner1")->layoutObject()->spannerPlaceholder(), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner2")->renderer()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner2")->layoutObject()->spannerPlaceholder(), columnBox);
 }
 
 TEST_F(MultiColumnRenderingTest, SpannerThenContentThenSpanner)
 {
     // With two spanners and some column content in-between, we need a spanner set, a column set and another spanner set.
     setMulticolHTML("<div id='mc'><div id='spanner1'></div><div id='columnContent'></div><div id='spanner2'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "scs");
     LayoutMultiColumnSet* columnSet = flowThread->firstMultiColumnSet();
     EXPECT_EQ(columnSet->nextSiblingMultiColumnSet(), nullptr);
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(columnBox, columnSet);
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->renderer()), columnSet);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->layoutObject()), columnSet);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->layoutObject()), nullptr);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->layoutObject()), columnBox);
 }
 
 TEST_F(MultiColumnRenderingTest, SpannerWithSpanner)
 {
     // column-span:all on something inside column-span:all has no effect.
     setMulticolHTML("<div id='mc'><div id='spanner'><div id='invalidSpanner' class='s'></div></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     ASSERT_EQ(columnSetSignature(flowThread), "s");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("invalidSpanner")->renderer()), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner")->renderer());
-    EXPECT_EQ(document().getElementById("spanner")->renderer()->spannerPlaceholder(), columnBox);
-    EXPECT_EQ(document().getElementById("invalidSpanner")->renderer()->spannerPlaceholder(), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("invalidSpanner")->layoutObject()), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner")->layoutObject());
+    EXPECT_EQ(document().getElementById("spanner")->layoutObject()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(document().getElementById("invalidSpanner")->layoutObject()->spannerPlaceholder(), nullptr);
 }
 
 TEST_F(MultiColumnRenderingTest, SubtreeWithSpanner)
 {
     setMulticolHTML("<div id='mc'><div id='outer'><div id='block1'></div><div id='spanner'></div><div id='block2'></div></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     EXPECT_EQ(columnSetSignature(flowThread), "csc");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), columnBox);
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->layoutObject()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner")->renderer()->spannerPlaceholder(), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner")->renderer());
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->renderer()), nullptr);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("block1")->renderer()), nullptr);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("block2")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner")->layoutObject()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner")->layoutObject());
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->layoutObject()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("block1")->layoutObject()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("block2")->layoutObject()), nullptr);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->layoutObject()), columnBox);
 }
 
 TEST_F(MultiColumnRenderingTest, SubtreeWithSpannerAfterSpanner)
 {
     setMulticolHTML("<div id='mc'><div id='spanner1'></div><div id='outer'>text<div id='spanner2'></div><div id='after'></div></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     EXPECT_EQ(columnSetSignature(flowThread), "scsc");
     LayoutBox* columnBox = flowThread->firstMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->renderer()), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner1")->renderer());
-    EXPECT_EQ(document().getElementById("spanner1")->renderer()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->layoutObject()), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner1")->layoutObject());
+    EXPECT_EQ(document().getElementById("spanner1")->layoutObject()->spannerPlaceholder(), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner2")->renderer());
-    EXPECT_EQ(document().getElementById("spanner2")->renderer()->spannerPlaceholder(), columnBox);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->renderer()), nullptr);
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("after")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->layoutObject()), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner2")->layoutObject());
+    EXPECT_EQ(document().getElementById("spanner2")->layoutObject()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->layoutObject()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("after")->layoutObject()), nullptr);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("after")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("after")->layoutObject()), columnBox);
 }
 
 TEST_F(MultiColumnRenderingTest, SubtreeWithSpannerBeforeSpanner)
 {
     setMulticolHTML("<div id='mc'><div id='outer'>text<div id='spanner1'></div>text</div><div id='spanner2'></div></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     EXPECT_EQ(columnSetSignature(flowThread), "cscs");
     LayoutBox* columnBox = flowThread->firstMultiColumnSet();
-    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), columnBox);
+    EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->layoutObject()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner1")->renderer()->spannerPlaceholder(), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner1")->renderer());
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner1")->layoutObject()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner1")->layoutObject());
     columnBox = columnBox->nextSiblingMultiColumnBox()->nextSiblingMultiColumnBox();
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), columnBox);
-    EXPECT_EQ(document().getElementById("spanner2")->renderer()->spannerPlaceholder(), columnBox);
-    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner2")->renderer());
-    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->renderer()), nullptr);
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->layoutObject()), columnBox);
+    EXPECT_EQ(document().getElementById("spanner2")->layoutObject()->spannerPlaceholder(), columnBox);
+    EXPECT_EQ(toLayoutMultiColumnSpannerPlaceholder(columnBox)->rendererInFlowThread(), document().getElementById("spanner2")->layoutObject());
+    EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("outer")->layoutObject()), nullptr);
 }
 
 TEST_F(MultiColumnRenderingTest, columnSetAtBlockOffset)
 {
     setMulticolHTML("<div id='mc' style='line-height:100px;'>text<br>text<br>text<br>text<br>text<div id='spanner1'>spanner</div>text<br>text<div id='spanner2'>text<br>text</div>text</div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
     EXPECT_EQ(columnSetSignature(flowThread), "cscsc");
     LayoutMultiColumnSet* firstRow = flowThread->firstMultiColumnSet();
     EXPECT_EQ(flowThread->columnSetAtBlockOffset(LayoutUnit(-10000)), firstRow); // negative overflow
     EXPECT_EQ(flowThread->columnSetAtBlockOffset(LayoutUnit()), firstRow);
@@ skipping 56 matching lines @@
 
 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)
 {
-    LayoutObject* newParent = document().getElementById(newParentId)->renderer();
-    LayoutObject* child = document().getElementById(childId)->renderer();
-    LayoutObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->renderer() : 0;
+    LayoutObject* newParent = document().getElementById(newParentId)->layoutObject();
+    LayoutObject* child = document().getElementById(childId)->layoutObject();
+    LayoutObject* insertBefore = insertBeforeId ? document().getElementById(insertBeforeId)->layoutObject() : 0;
     child->remove();
     newParent->addChild(child, insertBefore);
 }
 
 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());
+    destroyRenderer(document().getElementById(childId)->layoutObject());
 }
 
 TEST_F(MultiColumnTreeModifyingTest, InsertFirstContentAndRemove)
 {
     setMulticolHTML("<div id='block'></div><div id='mc'></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
-    LayoutBlockFlow* block = toLayoutBlockFlow(document().getElementById("block")->renderer());
-    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(document().getElementById("mc")->renderer());
+    LayoutBlockFlow* block = toLayoutBlockFlow(document().getElementById("block")->layoutObject());
+    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(document().getElementById("mc")->layoutObject());
     block->remove();
     multicolContainer->addChild(block);
     EXPECT_EQ(block->parent(), flowThread);
     // A set should have appeared, now that the multicol container has content.
     EXPECT_EQ(columnSetSignature(flowThread), "c");
 
     destroyRenderer(block);
     // The set should be gone again now, since there's nothing inside the multicol container anymore.
     EXPECT_EQ(columnSetSignature("mc"), "");
 }
@@ skipping 19 matching lines @@
     EXPECT_EQ(columnSetSignature("mc"), "c");
     destroyRenderer("block");
     // There's still some content after the removal, so the set should remain.
     EXPECT_EQ(columnSetSignature("mc"), "c");
 }
 
 TEST_F(MultiColumnTreeModifyingTest, InsertSpannerAndRemove)
 {
     setMulticolHTML("<div id='spanner'></div><div id='mc'></div>");
     LayoutMultiColumnFlowThread* flowThread = findFlowThread("mc");
-    LayoutBlockFlow* spanner = toLayoutBlockFlow(document().getElementById("spanner")->renderer());
-    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(document().getElementById("mc")->renderer());
+    LayoutBlockFlow* spanner = toLayoutBlockFlow(document().getElementById("spanner")->layoutObject());
+    LayoutBlockFlow* multicolContainer = toLayoutBlockFlow(document().getElementById("mc")->layoutObject());
     spanner->remove();
     multicolContainer->addChild(spanner);
     EXPECT_EQ(spanner->parent(), flowThread);
     // We should now have a spanner placeholder, since we just moved a spanner into the multicol container.
     EXPECT_EQ(columnSetSignature(flowThread), "s");
     destroyRenderer(spanner);
     EXPECT_EQ(columnSetSignature(flowThread), "");
 }
 
 TEST_F(MultiColumnTreeModifyingTest, InsertTwoSpannersAndRemove)
@@ skipping 360 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