Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef RecordingImageBufferSurface_h
 #define RecordingImageBufferSurface_h
 
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #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;
 class SkPictureRecorder;
 
 namespace blink {
 
 class ImageBuffer;
 class RecordingImageBufferSurfaceTest;
 
 class RecordingImageBufferFallbackSurfaceFactory {
     USING_FAST_MALLOC(RecordingImageBufferFallbackSurfaceFactory);
     WTF_MAKE_NONCOPYABLE(RecordingImageBufferFallbackSurfaceFactory);
 public:
-    virtual std::unique_ptr<ImageBufferSurface> createSurface(const IntSize&, OpacityMode) = 0;
+    virtual PassOwnPtr<ImageBufferSurface> createSurface(const IntSize&, OpacityMode) = 0;
     virtual ~RecordingImageBufferFallbackSurfaceFactory() { }
 protected:
     RecordingImageBufferFallbackSurfaceFactory() { }
 };
 
 class PLATFORM_EXPORT RecordingImageBufferSurface : public ImageBufferSurface {
     WTF_MAKE_NONCOPYABLE(RecordingImageBufferSurface); USING_FAST_MALLOC(RecordingImageBufferSurface);
 public:
     // If the fallbackFactory is null the buffer surface should only be used
     // 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&, std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory = nullptr, OpacityMode = NonOpaque);
+    RecordingImageBufferSurface(const IntSize&, PassOwnPtr<RecordingImageBufferFallbackSurfaceFactory> fallbackFactory = nullptr, OpacityMode = NonOpaque);
     ~RecordingImageBufferSurface() override;
 
     // Implementation of ImageBufferSurface interfaces
     SkCanvas* canvas() override;
     void disableDeferral(DisableDeferralReason) override;
     PassRefPtr<SkPicture> getPicture() override;
     void flush(FlushReason) override;
     void didDraw(const FloatRect&) override;
     bool isValid() const override { return true; }
     bool isRecording() const override { return !m_fallbackSurface; }
@@ skipping 34 matching lines @@
         FallbackReasonSubPixelTextAntiAliasingSupport = 18,
         FallbackReasonCount,
     };
 private:
     friend class RecordingImageBufferSurfaceTest; // for unit testing
     void fallBackToRasterCanvas(FallbackReason);
     void initializeCurrentFrame();
     bool finalizeFrameInternal(FallbackReason*);
     int approximateOpCount();
 
-    std::unique_ptr<SkPictureRecorder> m_currentFrame;
+    OwnPtr<SkPictureRecorder> m_currentFrame;
     RefPtr<SkPicture> m_previousFrame;
-    std::unique_ptr<ImageBufferSurface> m_fallbackSurface;
+    OwnPtr<ImageBufferSurface> m_fallbackSurface;
     ImageBuffer* m_imageBuffer;
     int m_initialSaveCount;
     int m_currentFramePixelCount;
     int m_previousFramePixelCount;
     bool m_frameWasCleared;
     bool m_didRecordDrawCommandsInCurrentFrame;
     bool m_currentFrameHasExpensiveOp;
     bool m_previousFrameHasExpensiveOp;
-    std::unique_ptr<RecordingImageBufferFallbackSurfaceFactory> m_fallbackFactory;
+    OwnPtr<RecordingImageBufferFallbackSurfaceFactory> m_fallbackFactory;
 };
 
 } // namespace blink
 
 #endif