| Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
|
| index 011073e3d2b4bee7cd7c0eaabcd44efbbd7d4d00..257a9316fad7bbcf65d7f225b9af1cb41401b1e1 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h
|
| @@ -10,8 +10,8 @@
|
| #include "public/platform/WebThread.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/RefPtr.h"
|
| +#include <memory>
|
|
|
| class SkCanvas;
|
| class SkPicture;
|
| @@ -26,7 +26,7 @@ class RecordingImageBufferFallbackSurfaceFactory {
|
| USING_FAST_MALLOC(RecordingImageBufferFallbackSurfaceFactory);
|
| WTF_MAKE_NONCOPYABLE(RecordingImageBufferFallbackSurfaceFactory);
|
| public:
|
| - virtual PassOwnPtr<ImageBufferSurface> createSurface(const IntSize&, OpacityMode) = 0;
|
| + virtual std::unique_ptr<ImageBufferSurface> createSurface(const IntSize&, OpacityMode) = 0;
|
| virtual ~RecordingImageBufferFallbackSurfaceFactory() { }
|
| protected:
|
| RecordingImageBufferFallbackSurfaceFactory() { }
|
| @@ -39,7 +39,7 @@ public:
|
| // for one frame and should not be used for any operations which need a
|
| // raster surface, (i.e. writePixels).
|
| // Only #getPicture should be used to access the resulting frame.
|
| - RecordingImageBufferSurface(const IntSize&, PassOwnPtr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory = nullptr, OpacityMode = NonOpaque);
|
| + RecordingImageBufferSurface(const IntSize&, std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory = nullptr, OpacityMode = NonOpaque);
|
| ~RecordingImageBufferSurface() override;
|
|
|
| // Implementation of ImageBufferSurface interfaces
|
| @@ -94,9 +94,9 @@ private:
|
| bool finalizeFrameInternal(FallbackReason*);
|
| int approximateOpCount();
|
|
|
| - OwnPtr<SkPictureRecorder> m_currentFrame;
|
| + std::unique_ptr<SkPictureRecorder> m_currentFrame;
|
| RefPtr<SkPicture> m_previousFrame;
|
| - OwnPtr<ImageBufferSurface> m_fallbackSurface;
|
| + std::unique_ptr<ImageBufferSurface> m_fallbackSurface;
|
| ImageBuffer* m_imageBuffer;
|
| int m_initialSaveCount;
|
| int m_currentFramePixelCount;
|
| @@ -105,7 +105,7 @@ private:
|
| bool m_didRecordDrawCommandsInCurrentFrame;
|
| bool m_currentFrameHasExpensiveOp;
|
| bool m_previousFrameHasExpensiveOp;
|
| - OwnPtr<RecordingImageBufferFallbackSurfaceFactory> m_fallbackFactory;
|
| + std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> m_fallbackFactory;
|
| };
|
|
|
| } // namespace blink
|
|
|