| Index: third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/FilterPainter.cpp b/third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| index ddd978be227bc06eb3b93cc18f584dd78a4a5f67..7eae18540e031b3e3781e17d788ab0f0559b7561 100644
|
| --- a/third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| @@ -13,8 +13,8 @@
|
| #include "platform/graphics/GraphicsLayer.h"
|
| #include "platform/graphics/filters/FilterEffect.h"
|
| #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
|
| -#include "platform/graphics/paint/DisplayItemList.h"
|
| #include "platform/graphics/paint/FilterDisplayItem.h"
|
| +#include "platform/graphics/paint/PaintController.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| #include "public/platform/WebFilterOperations.h"
|
| @@ -57,8 +57,8 @@ FilterPainter::FilterPainter(PaintLayer& layer, GraphicsContext* context, const
|
| }
|
|
|
| ASSERT(m_layoutObject);
|
| - ASSERT(context->displayItemList());
|
| - if (!context->displayItemList()->displayItemConstructionIsDisabled()) {
|
| + ASSERT(context->paintController());
|
| + if (!context->paintController()->displayItemConstructionIsDisabled()) {
|
| FilterOperations filterOperations(layer.computeFilterOperations(m_layoutObject->styleRef()));
|
| OwnPtr<WebFilterOperations> webFilterOperations = adoptPtr(Platform::current()->compositorSupport()->createFilterOperations());
|
| builder.buildFilterOperations(filterOperations, webFilterOperations.get());
|
| @@ -68,7 +68,7 @@ FilterPainter::FilterPainter(PaintLayer& layer, GraphicsContext* context, const
|
| // the layer's filter. See crbug.com/502026.
|
| if (webFilterOperations->isEmpty())
|
| return;
|
| - context->displayItemList()->createAndAppend<BeginFilterDisplayItem>(*m_layoutObject, imageFilter, FloatRect(rootRelativeBounds), webFilterOperations.release());
|
| + context->paintController()->createAndAppend<BeginFilterDisplayItem>(*m_layoutObject, imageFilter, FloatRect(rootRelativeBounds), webFilterOperations.release());
|
| }
|
|
|
| m_filterInProgress = true;
|
| @@ -79,8 +79,8 @@ FilterPainter::~FilterPainter()
|
| if (!m_filterInProgress)
|
| return;
|
|
|
| - ASSERT(m_context->displayItemList());
|
| - m_context->displayItemList()->endItem<EndFilterDisplayItem>(*m_layoutObject);
|
| + ASSERT(m_context->paintController());
|
| + m_context->paintController()->endItem<EndFilterDisplayItem>(*m_layoutObject);
|
| }
|
|
|
| } // namespace blink
|
|
|