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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/AudioNodeOutput.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) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, 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/AudioNodeOutput.h"
26 #include "modules/webaudio/AbstractAudioContext.h" 25 #include "modules/webaudio/AbstractAudioContext.h"
27 #include "modules/webaudio/AudioNodeInput.h" 26 #include "modules/webaudio/AudioNodeInput.h"
27 #include "modules/webaudio/AudioNodeOutput.h"
28 #include "wtf/PtrUtil.h"
28 #include "wtf/Threading.h" 29 #include "wtf/Threading.h"
30 #include <memory>
29 31
30 namespace blink { 32 namespace blink {
31 33
32 inline AudioNodeOutput::AudioNodeOutput(AudioHandler* handler, unsigned numberOf Channels) 34 inline AudioNodeOutput::AudioNodeOutput(AudioHandler* handler, unsigned numberOf Channels)
33 : m_handler(*handler) 35 : m_handler(*handler)
34 , m_numberOfChannels(numberOfChannels) 36 , m_numberOfChannels(numberOfChannels)
35 , m_desiredNumberOfChannels(numberOfChannels) 37 , m_desiredNumberOfChannels(numberOfChannels)
36 , m_isInPlace(false) 38 , m_isInPlace(false)
37 , m_isEnabled(true) 39 , m_isEnabled(true)
38 #if ENABLE_ASSERT 40 #if ENABLE_ASSERT
39 , m_didCallDispose(false) 41 , m_didCallDispose(false)
40 #endif 42 #endif
41 , m_renderingFanOutCount(0) 43 , m_renderingFanOutCount(0)
42 , m_renderingParamFanOutCount(0) 44 , m_renderingParamFanOutCount(0)
43 { 45 {
44 ASSERT(numberOfChannels <= AbstractAudioContext::maxNumberOfChannels()); 46 ASSERT(numberOfChannels <= AbstractAudioContext::maxNumberOfChannels());
45 47
46 m_internalBus = AudioBus::create(numberOfChannels, AudioHandler::ProcessingS izeInFrames); 48 m_internalBus = AudioBus::create(numberOfChannels, AudioHandler::ProcessingS izeInFrames);
47 } 49 }
48 50
49 PassOwnPtr<AudioNodeOutput> AudioNodeOutput::create(AudioHandler* handler, unsig ned numberOfChannels) 51 std::unique_ptr<AudioNodeOutput> AudioNodeOutput::create(AudioHandler* handler, unsigned numberOfChannels)
50 { 52 {
51 return adoptPtr(new AudioNodeOutput(handler, numberOfChannels)); 53 return wrapUnique(new AudioNodeOutput(handler, numberOfChannels));
52 } 54 }
53 55
54 void AudioNodeOutput::dispose() 56 void AudioNodeOutput::dispose()
55 { 57 {
56 #if ENABLE_ASSERT 58 #if ENABLE_ASSERT
57 m_didCallDispose = true; 59 m_didCallDispose = true;
58 #endif 60 #endif
59 deferredTaskHandler().removeMarkedAudioNodeOutput(this); 61 deferredTaskHandler().removeMarkedAudioNodeOutput(this);
60 disconnectAll(); 62 disconnectAll();
61 ASSERT(m_inputs.isEmpty()); 63 ASSERT(m_inputs.isEmpty());
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 255
254 if (!m_isEnabled) { 256 if (!m_isEnabled) {
255 m_isEnabled = true; 257 m_isEnabled = true;
256 for (AudioNodeInput* i : m_inputs) 258 for (AudioNodeInput* i : m_inputs)
257 i->enable(*this); 259 i->enable(*this);
258 } 260 }
259 } 261 }
260 262
261 } // namespace blink 263 } // namespace blink
262 264
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698