Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp |
index c19292b1199f3cb2299440c2d9fd2a4101fcbdc6..6784aee8ba9080987e9659001c1479f9a0b90632 100644 |
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp |
@@ -11,12 +11,13 @@ |
#include "platform/graphics/ImageBuffer.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "third_party/skia/include/core/SkPictureRecorder.h" |
-#include "wtf/PassOwnPtr.h" |
#include "wtf/PassRefPtr.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
-RecordingImageBufferSurface::RecordingImageBufferSurface(const IntSize& size, PassOwnPtr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory, OpacityMode opacityMode) |
+RecordingImageBufferSurface::RecordingImageBufferSurface(const IntSize& size, std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory, OpacityMode opacityMode) |
: ImageBufferSurface(size, opacityMode) |
, m_imageBuffer(0) |
, m_currentFramePixelCount(0) |
@@ -36,7 +37,7 @@ RecordingImageBufferSurface::~RecordingImageBufferSurface() |
void RecordingImageBufferSurface::initializeCurrentFrame() |
{ |
static SkRTreeFactory rTreeFactory; |
- m_currentFrame = adoptPtr(new SkPictureRecorder); |
+ m_currentFrame = wrapUnique(new SkPictureRecorder); |
m_currentFrame->beginRecording(size().width(), size().height(), &rTreeFactory); |
if (m_imageBuffer) { |
m_imageBuffer->resetCanvas(m_currentFrame->getRecordingCanvas()); |