Move rendering/RenderObject to layout/LayoutObject.

Source/core/paint/ViewDisplayListTest.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/compositing/LayerCompositor.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/paint/LayerClipRecorder.h"
 #include "core/paint/LayerPainter.h"
@@ skipping 34 matching lines @@
     {
         RuntimeEnabledFeatures::setSlimmingPaintEnabled(false);
         RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(false);
     }
 
     RenderView* m_renderView;
 };
 
 class TestDisplayItem : public DisplayItem {
 public:
-    TestDisplayItem(const RenderObject* renderer, Type type) : DisplayItem(renderer->displayItemClient(), type) { }
+    TestDisplayItem(const LayoutObject* renderer, Type type) : DisplayItem(renderer->displayItemClient(), type) { }
     TestDisplayItem(DisplayItemClient displayItemClient, Type type) : DisplayItem(displayItemClient, type) { }
 
     virtual void replay(GraphicsContext*) override final { ASSERT_NOT_REACHED(); }
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override final { ASSERT_NOT_REACHED(); }
 };
 
 #ifndef NDEBUG
 #define TRACE_DISPLAY_ITEMS(expected, actual) \
     String trace = "Expected: " + (expected).asDebugString() + " Actual: " + (actual).asDebugString(); \
     SCOPED_TRACE(trace.utf8().data());
 #else
 #define TRACE_DISPLAY_ITEMS(expected, actual)
 #endif
 
 #define EXPECT_DISPLAY_LIST(actual, expectedSize, ...) { \
     EXPECT_EQ((size_t)expectedSize, actual.size()); \
     const TestDisplayItem expected[] = { __VA_ARGS__ }; \
     for (size_t index = 0; index < std::min<size_t>(actual.size(), expectedSize); index++) { \
         TRACE_DISPLAY_ITEMS(expected[index], *actual[index]); \
         EXPECT_EQ(expected[index].client(), actual[index]->client()); \
         EXPECT_EQ(expected[index].type(), actual[index]->type()); \
     } \
 }
 
-void drawRect(GraphicsContext* context, RenderObject* renderer, PaintPhase phase, const FloatRect& bound)
+void drawRect(GraphicsContext* context, LayoutObject* renderer, PaintPhase phase, const FloatRect& bound)
 {
     RenderDrawingRecorder drawingRecorder(context, *renderer, phase, bound);
     if (drawingRecorder.canUseCachedDrawing())
         return;
     IntRect rect(0, 0, 10, 10);
     context->drawRect(rect);
 }
 
 void drawClippedRect(GraphicsContext* context, LayoutLayerModelObject* renderer, PaintPhase phase, const FloatRect& bound)
 {
@@ skipping 13 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(renderView(), DisplayItem::ClipLayerForeground),
         TestDisplayItem(renderView(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(renderView(), DisplayItem::clipTypeToEndClipType(DisplayItem::ClipLayerForeground)));
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_UpdateBasic)
 {
     setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->firstChild()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->firstChild()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 300, 300));
     drawRect(&context, second, PaintPhaseChildBlockBackground, FloatRect(100, 100, 200, 200));
     drawRect(&context, first, PaintPhaseOutline, FloatRect(100, 100, 300, 300));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseChildBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 
     rootDisplayItemList().invalidate(second->displayItemClient());
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 300, 300));
     drawRect(&context, first, PaintPhaseOutline, FloatRect(100, 100, 300, 300));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_UpdateSwapOrder)
 {
     setBodyInnerHTML("<div id='first'><div id='second'></div></div><div id='unaffected'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->firstChild()->renderer();
-    RenderObject* unaffected = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->firstChild()->renderer();
+    LayoutObject* unaffected = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
     drawRect(&context, unaffected, PaintPhaseBlockBackground, FloatRect(300, 300, 10, 10));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(unaffected, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)));
 
     rootDisplayItemList().invalidate(second->displayItemClient());
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
     drawRect(&context, unaffected, PaintPhaseBlockBackground, FloatRect(300, 300, 10, 10));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(unaffected, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)));
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_UpdateNewItemInMiddle)
 {
     setBodyInnerHTML("<div id='first'><div id='second'><div id='third'></div></div></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->firstChild()->renderer();
-    RenderObject* third = document().body()->firstChild()->firstChild()->firstChild()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->firstChild()->renderer();
+    LayoutObject* third = document().body()->firstChild()->firstChild()->firstChild()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)));
 
     rootDisplayItemList().invalidate(third->displayItemClient());
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
     drawRect(&context, third, PaintPhaseBlockBackground, FloatRect(125, 100, 200, 50));
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(third, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)));
 }
 
 TEST_F(ViewDisplayListTest, ViewDisplayListTest_UpdateInvalidationWithPhases)
 {
     setBodyInnerHTML("<div id='first'><div id='second'></div></div><div id='third'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->firstChild()->renderer();
-    RenderObject* third = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->firstChild()->renderer();
+    LayoutObject* third = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 100, 100));
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 200));
     drawRect(&context, third, PaintPhaseBlockBackground, FloatRect(300, 100, 50, 50));
     drawRect(&context, first, PaintPhaseForeground, FloatRect(100, 100, 100, 100));
     drawRect(&context, second, PaintPhaseForeground, FloatRect(100, 100, 50, 200));
     drawRect(&context, third, PaintPhaseForeground, FloatRect(300, 100, 50, 50));
     drawRect(&context, first, PaintPhaseOutline, FloatRect(100, 100, 100, 100));
     drawRect(&context, second, PaintPhaseOutline, FloatRect(100, 100, 50, 200));
@@ skipping 45 matching lines @@
         TestDisplayItem(third, DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)),
         TestDisplayItem(third, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 #endif
 }
 
 // This test is only applicable when we support incremental paint.
 TEST_F(ViewDisplayListTest, DISABLED_ViewDisplayListTest_UpdateAddFirstNoOverlap)
 {
     setBodyInnerHTML("<div id='first'></div><div id='second'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(200, 200, 50, 50));
     drawRect(&context, second, PaintPhaseOutline, FloatRect(200, 200, 50, 50));
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 
     rootDisplayItemList().invalidate(first->displayItemClient());
@@ skipping 10 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 }
 
 // This test is only applicable when we support incremental paint.
 TEST_F(ViewDisplayListTest, DISABLED_ViewDisplayListTest_UpdateAddFirstOverlap)
 {
     setBodyInnerHTML("<div id='first'></div><div id='second'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, second, PaintPhaseBlockBackground, FloatRect(200, 200, 50, 50));
     drawRect(&context, second, PaintPhaseOutline, FloatRect(200, 200, 50, 50));
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 
     rootDisplayItemList().invalidate(first->displayItemClient());
@@ skipping 15 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(second, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 }
 
 // This test is only applicable when we support incremental paint.
 TEST_F(ViewDisplayListTest, DISABLED_ViewDisplayListTest_UpdateAddLastNoOverlap)
 {
     setBodyInnerHTML("<div id='first'></div><div id='second'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 50, 50));
     drawRect(&context, first, PaintPhaseOutline, FloatRect(100, 100, 50, 50));
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 
     rootDisplayItemList().invalidate(second->displayItemClient());
@@ skipping 10 matching lines @@
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 }
 
 // This test is only applicable when we support incremental paint.
 TEST_F(ViewDisplayListTest, DISABLED_ViewDisplayListTest_UpdateAddLastOverlap)
 {
     setBodyInnerHTML("<div id='first'></div><div id='second'></div>");
-    RenderObject* first = document().body()->firstChild()->renderer();
-    RenderObject* second = document().body()->firstChild()->nextSibling()->renderer();
+    LayoutObject* first = document().body()->firstChild()->renderer();
+    LayoutObject* second = document().body()->firstChild()->nextSibling()->renderer();
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, first, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));
     drawRect(&context, first, PaintPhaseOutline, FloatRect(100, 100, 150, 150));
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseBlockBackground)),
         TestDisplayItem(first, DisplayItem::paintPhaseToDrawingType(PaintPhaseOutline)));
 
     rootDisplayItemList().invalidate(first->displayItemClient());
@@ skipping 107 matching lines @@
     rootDisplayItemList().invalidateAll();
     EXPECT_FALSE(rootDisplayItemList().clientCacheIsValid(firstRenderer->displayItemClient()));
     EXPECT_FALSE(rootDisplayItemList().clientCacheIsValid(secondRenderer->displayItemClient()));
 }
 
 TEST_F(ViewDisplayListTest, FullDocumentPaintingWithCaret)
 {
     setBodyInnerHTML("<div id='div' contentEditable='true'>XYZ</div>");
     RenderView* renderView = document().renderView();
     Layer* rootLayer = renderView->layer();
-    RenderObject* htmlRenderer = document().documentElement()->renderer();
+    LayoutObject* htmlRenderer = document().documentElement()->renderer();
     Element* div = toElement(document().body()->firstChild());
-    RenderObject* divRenderer = document().body()->firstChild()->renderer();
+    LayoutObject* divRenderer = document().body()->firstChild()->renderer();
     InlineTextBox* textInlineBox = toRenderText(div->firstChild()->renderer())->firstTextBox();
 
     SkCanvas canvas(800, 600);
     GraphicsContext context(&canvas, &rootDisplayItemList());
     LayerPaintingInfo paintingInfo(rootLayer, LayoutRect(0, 0, 800, 600), PaintBehaviorNormal, LayoutSize());
     LayerPainter(*rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 2,
         TestDisplayItem(htmlRenderer, DisplayItem::BoxDecorationBackground),
         TestDisplayItem(textInlineBox->displayItemClient(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)));
 
     div->focus();
     document().view()->updateLayoutAndStyleForPainting();
     LayerPainter(*rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
     rootDisplayItemList().endNewPaints();
 
     EXPECT_DISPLAY_LIST(rootDisplayItemList().paintList(), 3,
         TestDisplayItem(htmlRenderer, DisplayItem::BoxDecorationBackground),
         TestDisplayItem(textInlineBox->displayItemClient(), DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground)),
         TestDisplayItem(divRenderer, DisplayItem::Caret));
 }
 
 } // anonymous namespace
 } // namespace blink