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

4 files changed, 1 insertions, 20 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;
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index b9600ec..7b5cd60 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -52,19 +52,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
-#include "media/base/audio_renderer_sink.h"
 #include "media/base/filters.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 
-class RenderAudioSourceProvider;
-
 namespace WebKit {
-class WebAudioSourceProvider;
 class WebFrame;
 }
 
@@ -103,13 +98,11 @@ class WebMediaPlayerImpl
   // audio renderer is a fake audio device that plays silence. Provider of the
   // |collection| can override the default filters by adding extra filters to
   // |collection| before calling this method.
-  // This object takes ownership of the |audio_source_provider|.
   //
   // Callers must call |Initialize()| before they can use the object.
   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);
@@ -179,8 +172,6 @@ class WebMediaPlayerImpl
   virtual WebKit::WebVideoFrame* getCurrentFrame();
   virtual void putCurrentFrame(WebKit::WebVideoFrame* web_video_frame);
 
-  virtual WebKit::WebAudioSourceProvider* audioSourceProvider();
-
   virtual bool sourceAppend(const unsigned char* data, unsigned length);
   virtual void sourceEndOfStream(EndOfStreamStatus status);
 
@@ -274,8 +265,6 @@ class WebMediaPlayerImpl
 
   bool incremented_externally_allocated_memory_;
 
-  WebKit::WebAudioSourceProvider* audio_source_provider_;
-
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 80200a2..25a7be0 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -319,7 +319,6 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
           client,
           base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
           collection.release(),
-          NULL,
           message_loop_factory.release(),
           NULL,
           new media::MediaLog()));
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 412fbd3..8938599 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -652,7 +652,6 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
           client,
           base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
           collection.release(),
-          NULL,
           message_loop_factory.release(),
           NULL,
           new media::MediaLog()));