| Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| index 4f8528103015564736dc1fdef67315cc0f8fb22c..60a312db81b98cc51789abec153291c9a588fe93 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -61,7 +61,7 @@
|
| #include "platform/graphics/BitmapImage.h"
|
| #include "platform/graphics/GraphicsContext.h"
|
| #include "platform/graphics/paint/ClipDisplayItem.h"
|
| -#include "platform/graphics/paint/DisplayItemList.h"
|
| +#include "platform/graphics/paint/PaintController.h"
|
| #include "platform/graphics/paint/TransformDisplayItem.h"
|
| #include "wtf/CurrentTime.h"
|
| #include "wtf/text/StringBuilder.h"
|
| @@ -2143,13 +2143,13 @@ void CompositedLayerMapping::doPaintTask(const GraphicsLayerPaintInfo& paintInfo
|
| // FIXME: Combine similar code here and LayerClipRecorder.
|
| dirtyRect.intersect(paintInfo.localClipRectForSquashedLayer);
|
| {
|
| - ASSERT(context->displayItemList());
|
| - context->displayItemList()->createAndAppend<ClipDisplayItem>(*this, DisplayItem::ClipLayerOverflowControls, dirtyRect);
|
| + ASSERT(context->paintController());
|
| + context->paintController()->createAndAppend<ClipDisplayItem>(*this, DisplayItem::ClipLayerOverflowControls, dirtyRect);
|
| }
|
| PaintLayerPainter(*paintInfo.paintLayer).paintLayer(context, paintingInfo, paintLayerFlags);
|
| {
|
| - ASSERT(context->displayItemList());
|
| - context->displayItemList()->endItem<EndClipDisplayItem>(*this, DisplayItem::clipTypeToEndClipType(DisplayItem::ClipLayerOverflowControls));
|
| + ASSERT(context->paintController());
|
| + context->paintController()->endItem<EndClipDisplayItem>(*this, DisplayItem::clipTypeToEndClipType(DisplayItem::ClipLayerOverflowControls));
|
| }
|
| }
|
| }
|
|
|