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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/WaveShaperProcessor.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "modules/webaudio/WaveShaperDSPKernel.h"
25 #include "modules/webaudio/WaveShaperProcessor.h" 26 #include "modules/webaudio/WaveShaperProcessor.h"
26 #include "modules/webaudio/WaveShaperDSPKernel.h" 27 #include "wtf/PtrUtil.h"
28 #include <memory>
27 29
28 namespace blink { 30 namespace blink {
29 31
30 WaveShaperProcessor::WaveShaperProcessor(float sampleRate, size_t numberOfChanne ls) 32 WaveShaperProcessor::WaveShaperProcessor(float sampleRate, size_t numberOfChanne ls)
31 : AudioDSPKernelProcessor(sampleRate, numberOfChannels) 33 : AudioDSPKernelProcessor(sampleRate, numberOfChannels)
32 , m_oversample(OverSampleNone) 34 , m_oversample(OverSampleNone)
33 { 35 {
34 } 36 }
35 37
36 WaveShaperProcessor::~WaveShaperProcessor() 38 WaveShaperProcessor::~WaveShaperProcessor()
37 { 39 {
38 if (isInitialized()) 40 if (isInitialized())
39 uninitialize(); 41 uninitialize();
40 } 42 }
41 43
42 PassOwnPtr<AudioDSPKernel> WaveShaperProcessor::createKernel() 44 std::unique_ptr<AudioDSPKernel> WaveShaperProcessor::createKernel()
43 { 45 {
44 return adoptPtr(new WaveShaperDSPKernel(this)); 46 return wrapUnique(new WaveShaperDSPKernel(this));
45 } 47 }
46 48
47 void WaveShaperProcessor::setCurve(DOMFloat32Array* curve) 49 void WaveShaperProcessor::setCurve(DOMFloat32Array* curve)
48 { 50 {
49 // This synchronizes with process(). 51 // This synchronizes with process().
50 MutexLocker processLocker(m_processLock); 52 MutexLocker processLocker(m_processLock);
51 53
52 m_curve = curve; 54 m_curve = curve;
53 } 55 }
54 56
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 for (unsigned i = 0; i < m_kernels.size(); ++i) 88 for (unsigned i = 0; i < m_kernels.size(); ++i)
87 m_kernels[i]->process(source->channel(i)->data(), destination->chann el(i)->mutableData(), framesToProcess); 89 m_kernels[i]->process(source->channel(i)->data(), destination->chann el(i)->mutableData(), framesToProcess);
88 } else { 90 } else {
89 // Too bad - the tryLock() failed. We must be in the middle of a setCurv e() call. 91 // Too bad - the tryLock() failed. We must be in the middle of a setCurv e() call.
90 destination->zero(); 92 destination->zero();
91 } 93 }
92 } 94 }
93 95
94 } // namespace blink 96 } // namespace blink
95 97
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698