summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 00:56:26 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 00:56:26 +0000
commitcdb0835bb3df4a9d1c7b8614af3e348bbba0107d (patch)
tree4dd8ed8063d7e6838f7f8f1120a2c77f37940578 /chrome/renderer
parentc7be8a19dbb87567d4fa993037f450f0d08b099c (diff)
downloadchromium_src-cdb0835bb3df4a9d1c7b8614af3e348bbba0107d.zip
chromium_src-cdb0835bb3df4a9d1c7b8614af3e348bbba0107d.tar.gz
chromium_src-cdb0835bb3df4a9d1c7b8614af3e348bbba0107d.tar.bz2
Remove asserts in RenderView for audio mesages
The asserts is too aggressive which are causing problems when closing the tab or reload. Review URL: http://codereview.chromium.org/62033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_view.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 0b36bd0..eb5a7e3 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2901,7 +2901,9 @@ MessageLoop* RenderView::GetMessageLoopForIO() {
void RenderView::OnRequestAudioPacket(int stream_id) {
AudioRendererImpl* audio_renderer = audio_renderers_.Lookup(stream_id);
if (!audio_renderer) {
- NOTREACHED();
+ // It is possible that AudioRendererImpl is un-registered but we still
+ // receives packet requests here, because of closing a stream is not a
+ // synchronous operation with the browser process.
return;
}
audio_renderer->OnRequestPacket();
@@ -2911,7 +2913,6 @@ void RenderView::OnAudioStreamCreated(
int stream_id, base::SharedMemoryHandle handle, int length) {
AudioRendererImpl* audio_renderer = audio_renderers_.Lookup(stream_id);
if (!audio_renderer) {
- NOTREACHED();
return;
}
audio_renderer->OnCreated(handle, length);
@@ -2921,7 +2922,6 @@ void RenderView::OnAudioStreamStateChanged(
int stream_id, AudioOutputStream::State state, int info) {
AudioRendererImpl* audio_renderer = audio_renderers_.Lookup(stream_id);
if (!audio_renderer) {
- NOTREACHED();
return;
}
audio_renderer->OnStateChanged(state, info);
@@ -2930,7 +2930,6 @@ void RenderView::OnAudioStreamStateChanged(
void RenderView::OnAudioStreamVolume(int stream_id, double left, double right) {
AudioRendererImpl* audio_renderer = audio_renderers_.Lookup(stream_id);
if (!audio_renderer) {
- NOTREACHED();
return;
}
audio_renderer->OnVolume(left, right);