Don't include LayoutObject-derived headers where not needed.

third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp

 // Copyright 2015 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 "core/layout/LayoutBlock.h"
-#include "core/layout/LayoutInline.h"
+#include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintControllerPaintTest.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 
 namespace blink {
 
 struct PaintLayerPainterTestParam {
   PaintLayerPainterTestParam(bool rootLayerScrolling, bool slimmingPaintV2)
       : rootLayerScrolling(rootLayerScrolling),
@@ skipping 380 matching lines @@
       "      <div id='outline'></div>"
       "    </div>"
       "  </div>"
       "</div>");
   LayoutObject& outlineDiv =
       *document().getElementById("outline")->layoutObject();
   toHTMLElement(outlineDiv.node())
       ->setAttribute(HTMLNames::styleAttr, styleWithoutOutline);
   document().view()->updateAllLifecyclePhases();
 
-  LayoutBlock& selfPaintingLayerObject = *toLayoutBlock(
+  LayoutBoxModelObject& selfPaintingLayerObject = *toLayoutBoxModelObject(
       document().getElementById("self-painting-layer")->layoutObject());
   PaintLayer& selfPaintingLayer = *selfPaintingLayerObject.layer();
   ASSERT_TRUE(selfPaintingLayer.isSelfPaintingLayer());
   PaintLayer& nonSelfPaintingLayer =
       *toLayoutBoxModelObject(
            document().getElementById("non-self-painting-layer")->layoutObject())
            ->layer();
   ASSERT_FALSE(nonSelfPaintingLayer.isSelfPaintingLayer());
   ASSERT_TRUE(&nonSelfPaintingLayer == outlineDiv.enclosingLayer());
 
@@ skipping 43 matching lines @@
       "      <div id='float' style='width: 10px; height: 10px; "
       "background-color: blue'></div>"
       "    </div>"
       "  </div>"
       "</div>");
   LayoutObject& floatDiv = *document().getElementById("float")->layoutObject();
   toHTMLElement(floatDiv.node())
       ->setAttribute(HTMLNames::styleAttr, styleWithoutFloat);
   document().view()->updateAllLifecyclePhases();
 
-  LayoutBlock& selfPaintingLayerObject = *toLayoutBlock(
+  LayoutBoxModelObject& selfPaintingLayerObject = *toLayoutBoxModelObject(
       document().getElementById("self-painting-layer")->layoutObject());
   PaintLayer& selfPaintingLayer = *selfPaintingLayerObject.layer();
   ASSERT_TRUE(selfPaintingLayer.isSelfPaintingLayer());
   PaintLayer& nonSelfPaintingLayer =
       *toLayoutBoxModelObject(
            document().getElementById("non-self-painting-layer")->layoutObject())
            ->layer();
   ASSERT_FALSE(nonSelfPaintingLayer.isSelfPaintingLayer());
   ASSERT_TRUE(&nonSelfPaintingLayer == floatDiv.enclosingLayer());
 
@@ skipping 26 matching lines @@
       "  <div id='non-self-painting-layer' style='overflow: hidden'>"
       "    <span id='span' style='position: relative'>"
       "      <div id='float' style='width: 10px; height: 10px; "
       "background-color: blue; float: left'></div>"
       "    </span>"
       "  </div>"
       "</div>");
   document().view()->updateAllLifecyclePhases();
 
   LayoutObject& floatDiv = *document().getElementById("float")->layoutObject();
-  LayoutInline& span =
-      *toLayoutInline(document().getElementById("span")->layoutObject());
+  LayoutBoxModelObject& span = *toLayoutBoxModelObject(
+      document().getElementById("span")->layoutObject());
   PaintLayer& spanLayer = *span.layer();
   ASSERT_TRUE(&spanLayer == floatDiv.enclosingLayer());
   ASSERT_FALSE(spanLayer.needsPaintPhaseFloat());
-  LayoutBlock& selfPaintingLayerObject = *toLayoutBlock(
+  LayoutBoxModelObject& selfPaintingLayerObject = *toLayoutBoxModelObject(
       document().getElementById("self-painting-layer")->layoutObject());
   PaintLayer& selfPaintingLayer = *selfPaintingLayerObject.layer();
   ASSERT_TRUE(selfPaintingLayer.isSelfPaintingLayer());
   PaintLayer& nonSelfPaintingLayer =
       *toLayoutBoxModelObject(
            document().getElementById("non-self-painting-layer")->layoutObject())
            ->layer();
   ASSERT_FALSE(nonSelfPaintingLayer.isSelfPaintingLayer());
 
   EXPECT_TRUE(selfPaintingLayer.needsPaintPhaseFloat());
@@ skipping 15 matching lines @@
       "      <div id='background'></div>"
       "    </div>"
       "  </div>"
       "</div>");
   LayoutObject& backgroundDiv =
       *document().getElementById("background")->layoutObject();
   toHTMLElement(backgroundDiv.node())
       ->setAttribute(HTMLNames::styleAttr, styleWithoutBackground);
   document().view()->updateAllLifecyclePhases();
 
-  LayoutBlock& selfPaintingLayerObject = *toLayoutBlock(
+  LayoutBoxModelObject& selfPaintingLayerObject = *toLayoutBoxModelObject(
       document().getElementById("self-painting-layer")->layoutObject());
   PaintLayer& selfPaintingLayer = *selfPaintingLayerObject.layer();
   ASSERT_TRUE(selfPaintingLayer.isSelfPaintingLayer());
   PaintLayer& nonSelfPaintingLayer =
       *toLayoutBoxModelObject(
            document().getElementById("non-self-painting-layer")->layoutObject())
            ->layer();
   ASSERT_FALSE(nonSelfPaintingLayer.isSelfPaintingLayer());
   ASSERT_TRUE(&nonSelfPaintingLayer == backgroundDiv.enclosingLayer());
 
@@ skipping 38 matching lines @@
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnLayerRemoval) {
   setBodyInnerHTML(
       "<div id='layer' style='position: relative'>"
       "  <div style='height: 100px'>"
       "    <div style='height: 20px; outline: 1px solid red; background-color: "
       "green'>outline and background</div>"
       "    <div style='float: left'>float</div>"
       "  </div>"
       "</div>");
 
-  LayoutBlock& layerDiv =
-      *toLayoutBlock(document().getElementById("layer")->layoutObject());
+  LayoutBoxModelObject& layerDiv = *toLayoutBoxModelObject(
+      document().getElementById("layer")->layoutObject());
   PaintLayer& layer = *layerDiv.layer();
   ASSERT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(layer.needsPaintPhaseFloat());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 
   PaintLayer& htmlLayer =
-      *toLayoutBlock(document().documentElement()->layoutObject())->layer();
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
   EXPECT_FALSE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_FALSE(htmlLayer.needsPaintPhaseFloat());
   EXPECT_FALSE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 
   toHTMLElement(layerDiv.node())->setAttribute(HTMLNames::styleAttr, "");
   document().view()->updateAllLifecyclePhases();
 
   EXPECT_FALSE(layerDiv.hasLayer());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseFloat());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnLayerAddition) {
   setBodyInnerHTML(
       "<div id='will-be-layer'>"
       "  <div style='height: 100px'>"
       "    <div style='height: 20px; outline: 1px solid red; background-color: "
       "green'>outline and background</div>"
       "    <div style='float: left'>float</div>"
       "  </div>"
       "</div>");
 
-  LayoutBlock& layerDiv = *toLayoutBlock(
+  LayoutBoxModelObject& layerDiv = *toLayoutBoxModelObject(
       document().getElementById("will-be-layer")->layoutObject());
   EXPECT_FALSE(layerDiv.hasLayer());
 
   PaintLayer& htmlLayer =
-      *toLayoutBlock(document().documentElement()->layoutObject())->layer();
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseFloat());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 
   toHTMLElement(layerDiv.node())
       ->setAttribute(HTMLNames::styleAttr, "position: relative");
   document().view()->updateAllLifecyclePhases();
   ASSERT_TRUE(layerDiv.hasLayer());
   PaintLayer& layer = *layerDiv.layer();
   ASSERT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(layer.needsPaintPhaseFloat());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnBecomingSelfPainting) {
   setBodyInnerHTML(
       "<div id='will-be-self-painting' style='width: 100px; height: 100px; "
       "overflow: hidden'>"
       "  <div>"
       "    <div style='outline: 1px solid red; background-color: "
       "green'>outline and background</div>"
       "  </div>"
       "</div>");
 
-  LayoutBlock& layerDiv = *toLayoutBlock(
+  LayoutBoxModelObject& layerDiv = *toLayoutBoxModelObject(
       document().getElementById("will-be-self-painting")->layoutObject());
   ASSERT_TRUE(layerDiv.hasLayer());
   EXPECT_FALSE(layerDiv.layer()->isSelfPaintingLayer());
 
   PaintLayer& htmlLayer =
-      *toLayoutBlock(document().documentElement()->layoutObject())->layer();
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 
   toHTMLElement(layerDiv.node())
       ->setAttribute(
           HTMLNames::styleAttr,
           "width: 100px; height: 100px; overflow: hidden; position: relative");
   document().view()->updateAllLifecyclePhases();
   PaintLayer& layer = *layerDiv.layer();
   ASSERT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest, PaintPhasesUpdateOnBecomingNonSelfPainting) {
   setBodyInnerHTML(
       "<div id='will-be-non-self-painting' style='width: 100px; height: 100px; "
       "overflow: hidden; position: relative'>"
       "  <div>"
       "    <div style='outline: 1px solid red; background-color: "
       "green'>outline and background</div>"
       "  </div>"
       "</div>");
 
-  LayoutBlock& layerDiv = *toLayoutBlock(
+  LayoutBoxModelObject& layerDiv = *toLayoutBoxModelObject(
       document().getElementById("will-be-non-self-painting")->layoutObject());
   ASSERT_TRUE(layerDiv.hasLayer());
   PaintLayer& layer = *layerDiv.layer();
   EXPECT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 
   PaintLayer& htmlLayer =
-      *toLayoutBlock(document().documentElement()->layoutObject())->layer();
+      *toLayoutBoxModelObject(document().documentElement()->layoutObject())
+           ->layer();
   EXPECT_FALSE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_FALSE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 
   toHTMLElement(layerDiv.node())
       ->setAttribute(HTMLNames::styleAttr,
                      "width: 100px; height: 100px; overflow: hidden");
   document().view()->updateAllLifecyclePhases();
   EXPECT_FALSE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantOutlines());
   EXPECT_TRUE(htmlLayer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest,
        TableCollapsedBorderNeedsPaintPhaseDescendantBlockBackgrounds) {
   // TODO(wangxianzhu): Enable this test slimmingPaintInvalidation when its
   // fully functional.
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
     return;
 
   // "position: relative" makes the table and td self-painting layers.
   // The table's layer should be marked needsPaintPhaseDescendantBlockBackground
   // because it will paint collapsed borders in the phase.
   setBodyInnerHTML(
       "<table id='table' style='position: relative; border-collapse: collapse'>"
       "  <tr><td style='position: relative; border: 1px solid "
       "green'>Cell</td></tr>"
       "</table>");
 
-  LayoutBlock& table = *toLayoutBlock(getLayoutObjectByElementId("table"));
+  LayoutBoxModelObject& table =
+      *toLayoutBoxModelObject(getLayoutObjectByElementId("table"));
   ASSERT_TRUE(table.hasLayer());
   PaintLayer& layer = *table.layer();
   EXPECT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 TEST_P(PaintLayerPainterTest,
        TableCollapsedBorderNeedsPaintPhaseDescendantBlockBackgroundsDynamic) {
   // TODO(wangxianzhu): Enable this test slimmingPaintInvalidation when its
   // fully functional.
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
     return;
 
   setBodyInnerHTML(
       "<table id='table' style='position: relative'>"
       "  <tr><td style='position: relative; border: 1px solid "
       "green'>Cell</td></tr>"
       "</table>");
 
-  LayoutBlock& table = *toLayoutBlock(getLayoutObjectByElementId("table"));
+  LayoutBoxModelObject& table =
+      *toLayoutBoxModelObject(getLayoutObjectByElementId("table"));
   ASSERT_TRUE(table.hasLayer());
   PaintLayer& layer = *table.layer();
   EXPECT_TRUE(layer.isSelfPaintingLayer());
   EXPECT_FALSE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 
   toHTMLElement(table.node())
       ->setAttribute(HTMLNames::styleAttr,
                      "position: relative; border-collapse: collapse");
   document().view()->updateAllLifecyclePhases();
   EXPECT_TRUE(layer.needsPaintPhaseDescendantBlockBackgrounds());
 }
 
 }  // namespace blink