summaryrefslogtreecommitdiffstats
path: root/media/audio/audio_output_controller.h
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 22:40:25 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 22:40:25 +0000
commit570eff9b06a32fe16ac4ecf72f2f4e06202238e5 (patch)
tree9e17e8bef3776d94447588f0e18c23cdb5cd6c56 /media/audio/audio_output_controller.h
parentf8bf599c20fe17b4e8c6105ee00c554dd2fde6ff (diff)
downloadchromium_src-570eff9b06a32fe16ac4ecf72f2f4e06202238e5.zip
chromium_src-570eff9b06a32fe16ac4ecf72f2f4e06202238e5.tar.gz
chromium_src-570eff9b06a32fe16ac4ecf72f2f4e06202238e5.tar.bz2
Stop audio streams in all codepaths that need it.
Before we were leaving dangling streams un-Stop()'d, causing delayed messages to eventually crash the browser when their source_callback_ was followed but already invalid. BUG=101228 TEST=trybots, manual testing. Review URL: http://codereview.chromium.org/8385001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_controller.h')
-rw-r--r--media/audio/audio_output_controller.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index e359d27c..ea8f27a 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -202,6 +202,9 @@ class MEDIA_EXPORT AudioOutputController
// Helper method that starts physical stream.
void StartStream();
+ // Helper method that stops, closes, and NULLs |*stream_|.
+ void StopCloseAndClearStream();
+
// |handler_| may be called only if |state_| is not kClosed.
EventHandler* handler_;
AudioOutputStream* stream_;