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

Side by Side Diff: Source/WebCore/Modules/webaudio/AudioNodeOutput.cpp

Issue 12543030: Merge 144417 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « Source/WebCore/Modules/webaudio/AudioNodeInput.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 // Setup the actual destination bus for processing when our node's process() method gets called in processIfNecessary() below. 126 // Setup the actual destination bus for processing when our node's process() method gets called in processIfNecessary() below.
127 m_actualDestinationBus = isInPlace ? inPlaceBus : m_internalBus.get(); 127 m_actualDestinationBus = isInPlace ? inPlaceBus : m_internalBus.get();
128 128
129 node()->processIfNecessary(framesToProcess); 129 node()->processIfNecessary(framesToProcess);
130 return m_actualDestinationBus; 130 return m_actualDestinationBus;
131 } 131 }
132 132
133 AudioBus* AudioNodeOutput::bus() const 133 AudioBus* AudioNodeOutput::bus() const
134 { 134 {
135 // FIXME: Add ASSERTs/checkings to restrict the calling of bus(), because th e calling is
136 // only safe after setting the in-place bus in pull() and before updating th e referred bus.
135 ASSERT(const_cast<AudioNodeOutput*>(this)->context()->isAudioThread()); 137 ASSERT(const_cast<AudioNodeOutput*>(this)->context()->isAudioThread());
136 ASSERT(m_actualDestinationBus); 138 ASSERT(m_actualDestinationBus);
137 return m_actualDestinationBus; 139 return m_actualDestinationBus;
138 } 140 }
139 141
140 unsigned AudioNodeOutput::fanOutCount() 142 unsigned AudioNodeOutput::fanOutCount()
141 { 143 {
142 ASSERT(context()->isGraphOwner()); 144 ASSERT(context()->isGraphOwner());
143 return m_inputs.size(); 145 return m_inputs.size();
144 } 146 }
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 AudioNodeInput* input = *i; 255 AudioNodeInput* input = *i;
254 input->enable(this); 256 input->enable(this);
255 } 257 }
256 m_isEnabled = true; 258 m_isEnabled = true;
257 } 259 }
258 } 260 }
259 261
260 } // namespace WebCore 262 } // namespace WebCore
261 263
262 #endif // ENABLE(WEB_AUDIO) 264 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/webaudio/AudioNodeInput.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698