Index: content/browser/renderer_host/media/video_capture_host.cc |
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc |
index f261995f341df5d0ddfc121468c65449006cd1d9..9b1cef8fb89f1feaf388ae65a66a7a24d4186e24 100644 |
--- a/content/browser/renderer_host/media/video_capture_host.cc |
+++ b/content/browser/renderer_host/media/video_capture_host.cc |
@@ -177,7 +177,16 @@ void VideoCaptureHost::DoHandleErrorOnIOThread( |
Send(new VideoCaptureMsg_StateChanged(controller_id.device_id, |
VIDEO_CAPTURE_STATE_ERROR)); |
- DeleteVideoCaptureControllerOnIOThread(controller_id); |
+ |
mcasas
2014/04/24 11:09:47
All platforms/implementations will basically pass
jiayl
2014/04/24 18:11:13
Not sure I understand you. Does the refactored cod
mcasas
2014/04/25 17:18:35
I think is gone.
On 2014/04/24 18:11:13, jiayl wr
|
+ EntryMap::iterator it = entries_.find(controller_id); |
+ if (it == entries_.end()) |
+ return; |
+ |
+ if (it->second) { |
+ media_stream_manager_->video_capture_manager()->AbortCaptureForDeviceError( |
+ it->second.get(), controller_id, this); |
+ } |
+ entries_.erase(it); |
} |
mcasas
2014/04/24 11:09:47
This is just a copy-modify-1-word of DeleteVideoCa
jiayl
2014/04/24 18:11:13
Done.
|
void VideoCaptureHost::DoEndedOnIOThread( |