content/renderer/pepper/pepper_platform_audio_input.cc - Issue 702783002: [Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr

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/renderer/pepper/pepper_platform_audio_input.cc

Issue 702783002: [Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125

Patch Set: Created 6 years, 1 month 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/renderer/pepper/pepper_media_device_manager.cc ('k') | content/renderer/pepper/pepper_platform_video_capture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_platform_audio_input.cc

diff --git a/content/renderer/pepper/pepper_platform_audio_input.cc b/content/renderer/pepper/pepper_platform_audio_input.cc

index fafff22226a3dc1e531505376839939d6319ab93..1ae8f0fcf91d5cddeb6e49d77ebe71f0c79ce52f 100644

--- a/content/renderer/pepper/pepper_platform_audio_input.cc

+++ b/content/renderer/pepper/pepper_platform_audio_input.cc

@@ -290,7 +290,7 @@ PepperMediaDeviceManager* PepperPlatformAudioInput::GetMediaDeviceManager() {

RenderFrameImpl* const render_frame =

RenderFrameImpl::FromRoutingID(render_frame_id_);

return render_frame ?

- PepperMediaDeviceManager::GetForRenderFrame(render_frame) : NULL;

+ PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;

}

} // namespace content

« no previous file with comments | « content/renderer/pepper/pepper_media_device_manager.cc ('k') | content/renderer/pepper/pepper_platform_video_capture.cc » ('j') | no next file with comments »