diff options
| author | rtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 21:46:10 +0000 |
|---|---|---|
| committer | rtoy@google.com <rtoy@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 21:46:10 +0000 |
| commit | 1113bfdfe5f7262ba4854f9fca9d4bc9055cdbdc (patch) | |
| tree | 068fc6cbb873a062c1a404b249eaa2d375ed406b /chrome/renderer/prerender | |
| parent | 501f9685a8bfcd5a819fd1022f229eb5a1922cc8 (diff) | |
| download | chromium_src-1113bfdfe5f7262ba4854f9fca9d4bc9055cdbdc.zip chromium_src-1113bfdfe5f7262ba4854f9fca9d4bc9055cdbdc.tar.gz chromium_src-1113bfdfe5f7262ba4854f9fca9d4bc9055cdbdc.tar.bz2 | |
WebMediaPlayerImpl needs to own the audio source provider.
WebMediaPlayerImpl needs to own the audio source provider to keep it from being destroyed too soon.
BUG=132890
TEST=See test in bug report.
Review URL: https://chromiumcodereview.appspot.com/10662030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/prerender')
| -rw-r--r-- | chrome/renderer/prerender/prerender_webmediaplayer.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/prerender/prerender_webmediaplayer.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_webmediaplayer.cc index 417d420..54b6dd7 100644 --- a/chrome/renderer/prerender/prerender_webmediaplayer.cc +++ b/chrome/renderer/prerender/prerender_webmediaplayer.cc @@ -21,6 +21,7 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer( base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, media::FilterCollection* collection, WebKit::WebAudioSourceProvider* audio_source_provider, + media::AudioRendererSink* audio_renderer_sink, media::MessageLoopFactory* message_loop_factory, webkit_media::MediaStreamClient* media_stream_client, media::MediaLog* media_log) @@ -30,6 +31,7 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer( delegate, collection, audio_source_provider, + audio_renderer_sink, message_loop_factory, media_stream_client, media_log), diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h index 2eb1e3a..7541ef6 100644 --- a/chrome/renderer/prerender/prerender_webmediaplayer.h +++ b/chrome/renderer/prerender/prerender_webmediaplayer.h @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/renderer/render_view_observer.h" +#include "media/base/audio_renderer_sink.h" #include "webkit/media/webmediaplayer_impl.h" namespace webkit_media { @@ -30,6 +31,7 @@ class PrerenderWebMediaPlayer base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, media::FilterCollection* collection, WebKit::WebAudioSourceProvider* audio_source_provider, + media::AudioRendererSink* audio_renderer_sink, media::MessageLoopFactory* message_loop_factory, webkit_media::MediaStreamClient* media_stream_client, media::MediaLog* media_log); |