Rename DisplayItemList to PaintController

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.h

 // 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.
 
-#ifndef DisplayItemListPaintTest_h
-#define DisplayItemListPaintTest_h
+#ifndef PaintControllerPaintTest_h
+#define PaintControllerPaintTest_h
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
-class DisplayItemListPaintTest : public RenderingTest {
+class PaintControllerPaintTest : public RenderingTest {
 public:
-    DisplayItemListPaintTest()
+    PaintControllerPaintTest()
         : m_originalSlimmingPaintSubsequenceCachingEnabled(RuntimeEnabledFeatures::slimmingPaintSubsequenceCachingEnabled())
         , m_originalSlimmingPaintOffsetCachingEnabled(RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled())
         { }
 
 protected:
     LayoutView& layoutView() { return *document().layoutView(); }
-    DisplayItemList& rootDisplayItemList() { return *layoutView().layer()->graphicsLayerBacking()->displayItemList(); }
+    PaintController& rootPaintController() { return *layoutView().layer()->graphicsLayerBacking()->paintController(); }
 
 private:
     void SetUp() override
     {
         RenderingTest::SetUp();
         enableCompositing();
     }
     void TearDown() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(m_originalSlimmingPaintSubsequenceCachingEnabled);
         RuntimeEnabledFeatures::setSlimmingPaintOffsetCachingEnabled(m_originalSlimmingPaintOffsetCachingEnabled);
     }
 
     bool m_originalSlimmingPaintSubsequenceCachingEnabled;
     bool m_originalSlimmingPaintOffsetCachingEnabled;
 };
 
 // Slimming paint v2 has subtly different behavior on some paint tests. This
 // class is used to test only v2 behavior while maintaining v1 test coverage.
-class DisplayItemListPaintTestForSlimmingPaintV2 : public RenderingTest {
+class PaintControllerPaintTestForSlimmingPaintV2 : public RenderingTest {
 public:
-    DisplayItemListPaintTestForSlimmingPaintV2()
+    PaintControllerPaintTestForSlimmingPaintV2()
         : m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { }
 
 protected:
     LayoutView& layoutView() { return *document().layoutView(); }
-    DisplayItemList& rootDisplayItemList() { return *layoutView().layer()->graphicsLayerBacking()->displayItemList(); }
+    PaintController& rootPaintController() { return *layoutView().layer()->graphicsLayerBacking()->paintController(); }
     void setNeedsDisplayForRoot()
     {
         layoutView().layer()->graphicsLayerBacking()->setNeedsDisplay();
     }
     void setNeedsDisplayWithoutInvalidationForRoot()
     {
         layoutView().layer()->graphicsLayerBacking()->setNeedsDisplayWithoutInvalidateForTesting();
     }
 
     // Expose some document lifecycle steps for checking new display items before commiting.
@@ skipping 58 matching lines @@
 const DisplayItem::Type backgroundType = DisplayItem::BoxDecorationBackground;
 const DisplayItem::Type cachedBackgroundType = DisplayItem::drawingTypeToCachedDrawingType(backgroundType);
 const DisplayItem::Type foregroundType = DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground);
 const DisplayItem::Type cachedForegroundType = DisplayItem::drawingTypeToCachedDrawingType(foregroundType);
 const DisplayItem::Type subsequenceType = DisplayItem::SubsequenceNormalFlowAndPositiveZOrder;
 const DisplayItem::Type endSubsequenceType = DisplayItem::subsequenceTypeToEndSubsequenceType(subsequenceType);
 const DisplayItem::Type cachedSubsequenceType = DisplayItem::subsequenceTypeToCachedSubsequenceType(subsequenceType);
 
 } // namespace blink
 
-#endif // DisplayItemListPaintTest_h
+#endif // PaintControllerPaintTest_h