Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 21 matching lines @@
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "platform/image-decoders/png/PNGImageDecoder.h"
 
 #include "png.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 #if !defined(PNG_LIBPNG_VER_MAJOR) || !defined(PNG_LIBPNG_VER_MINOR)
 #error version error: compile against a versioned libpng.
 #endif
 #if USE(QCMSLIB)
 #include "qcms.h"
 #endif
 
 #if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)
 #define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
@@ skipping 83 matching lines @@
     png_infop infoPtr() const { return m_info; }
 
     size_t getReadOffset() const { return m_readOffset; }
     void setReadOffset(size_t offset) { m_readOffset = offset; }
     size_t currentBufferSize() const { return m_currentBufferSize; }
     bool decodingSizeOnly() const { return m_decodingSizeOnly; }
     void setHasAlpha(bool hasAlpha) { m_hasAlpha = hasAlpha; }
     bool hasAlpha() const { return m_hasAlpha; }
 
     png_bytep interlaceBuffer() const { return m_interlaceBuffer.get(); }
-    void createInterlaceBuffer(int size) { m_interlaceBuffer = wrapArrayUnique(new png_byte[size]); }
+    void createInterlaceBuffer(int size) { m_interlaceBuffer = adoptArrayPtr(new png_byte[size]); }
 #if USE(QCMSLIB)
     png_bytep rowBuffer() const { return m_rowBuffer.get(); }
-    void createRowBuffer(int size) { m_rowBuffer = wrapArrayUnique(new png_byte[size]); }
+    void createRowBuffer(int size) { m_rowBuffer = adoptArrayPtr(new png_byte[size]); }
 #endif
 
 private:
     png_structp m_png;
     png_infop m_info;
     PNGImageDecoder* m_decoder;
     size_t m_readOffset;
     size_t m_currentBufferSize;
     bool m_decodingSizeOnly;
     bool m_hasAlpha;
-    std::unique_ptr<png_byte[]> m_interlaceBuffer;
+    OwnPtr<png_byte[]> m_interlaceBuffer;
 #if USE(QCMSLIB)
-    std::unique_ptr<png_byte[]> m_rowBuffer;
+    OwnPtr<png_byte[]> m_rowBuffer;
 #endif
 };
 
 PNGImageDecoder::PNGImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes, size_t offset)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
     , m_offset(offset)
 {
 }
 
 PNGImageDecoder::~PNGImageDecoder()
@@ skipping 249 matching lines @@
 {
     return decoder->frameIsCompleteAtIndex(0);
 }
 
 void PNGImageDecoder::decode(bool onlySize)
 {
     if (failed())
         return;
 
     if (!m_reader)
-        m_reader = wrapUnique(new PNGImageReader(this, m_offset));
+        m_reader = adoptPtr(new PNGImageReader(this, m_offset));
 
     // If we couldn't decode the image but have received all the data, decoding
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the PNGImageReader anymore.
     if (isComplete(this) || failed())
         m_reader.reset();
 }
 
 } // namespace blink