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/AudioNodeInput.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/AudioNodeInput.h" 25 #include "modules/webaudio/AudioNodeInput.h"
26 #include "modules/webaudio/AudioNodeOutput.h" 26 #include "modules/webaudio/AudioNodeOutput.h"
27 #include "wtf/PtrUtil.h"
27 #include <algorithm> 28 #include <algorithm>
29 #include <memory>
28 30
29 namespace blink { 31 namespace blink {
30 32
31 inline AudioNodeInput::AudioNodeInput(AudioHandler& handler) 33 inline AudioNodeInput::AudioNodeInput(AudioHandler& handler)
32 : AudioSummingJunction(handler.context()->deferredTaskHandler()) 34 : AudioSummingJunction(handler.context()->deferredTaskHandler())
33 , m_handler(handler) 35 , m_handler(handler)
34 { 36 {
35 // Set to mono by default. 37 // Set to mono by default.
36 m_internalSummingBus = AudioBus::create(1, AudioHandler::ProcessingSizeInFra mes); 38 m_internalSummingBus = AudioBus::create(1, AudioHandler::ProcessingSizeInFra mes);
37 } 39 }
38 40
39 PassOwnPtr<AudioNodeInput> AudioNodeInput::create(AudioHandler& handler) 41 std::unique_ptr<AudioNodeInput> AudioNodeInput::create(AudioHandler& handler)
40 { 42 {
41 return adoptPtr(new AudioNodeInput(handler)); 43 return wrapUnique(new AudioNodeInput(handler));
42 } 44 }
43 45
44 void AudioNodeInput::connect(AudioNodeOutput& output) 46 void AudioNodeInput::connect(AudioNodeOutput& output)
45 { 47 {
46 ASSERT(deferredTaskHandler().isGraphOwner()); 48 ASSERT(deferredTaskHandler().isGraphOwner());
47 49
48 // Check if we're already connected to this output. 50 // Check if we're already connected to this output.
49 if (m_outputs.contains(&output)) 51 if (m_outputs.contains(&output))
50 return; 52 return;
51 53
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 } 215 }
214 216
215 // Handle multiple connections case. 217 // Handle multiple connections case.
216 sumAllConnections(internalSummingBus, framesToProcess); 218 sumAllConnections(internalSummingBus, framesToProcess);
217 219
218 return internalSummingBus; 220 return internalSummingBus;
219 } 221 }
220 222
221 } // namespace blink 223 } // namespace blink
222 224
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698