Rename DisplayItemList to PaintController

third_party/WebKit/Source/core/paint/SVGClipPainter.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 "config.h"
 #include "core/paint/SVGClipPainter.h"
 
 #include "core/dom/ElementTraversal.h"
 #include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/CompositingRecorder.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/CompositingDisplayItem.h"
-#include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
+#include "platform/graphics/paint/PaintController.h"
 
 namespace blink {
 
 namespace {
 
 class SVGClipExpansionCycleHelper {
 public:
     SVGClipExpansionCycleHelper(LayoutSVGResourceClipper& clip) : m_clip(clip) { clip.beginClipExpansion(); }
     ~SVGClipExpansionCycleHelper() { m_clip.endClipExpansion(); }
 private:
@@ skipping 22 matching lines @@
     // userSpaceOnUse units (the zoom is accounted for objectBoundingBox-resolved lengths).
     if (!target.isSVG() && m_clip.clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
         ASSERT(m_clip.style());
         animatedLocalTransform.scale(m_clip.style()->effectiveZoom());
     }
 
     // First, try to apply the clip as a clipPath.
     Path clipPath;
     if (m_clip.asPath(animatedLocalTransform, targetBoundingBox, clipPath)) {
         clipperState = ClipperAppliedPath;
-        ASSERT(context->displayItemList());
-        context->displayItemList()->createAndAppend<BeginClipPathDisplayItem>(target, clipPath);
+        ASSERT(context->paintController());
+        context->paintController()->createAndAppend<BeginClipPathDisplayItem>(target, clipPath);
         return true;
     }
 
     // Fall back to masking.
     clipperState = ClipperAppliedMask;
 
     // Begin compositing the clip mask.
     CompositingRecorder::beginCompositing(*context, target, SkXfermode::kSrcOver_Mode, 1, &paintInvalidationRect);
     {
         TransformRecorder recorder(*context, target, animatedLocalTransform);
@@ skipping 18 matching lines @@
     CompositingRecorder::beginCompositing(*context, target, SkXfermode::kSrcIn_Mode, 1, &paintInvalidationRect);
 
     return true;
 }
 
 void SVGClipPainter::finishEffect(const LayoutObject& target, GraphicsContext* context, ClipperState& clipperState)
 {
     switch (clipperState) {
     case ClipperAppliedPath:
         // Path-only clipping, no layers to restore but we need to emit an end to the clip path display item.
-        ASSERT(context->displayItemList());
-        context->displayItemList()->endItem<EndClipPathDisplayItem>(target);
+        ASSERT(context->paintController());
+        context->paintController()->endItem<EndClipPathDisplayItem>(target);
         break;
     case ClipperAppliedMask:
         // Transfer content -> clip mask (SrcIn)
         CompositingRecorder::endCompositing(*context, target);
 
         // Transfer clip mask -> bg (SrcOver)
         CompositingRecorder::endCompositing(*context, target);
         break;
     default:
         ASSERT_NOT_REACHED();
@@ skipping 11 matching lines @@
         return;
 
     LayoutObjectDrawingRecorder drawingRecorder(*context, layoutObject, DisplayItem::SVGClip, targetPaintInvalidationRect, LayoutPoint());
     context->save();
     context->concatCTM(contentTransformation);
     context->drawPicture(clipContentPicture.get());
     context->restore();
 }
 
 }