Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/audio/ReverbConvolver.cpp

 /*
  * Copyright (C) 2010 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
  *     documentation and/or other materials provided with the distribution.
  * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "platform/audio/ReverbConvolver.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/audio/AudioBus.h"
-#include "platform/audio/ReverbConvolver.h"
 #include "platform/audio/VectorMath.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 using namespace VectorMath;
 
 const int InputBufferSize = 8 * 16384;
 
 // We only process the leading portion of the impulse response in the real-time thread.  We don't exceed this length.
 // It turns out then, that the background thread has about 278msec of scheduling slop.
 // Empirically, this has been found to be a good compromise between giving enough time for scheduling slop,
@@ skipping 34 matching lines @@
         // For the last stage, it's possible that stageOffset is such that we're straddling the end
         // of the impulse response buffer (if we use stageSize), so reduce the last stage's length...
         if (stageSize + stageOffset > totalResponseLength)
             stageSize = totalResponseLength - stageOffset;
 
         // This "staggers" the time when each FFT happens so they don't all happen at the same time
         int renderPhase = convolverRenderPhase + i * renderSliceSize;
 
         bool useDirectConvolver = !stageOffset;
 
-        std::unique_ptr<ReverbConvolverStage> stage = wrapUnique(new ReverbConvolverStage(response, totalResponseLength, reverbTotalLatency, stageOffset, stageSize, fftSize, renderPhase, renderSliceSize, &m_accumulationBuffer, useDirectConvolver));
+        OwnPtr<ReverbConvolverStage> stage = adoptPtr(new ReverbConvolverStage(response, totalResponseLength, reverbTotalLatency, stageOffset, stageSize, fftSize, renderPhase, renderSliceSize, &m_accumulationBuffer, useDirectConvolver));
 
         bool isBackgroundStage = false;
 
         if (useBackgroundThreads && stageOffset > RealtimeFrameLimit) {
             m_backgroundStages.append(std::move(stage));
             isBackgroundStage = true;
         } else {
             m_stages.append(std::move(stage));
         }
 
         stageOffset += stageSize;
         ++i;
 
         if (!useDirectConvolver) {
             // Figure out next FFT size
             fftSize *= 2;
         }
 
         if (useBackgroundThreads && !isBackgroundStage && fftSize > m_maxRealtimeFFTSize)
             fftSize = m_maxRealtimeFFTSize;
         if (fftSize > m_maxFFTSize)
             fftSize = m_maxFFTSize;
     }
 
     // Start up background thread
     // FIXME: would be better to up the thread priority here.  It doesn't need to be real-time, but higher than the default...
     if (useBackgroundThreads && m_backgroundStages.size() > 0)
-        m_backgroundThread = wrapUnique(Platform::current()->createThread("Reverb convolution background thread"));
+        m_backgroundThread = adoptPtr(Platform::current()->createThread("Reverb convolution background thread"));
 }
 
 ReverbConvolver::~ReverbConvolver()
 {
     // Wait for background thread to stop
     m_backgroundThread.reset();
 }
 
 void ReverbConvolver::processInBackground()
 {
@@ skipping 54 matching lines @@
     m_accumulationBuffer.reset();
     m_inputBuffer.reset();
 }
 
 size_t ReverbConvolver::latencyFrames() const
 {
     return 0;
 }
 
 } // namespace blink