content/browser/renderer_host/render_process_host_impl.cc - Issue 1407933010: media: Make MediaKeys ref-counted.

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

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 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:

Index: content/browser/renderer_host/render_process_host_impl.cc

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc

index e4b11092926cc71dcf3e1a6ff86272f3a943af9d..dee22d358297ce160eba400aef3358c929e7c7ea 100644

--- a/content/browser/renderer_host/render_process_host_impl.cc

+++ b/content/browser/renderer_host/render_process_host_impl.cc

@@ -1087,8 +1087,9 @@ void RenderProcessHostImpl::SendUpdateValueState(unsigned int target,

}

#if defined(ENABLE_BROWSER_CDMS)

-media::BrowserCdm* RenderProcessHostImpl::GetBrowserCdm(int render_frame_id,

- int cdm_id) const {

+scoped_refptr<media::MediaKeys> RenderProcessHostImpl::GetCdm(

+ int render_frame_id,

+ int cdm_id) const {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

BrowserCdmManager* manager = BrowserCdmManager::FromProcess(GetID());

if (!manager)