Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Unified Diff: content/browser/renderer_host/media/video_capture_controller.cc

Issue 15070008: Check buffer_pool_ for null in VideoCaptureController::PostStopping. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index b82b7969ca7b13a82c258f36b5cdabcbdd30fc39..05f5c8c2ffa08b1b15b5f1efbe42c6b7dbdd6fb3 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -655,7 +655,8 @@ void VideoCaptureController::PostStopping() {
// When clients still have some buffers, or device has not been stopped yet,
// do nothing.
- if (buffer_pool_->IsAnyBufferHeldForConsumers() || device_in_use_)
+ if ((buffer_pool_ && buffer_pool_->IsAnyBufferHeldForConsumers()) ||
wjia(left Chromium) 2013/05/16 00:14:16 Should this check be also added for other cases (w
ncarter (slow) 2013/05/16 00:32:31 It wouldn't hurt, but it's certainly not necessary
+ device_in_use_)
return;
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698