| 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 eb90aaa825977b43446e3ba883fba906284f7a4d..53af1a0d9b1d259c9c86ec44ebdcac1efd731faa 100644
|
| --- a/third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/FilterPainter.cpp
|
| @@ -18,6 +18,8 @@
|
| #include "platform/graphics/paint/PaintController.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebCompositorSupport.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -55,13 +57,13 @@ FilterPainter::FilterPainter(PaintLayer& layer, GraphicsContext& context, const
|
| paintingInfo.clipToDirtyRect = false;
|
|
|
| if (clipRect.rect() != paintingInfo.paintDirtyRect || clipRect.hasRadius()) {
|
| - m_clipRecorder = adoptPtr(new LayerClipRecorder(context, *layer.layoutObject(), DisplayItem::ClipLayerFilter, clipRect, &paintingInfo, LayoutPoint(), paintFlags));
|
| + m_clipRecorder = wrapUnique(new LayerClipRecorder(context, *layer.layoutObject(), DisplayItem::ClipLayerFilter, clipRect, &paintingInfo, LayoutPoint(), paintFlags));
|
| }
|
|
|
| ASSERT(m_layoutObject);
|
| if (!context.getPaintController().displayItemConstructionIsDisabled()) {
|
| FilterOperations filterOperations(layer.computeFilterOperations(m_layoutObject->styleRef()));
|
| - OwnPtr<CompositorFilterOperations> compositorFilterOperations = adoptPtr(CompositorFactory::current().createFilterOperations());
|
| + std::unique_ptr<CompositorFilterOperations> compositorFilterOperations = wrapUnique(CompositorFactory::current().createFilterOperations());
|
| SkiaImageFilterBuilder::buildFilterOperations(filterOperations, compositorFilterOperations.get());
|
| // FIXME: It's possible to have empty CompositorFilterOperations here even
|
| // though the SkImageFilter produced above is non-null, since the
|
|
|