content/browser/renderer_host/media/service_video_capture_device_launcher.cc - Issue 2867213004: [Mojo Video Capture] Hook up video capture service behind a feature flag

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/service_video_capture_device_launcher.cc

Issue 2867213004: [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)

Patch Set: Incorporate suggestions from PatchSet 5 Created 3 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 | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/browser/renderer_host/media/video_capture_browsertest.cc » ('j') | content/browser/renderer_host/media/video_capture_provider_switcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b74cf52865a5a817f84c712489d31c1dc6316391..4c86c448638cc39f1665e20a9a52664c24e6452e 100644

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

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

@@ -88,9 +88,12 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAsync(

return;

}

video_capture::mojom::DevicePtr device;

+ // We need the temporary variable |device_request| in order to guarantee that

+ // mojo::MakeRequest(&device) happens before base::Passed(&device).

+ auto device_request = mojo::MakeRequest(&device);

(*device_factory_)

->CreateDevice(

- device_id, mojo::MakeRequest(&device),

+ device_id, std::move(device_request),

base::Bind(

// Use of Unretained |this| is safe, because |done_cb| guarantees

// that |this| stays alive.