Revert "Remove OwnPtr from Blink."

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #ifndef ImageFrameGenerator_h
 #define ImageFrameGenerator_h
 
 #include "platform/PlatformExport.h"
 #include "platform/image-decoders/SegmentReader.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 class SkData;
 struct SkYUVSizeInfo;
 
 namespace blink {
 
 class ImageDecoder;
 
 class PLATFORM_EXPORT ImageDecoderFactory {
     USING_FAST_MALLOC(ImageDecoderFactory);
     WTF_MAKE_NONCOPYABLE(ImageDecoderFactory);
 public:
     ImageDecoderFactory() {}
     virtual ~ImageDecoderFactory() { }
-    virtual std::unique_ptr<ImageDecoder> create() = 0;
+    virtual PassOwnPtr<ImageDecoder> create() = 0;
 };
 
 class PLATFORM_EXPORT ImageFrameGenerator final : public ThreadSafeRefCounted<ImageFrameGenerator> {
     WTF_MAKE_NONCOPYABLE(ImageFrameGenerator);
 public:
     static PassRefPtr<ImageFrameGenerator> create(const SkISize& fullSize, bool isMultiFrame = false)
     {
         return adoptRef(new ImageFrameGenerator(fullSize, isMultiFrame));
     }
 
@@ skipping 20 matching lines @@
     // Must not be called unless the SkROBuffer has all the data.
     // YUV decoding does not currently support progressive decoding. See comment above on decodeToYUV.
     bool getYUVComponentSizes(SegmentReader*, SkYUVSizeInfo*);
 
 private:
     ImageFrameGenerator(const SkISize& fullSize, bool isMultiFrame);
 
     friend class ImageFrameGeneratorTest;
     friend class DeferredImageDecoderTest;
     // For testing. |factory| will overwrite the default ImageDecoder creation logic if |factory->create()| returns non-zero.
-    void setImageDecoderFactory(std::unique_ptr<ImageDecoderFactory> factory) { m_imageDecoderFactory = std::move(factory); }
+    void setImageDecoderFactory(PassOwnPtr<ImageDecoderFactory> factory) { m_imageDecoderFactory = std::move(factory); }
 
     void setHasAlpha(size_t index, bool hasAlpha);
 
     SkBitmap tryToResumeDecode(SegmentReader*, bool allDataReceived, size_t index, const SkISize& scaledSize, SkBitmap::Allocator*);
     // This method should only be called while m_decodeMutex is locked.
     bool decode(SegmentReader*, bool allDataReceived, size_t index, ImageDecoder**, SkBitmap*, SkBitmap::Allocator*);
 
     const SkISize m_fullSize;
 
     const bool m_isMultiFrame;
     bool m_decodeFailed;
     bool m_yuvDecodingFailed;
     size_t m_frameCount;
     Vector<bool> m_hasAlpha;
 
-    std::unique_ptr<ImageDecoderFactory> m_imageDecoderFactory;
+    OwnPtr<ImageDecoderFactory> m_imageDecoderFactory;
 
     // Prevents multiple decode operations on the same data.
     Mutex m_decodeMutex;
 
     // Protect concurrent access to m_hasAlpha.
     Mutex m_alphaMutex;
 };
 
 } // namespace blink
 
 #endif