Rename DisplayItemList to PaintController

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

Index: third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
diff --git a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
index d8ed29bbc1e1a5da771c0866b7ea1475d03bf53b..70da1f826c82e611426d65f83f7579f92b370fe0 100644
--- a/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
+++ b/third_party/WebKit/Source/core/paint/RoundedInnerRectClipper.cpp
@@ -8,15 +8,15 @@
 #include "core/layout/LayoutBox.h"
 #include "core/paint/PaintInfo.h"
 #include "platform/graphics/paint/ClipDisplayItem.h"
-#include "platform/graphics/paint/DisplayItemList.h"
+#include "platform/graphics/paint/PaintController.h"
 
 namespace blink {
 
 RoundedInnerRectClipper::RoundedInnerRectClipper(const LayoutObject& layoutObject, const PaintInfo& paintInfo, const LayoutRect& rect, const FloatRoundedRect& clipRect, RoundedInnerRectClipperBehavior behavior)
     : m_layoutObject(layoutObject)
     , m_paintInfo(paintInfo)
-    , m_useDisplayItemList(behavior == ApplyToDisplayListIfEnabled)
-    , m_clipType(m_useDisplayItemList ? m_paintInfo.displayItemTypeForClipping() : DisplayItem::ClipBoxPaintPhaseFirst)
+    , m_usePaintController(behavior == ApplyToDisplayListIfEnabled)
+    , m_clipType(m_usePaintController ? m_paintInfo.displayItemTypeForClipping() : DisplayItem::ClipBoxPaintPhaseFirst)
 {
     Vector<FloatRoundedRect> roundedRectClips;
     if (clipRect.isRenderable()) {
@@ -48,9 +48,9 @@ RoundedInnerRectClipper::RoundedInnerRectClipper(const LayoutObject& layoutObjec
         }
     }
 
-    if (m_useDisplayItemList) {
-        ASSERT(m_paintInfo.context->displayItemList());
-        m_paintInfo.context->displayItemList()->createAndAppend<ClipDisplayItem>(layoutObject, m_clipType, LayoutRect::infiniteIntRect(), roundedRectClips);
+    if (m_usePaintController) {
+        ASSERT(m_paintInfo.context->paintController());
+        m_paintInfo.context->paintController()->createAndAppend<ClipDisplayItem>(layoutObject, m_clipType, LayoutRect::infiniteIntRect(), roundedRectClips);
     } else {
         ClipDisplayItem clipDisplayItem(layoutObject, m_clipType, LayoutRect::infiniteIntRect(), roundedRectClips);
         clipDisplayItem.replay(*paintInfo.context);
@@ -60,9 +60,9 @@ RoundedInnerRectClipper::RoundedInnerRectClipper(const LayoutObject& layoutObjec
 RoundedInnerRectClipper::~RoundedInnerRectClipper()
 {
     DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipType);
-    if (m_useDisplayItemList) {
-        ASSERT(m_paintInfo.context->displayItemList());
-        m_paintInfo.context->displayItemList()->endItem<EndClipDisplayItem>(m_layoutObject, endType);
+    if (m_usePaintController) {
+        ASSERT(m_paintInfo.context->paintController());
+        m_paintInfo.context->paintController()->endItem<EndClipDisplayItem>(m_layoutObject, endType);
     } else {
         EndClipDisplayItem endClipDisplayItem(m_layoutObject, endType);
         endClipDisplayItem.replay(*m_paintInfo.context);