diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 21:23:18 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 21:23:18 +0000 |
| commit | 61749755ee600b1e02130a354ca5abb483b66d41 (patch) | |
| tree | a5939c90cc85008d2d722ca01076c5469a7e41b6 | |
| parent | 961541a934ff87ae9e00a3f6d767c3db1e493c2a (diff) | |
| download | chromium_src-61749755ee600b1e02130a354ca5abb483b66d41.zip chromium_src-61749755ee600b1e02130a354ca5abb483b66d41.tar.gz chromium_src-61749755ee600b1e02130a354ca5abb483b66d41.tar.bz2 | |
Returns error when failed to create native stream in OnStreamGenerated.
BUG=126422
TEST=Test getUserMedia on a computer with the audio device disabled.
Review URL: https://chromiumcodereview.appspot.com/10440130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140099 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index efdb1b3..4c6751d 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -267,6 +267,13 @@ void MediaStreamImpl::OnStreamGenerated( LocalNativeStreamPtr native_stream(CreateNativeLocalMediaStream( label, it->second.frame_, audio_source_vector, video_source_vector)); + if (!native_stream.get()) { + DVLOG(1) << "Failed to create native stream in OnStreamGenerated."; + media_stream_dispatcher_->StopStream(label); + it->second.request_.requestFailed(); + user_media_requests_.erase(it); + return; + } WebKit::WebString webkit_label = UTF8ToUTF16(label); WebKit::WebMediaStreamDescriptor description; |