Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: third_party/WebKit/Source/platform/audio/HRTFKernel.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
diff --git a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
index 6ef5208b2248c88a2cc8c39f2bed5d15799ef1b4..df21d791bc4915c0e37aa913e0b0d5440311019a 100644
--- a/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/HRTFKernel.cpp
@@ -26,11 +26,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "platform/audio/HRTFKernel.h"
-#include "platform/audio/AudioChannel.h"
#include "platform/FloatConversion.h"
+#include "platform/audio/AudioChannel.h"
+#include "platform/audio/HRTFKernel.h"
#include "wtf/MathExtras.h"
+#include "wtf/PtrUtil.h"
#include <algorithm>
+#include <memory>
namespace blink {
@@ -86,13 +88,13 @@ HRTFKernel::HRTFKernel(AudioChannel* channel, size_t fftSize, float sampleRate)
}
}
- m_fftFrame = adoptPtr(new FFTFrame(fftSize));
+ m_fftFrame = wrapUnique(new FFTFrame(fftSize));
m_fftFrame->doPaddedFFT(impulseResponse, truncatedResponseLength);
}
-PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse()
+std::unique_ptr<AudioChannel> HRTFKernel::createImpulseResponse()
{
- OwnPtr<AudioChannel> channel = adoptPtr(new AudioChannel(fftSize()));
+ std::unique_ptr<AudioChannel> channel = wrapUnique(new AudioChannel(fftSize()));
FFTFrame fftFrame(*m_fftFrame);
// Add leading delay back in.
@@ -103,7 +105,7 @@ PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse()
}
// Interpolates two kernels with x: 0 -> 1 and returns the result.
-PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x)
+std::unique_ptr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x)
{
ASSERT(kernel1 && kernel2);
if (!kernel1 || !kernel2)
@@ -120,7 +122,7 @@ PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1,
float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay();
- OwnPtr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kernel1->fftFrame(), *kernel2->fftFrame(), x);
+ std::unique_ptr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kernel1->fftFrame(), *kernel2->fftFrame(), x);
return HRTFKernel::create(std::move(interpolatedFrame), frameDelay, sampleRate1);
}

Powered by Google App Engine
This is Rietveld 408576698