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 41b9732ba8403fe7df057ecfe472eb43333b6cf4..bccab959f603198b352780d5bd76a37c88fea471 100644 |
--- a/third_party/WebKit/Source/core/paint/FilterPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/FilterPainter.cpp |
@@ -17,6 +17,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 { |
@@ -54,13 +56,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 = CompositorFilterOperations::create(); |
+ std::unique_ptr<CompositorFilterOperations> compositorFilterOperations = CompositorFilterOperations::create(); |
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 |