Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // 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.
 
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/CheckedInt.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
 #include "platform/graphics/cpu/x86/WebGLImageConversionSSE.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/image-decoders/ImageDecoder.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 namespace {
 
 const float maxInt8Value = INT8_MAX;
 const float maxUInt8Value = UINT8_MAX;
 const float maxInt16Value = INT16_MAX;
 const float maxUInt16Value = UINT16_MAX;
 const double maxInt32Value = INT32_MAX;
@@ skipping 1682 matching lines @@
 
 class FormatConverter {
     STACK_ALLOCATED();
 public:
     FormatConverter(unsigned width, unsigned height,
         const void* srcStart, void* dstStart, int srcStride, int dstStride)
         : m_width(width), m_height(height), m_srcStart(srcStart), m_dstStart(dstStart), m_srcStride(srcStride), m_dstStride(dstStride), m_success(false)
     {
         const unsigned MaxNumberOfComponents = 4;
         const unsigned MaxBytesPerComponent  = 4;
-        m_unpackedIntermediateSrcData = wrapArrayUnique(new uint8_t[m_width * MaxNumberOfComponents *MaxBytesPerComponent]);
+        m_unpackedIntermediateSrcData = adoptArrayPtr(new uint8_t[m_width * MaxNumberOfComponents *MaxBytesPerComponent]);
         ASSERT(m_unpackedIntermediateSrcData.get());
     }
 
     void convert(WebGLImageConversion::DataFormat srcFormat, WebGLImageConversion::DataFormat dstFormat, WebGLImageConversion::AlphaOp);
     bool Success() const { return m_success; }
 
 private:
     template<WebGLImageConversion::DataFormat SrcFormat>
     void convert(WebGLImageConversion::DataFormat dstFormat, WebGLImageConversion::AlphaOp);
 
     template<WebGLImageConversion::DataFormat SrcFormat, WebGLImageConversion::DataFormat DstFormat>
     void convert(WebGLImageConversion::AlphaOp);
 
     template<WebGLImageConversion::DataFormat SrcFormat, WebGLImageConversion::DataFormat DstFormat, WebGLImageConversion::AlphaOp alphaOp>
     void convert();
 
     const unsigned m_width, m_height;
     const void* const m_srcStart;
     void* const m_dstStart;
     const int m_srcStride, m_dstStride;
     bool m_success;
-    std::unique_ptr<uint8_t[]> m_unpackedIntermediateSrcData;
+    OwnPtr<uint8_t[]> m_unpackedIntermediateSrcData;
 };
 
 void FormatConverter::convert(WebGLImageConversion::DataFormat srcFormat, WebGLImageConversion::DataFormat dstFormat, WebGLImageConversion::AlphaOp alphaOp)
 {
 #define FORMATCONVERTER_CASE_SRCFORMAT(SrcFormat) \
     case SrcFormat: \
         return convert<SrcFormat>(dstFormat, alphaOp);
 
         switch (srcFormat) {
             FORMATCONVERTER_CASE_SRCFORMAT(WebGLImageConversion::DataFormatRA8)
@@ skipping 383 matching lines @@
 
     RefPtr<SkImage> skiaImage = m_image->imageForCurrentFrame();
     SkImageInfo info = skiaImage
         ? SkImageInfo::MakeN32Premul(m_image->width(), m_image->height())
         : SkImageInfo::MakeUnknown();
     m_alphaOp = AlphaDoNothing;
     bool hasAlpha = skiaImage ? !skiaImage->isOpaque() : true;
 
     if ((!skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && m_image->data()) {
         // Attempt to get raw unpremultiplied image data.
-        std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
+        OwnPtr<ImageDecoder> decoder(ImageDecoder::create(
             *(m_image->data()), ImageDecoder::AlphaNotPremultiplied,
             ignoreGammaAndColorProfile ? ImageDecoder::GammaAndColorProfileIgnored : ImageDecoder::GammaAndColorProfileApplied));
         if (!decoder)
             return;
         decoder->setData(m_image->data(), true);
         if (!decoder->frameCount())
             return;
         ImageFrame* frame = decoder->frameBufferAtIndex(0);
         if (!frame || frame->getStatus() != ImageFrame::FrameComplete)
             return;
@@ skipping 250 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink