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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/AudioScheduledSourceNode.cpp

Issue 2738823004: Replace createCrossThreadTask with crossThreadBind in webaudio (Closed)
Patch Set: Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, 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 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE 16 * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 17 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 18 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 19 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 20 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
23 * DAMAGE. 23 * DAMAGE.
24 */ 24 */
25 25
26 #include "modules/webaudio/AudioScheduledSourceNode.h" 26 #include "modules/webaudio/AudioScheduledSourceNode.h"
tzik 2017/03/10 00:15:43 Could you add a blank line after AudioScheduledSou
yuryu 2017/03/10 07:49:32 Done.
27 #include <algorithm>
27 #include "bindings/core/v8/ExceptionState.h" 28 #include "bindings/core/v8/ExceptionState.h"
28 #include "core/dom/ExceptionCode.h" 29 #include "core/dom/ExceptionCode.h"
29 #include "core/dom/ExecutionContextTask.h"
30 #include "core/dom/TaskRunnerHelper.h" 30 #include "core/dom/TaskRunnerHelper.h"
31 #include "modules/EventModules.h" 31 #include "modules/EventModules.h"
32 #include "modules/webaudio/BaseAudioContext.h" 32 #include "modules/webaudio/BaseAudioContext.h"
33 #include "platform/CrossThreadFunctional.h"
33 #include "platform/audio/AudioUtilities.h" 34 #include "platform/audio/AudioUtilities.h"
34 #include "wtf/MathExtras.h" 35 #include "wtf/MathExtras.h"
35 #include <algorithm>
36 36
37 namespace blink { 37 namespace blink {
38 38
39 const double AudioScheduledSourceHandler::UnknownTime = -1; 39 const double AudioScheduledSourceHandler::UnknownTime = -1;
40 40
41 AudioScheduledSourceHandler::AudioScheduledSourceHandler(NodeType nodeType, 41 AudioScheduledSourceHandler::AudioScheduledSourceHandler(NodeType nodeType,
42 AudioNode& node, 42 AudioNode& node,
43 float sampleRate) 43 float sampleRate)
44 : AudioHandler(nodeType, node, sampleRate), 44 : AudioHandler(nodeType, node, sampleRate),
45 m_startTime(0), 45 m_startTime(0),
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // Let the context dereference this AudioNode. 219 // Let the context dereference this AudioNode.
220 context()->notifySourceNodeFinishedProcessing(this); 220 context()->notifySourceNodeFinishedProcessing(this);
221 setPlaybackState(FINISHED_STATE); 221 setPlaybackState(FINISHED_STATE);
222 } 222 }
223 } 223 }
224 224
225 void AudioScheduledSourceHandler::finish() { 225 void AudioScheduledSourceHandler::finish() {
226 finishWithoutOnEnded(); 226 finishWithoutOnEnded();
227 227
228 if (context()->getExecutionContext()) { 228 if (context()->getExecutionContext()) {
229 context()->getExecutionContext()->postTask( 229 TaskRunnerHelper::get(TaskType::MediaElementEvent,
230 TaskType::MediaElementEvent, BLINK_FROM_HERE, 230 context()->getExecutionContext())
231 createCrossThreadTask(&AudioScheduledSourceHandler::notifyEnded, 231 ->postTask(BLINK_FROM_HERE,
232 PassRefPtr<AudioScheduledSourceHandler>(this))); 232 crossThreadBind(&AudioScheduledSourceHandler::notifyEnded,
233 RefPtr<AudioScheduledSourceHandler>(this)));
tzik 2017/03/10 00:15:43 Can we use wrapPassRefPtr here?
yuryu 2017/03/10 07:49:32 Done.
233 } 234 }
234 } 235 }
235 236
236 void AudioScheduledSourceHandler::notifyEnded() { 237 void AudioScheduledSourceHandler::notifyEnded() {
237 DCHECK(isMainThread()); 238 DCHECK(isMainThread());
238 if (node()) 239 if (node())
239 node()->dispatchEvent(Event::create(EventTypeNames::ended)); 240 node()->dispatchEvent(Event::create(EventTypeNames::ended));
240 } 241 }
241 242
242 // ---------------------------------------------------------------- 243 // ----------------------------------------------------------------
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // playback state if the context is closed. 281 // playback state if the context is closed.
281 if (context()->isContextClosed()) 282 if (context()->isContextClosed())
282 return false; 283 return false;
283 284
284 // If a node is scheduled or playing, do not collect the node prematurely 285 // If a node is scheduled or playing, do not collect the node prematurely
285 // even its reference is out of scope. Then fire onended event if assigned. 286 // even its reference is out of scope. Then fire onended event if assigned.
286 return audioScheduledSourceHandler().isPlayingOrScheduled(); 287 return audioScheduledSourceHandler().isPlayingOrScheduled();
287 } 288 }
288 289
289 } // namespace blink 290 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698