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

Side by Side Diff: Source/modules/webaudio/MediaElementAudioSourceNode.cpp

Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address comments Created 5 years, 5 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
(...skipping 16 matching lines...) Expand all
27 #include "modules/webaudio/MediaElementAudioSourceNode.h" 27 #include "modules/webaudio/MediaElementAudioSourceNode.h"
28 28
29 #include "core/dom/CrossThreadTask.h" 29 #include "core/dom/CrossThreadTask.h"
30 #include "core/frame/ConsoleTypes.h" 30 #include "core/frame/ConsoleTypes.h"
31 #include "core/html/HTMLMediaElement.h" 31 #include "core/html/HTMLMediaElement.h"
32 #include "core/inspector/ConsoleMessage.h" 32 #include "core/inspector/ConsoleMessage.h"
33 #include "modules/webaudio/AudioContext.h" 33 #include "modules/webaudio/AudioContext.h"
34 #include "modules/webaudio/AudioNodeOutput.h" 34 #include "modules/webaudio/AudioNodeOutput.h"
35 #include "platform/Logging.h" 35 #include "platform/Logging.h"
36 #include "platform/audio/AudioUtilities.h" 36 #include "platform/audio/AudioUtilities.h"
37 #include "platform/graphics/media/MediaPlayer.h"
38 #include "platform/weborigin/SecurityOrigin.h" 37 #include "platform/weborigin/SecurityOrigin.h"
39 #include "wtf/Locker.h" 38 #include "wtf/Locker.h"
40 #include "wtf/MainThread.h" 39 #include "wtf/MainThread.h"
41 40
42 namespace blink { 41 namespace blink {
43 42
44 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement) 43 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement)
45 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate()) 44 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate())
46 , m_mediaElement(mediaElement) 45 , m_mediaElement(mediaElement)
47 , m_sourceNumberOfChannels(0) 46 , m_sourceNumberOfChannels(0)
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 253 }
255 254
256 void MediaElementAudioSourceNode::unlock() 255 void MediaElementAudioSourceNode::unlock()
257 { 256 {
258 mediaElementAudioSourceHandler().unlock(); 257 mediaElementAudioSourceHandler().unlock();
259 } 258 }
260 259
261 } // namespace blink 260 } // namespace blink
262 261
263 #endif // ENABLE(WEB_AUDIO) 262 #endif // ENABLE(WEB_AUDIO)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698