summaryrefslogtreecommitdiffstats
path: root/webkit/media/webmediaplayer_impl.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 04:33:02 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 04:33:02 +0000
commitae81fc8950c03c514a74ec076743766c635813bd (patch)
treeea389198a41ab38b59f619a3349b831b56793d86 /webkit/media/webmediaplayer_impl.cc
parent2caf79aeec7d705b87b071344f1cc48c33946075 (diff)
downloadchromium_src-ae81fc8950c03c514a74ec076743766c635813bd.zip
chromium_src-ae81fc8950c03c514a74ec076743766c635813bd.tar.gz
chromium_src-ae81fc8950c03c514a74ec076743766c635813bd.tar.bz2
Revert 116643 - Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode
RenderAudioSourceProvider implements WebKit::WebAudioSourceProvider using AudioRendererImpl BUG=none TEST=none (tested locally) Review URL: http://codereview.chromium.org/8980008 TBR=crogers@google.com Review URL: http://codereview.chromium.org/9121001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_impl.cc')
-rw-r--r--webkit/media/webmediaplayer_impl.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 2bb0e65..4753202 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -102,7 +102,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
WebKit::WebMediaPlayerClient* client,
base::WeakPtr<WebMediaPlayerDelegate> delegate,
media::FilterCollection* collection,
- WebKit::WebAudioSourceProvider* audio_source_provider,
media::MessageLoopFactory* message_loop_factory,
MediaStreamClient* media_stream_client,
media::MediaLog* media_log)
@@ -123,8 +122,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
media_stream_client_(media_stream_client),
media_log_(media_log),
is_accelerated_compositing_active_(false),
- incremented_externally_allocated_memory_(false),
- audio_source_provider_(audio_source_provider) {
+ incremented_externally_allocated_memory_(false) {
// Saves the current message loop.
DCHECK(!main_loop_);
main_loop_ = MessageLoop::current();
@@ -936,10 +934,6 @@ WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
return client_;
}
-WebKit::WebAudioSourceProvider* WebMediaPlayerImpl::audioSourceProvider() {
- return audio_source_provider_;
-}
-
void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
DCHECK_EQ(main_loop_, MessageLoop::current());
incremented_externally_allocated_memory_ = true;