Move rendering/RenderBox to layout/LayoutBox.

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 25 matching lines @@
         return 0;
     RenderBlockFlow* multicolContainer = toRenderBlockFlow(multicol->renderer());
     if (!multicolContainer)
         return 0;
     return multicolContainer->multiColumnFlowThread();
 }
 
 String MultiColumnRenderingTest::columnSetSignature(LayoutMultiColumnFlowThread* flowThread)
 {
     String signature = "";
-    for (RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    for (LayoutBox* columnBox = flowThread->firstMultiColumnBox();
         columnBox;
         columnBox = columnBox->nextSiblingMultiColumnBox()) {
         if (columnBox->isLayoutMultiColumnSpannerPlaceholder())
             signature.append('s');
         else if (columnBox->isLayoutMultiColumnSet())
             signature.append('c');
         else
             signature.append('?');
     }
     return signature;
@@ skipping 66 matching lines @@
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->renderer()), columnSet);
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    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);
 }
 
 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->renderer()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContent")->renderer()), columnBox);
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContent")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnSet();
+    LayoutBox* columnBox = flowThread->firstMultiColumnSet();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentBefore")->renderer()), columnBox);
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentBefore")->renderer()), nullptr);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner")->renderer()), columnBox);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("columnContentAfter")->renderer()), columnBox);
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("columnContentAfter")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    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);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), columnBox);
     EXPECT_EQ(document().getElementById("spanner2")->renderer()->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);
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner1")->renderer()), 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);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->containingColumnSpannerPlaceholder(document().getElementById("spanner2")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    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);
 }
 
 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    LayoutBox* columnBox = flowThread->firstMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), columnBox);
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block1")->renderer()), 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);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("block2")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnBox();
+    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);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), 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);
     columnBox = columnBox->nextSiblingMultiColumnBox();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("after")->renderer()), 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");
-    RenderBox* columnBox = flowThread->firstMultiColumnSet();
+    LayoutBox* columnBox = flowThread->firstMultiColumnSet();
     EXPECT_EQ(flowThread->findSetRendering(document().getElementById("outer")->renderer()), 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());
     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);
@@ skipping 512 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