From fc72bb18b111ff63e57135d97de6d59291f3b7b8 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Sun, 2 Jun 2013 21:13:46 +0000 Subject: Update content/ to use scoped_refptr::get() rather than implicit "operator T*" Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16294003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/media/video_capture_host.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 91d8f51..9c4fc77 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc @@ -32,7 +32,7 @@ void VideoCaptureHost::OnChannelClosing() { // Since the IPC channel is gone, close all requested VideCaptureDevices. for (EntryMap::iterator it = entries_.begin(); it != entries_.end(); it++) { - VideoCaptureController* controller = it->second->controller; + VideoCaptureController* controller = it->second->controller.get(); if (controller) { VideoCaptureControllerID controller_id(it->first); controller->StopCapture(controller_id, this); @@ -255,7 +255,7 @@ void VideoCaptureHost::OnReceiveEmptyBuffer(int device_id, int buffer_id) { EntryMap::iterator it = entries_.find(controller_id); if (it != entries_.end()) { scoped_refptr controller = it->second->controller; - if (controller) + if (controller.get()) controller->ReturnBuffer(controller_id, this, buffer_id); } } @@ -268,7 +268,7 @@ void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread( if (it == entries_.end()) return; - VideoCaptureController* controller = it->second->controller; + VideoCaptureController* controller = it->second->controller.get(); if (controller) { controller->StopCapture(controller_id, this); GetVideoCaptureManager()->RemoveController(controller, this); -- cgit v1.1