content/browser/renderer_host/media/web_contents_video_capture_device.cc - Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16256018: Update content/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix incorrectly modified code 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

Index: content/browser/renderer_host/media/web_contents_video_capture_device.cc

diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

index 9fcd0ed33711a461866916dd1b3a699e9993a3a3..52be61a089101fd2766239501ea1372e061fceb2 100644

--- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc

+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc

@@ -1123,9 +1123,9 @@ void WebContentsVideoCaptureDevice::Impl::Start() {

void WebContentsVideoCaptureDevice::Impl::AssignCaptureMachine(

base::WeakPtr<WebContentsVideoCaptureDevice::Impl> impl,

scoped_ptr<CaptureMachine> capture_machine) {

- DCHECK(!impl || impl->thread_checker_.CalledOnValidThread());

+ DCHECK(!impl.get() || impl->thread_checker_.CalledOnValidThread());

- if (!impl) {

+ if (!impl.get()) {

// If WCVD::Impl was destroyed before we got back on it's thread and

// capture_machine is not NULL, then we need to return to the UI thread to

// safely cleanup the CaptureMachine.

« no previous file with comments | « content/browser/plugin_loader_posix.cc ('k') | content/browser/ssl/ssl_error_handler.cc » ('j') | no next file with comments »