diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 10:20:01 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 10:20:01 +0000 |
| commit | e4f50683f05cb0ce849a5d8719b49341eeaa9e5d (patch) | |
| tree | 6c1fb400c24876b39fcbaee76144f9bee38a8e6e /webkit/media | |
| parent | 4e6e6a84f2439b7a7ec073b3100bbb31a663f31b (diff) | |
| download | chromium_src-e4f50683f05cb0ce849a5d8719b49341eeaa9e5d.zip chromium_src-e4f50683f05cb0ce849a5d8719b49341eeaa9e5d.tar.gz chromium_src-e4f50683f05cb0ce849a5d8719b49341eeaa9e5d.tar.bz2 | |
Have WebMediaPlayerImpl maintain a reference to AudioRendererSink.
BUG=168768
Review URL: https://chromiumcodereview.appspot.com/11779045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/media/webmediaplayer_impl.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index f65d675..4b27e48 100644 --- a/webkit/media/webmediaplayer_impl.cc +++ b/webkit/media/webmediaplayer_impl.cc @@ -140,6 +140,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( accelerated_compositing_reported_(false), incremented_externally_allocated_memory_(false), audio_source_provider_(params.audio_source_provider()), + audio_renderer_sink_(params.audio_renderer_sink()), is_local_source_(false), supports_save_(true), starting_(false) { diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h index 16fba65..e9f8cd5 100644 --- a/webkit/media/webmediaplayer_impl.h +++ b/webkit/media/webmediaplayer_impl.h @@ -325,7 +325,13 @@ class WebMediaPlayerImpl bool incremented_externally_allocated_memory_; + // TODO(scherkus): Sadly these two objects are the same and we're also forced + // to maintain an additional reference to |audio_renderer_sink_| otherwise + // |audio_source_provider_| will go bad after |pipeline_| shuts down. + // + // See http://crbug.com/136442 for details. WebKit::WebAudioSourceProvider* audio_source_provider_; + scoped_refptr<media::AudioRendererSink> audio_renderer_sink_; bool is_local_source_; bool supports_save_; |