content/browser/media/cdm/browser_cdm_manager.cc - Issue 894173002: Adds hook for content embedders to get media::BrowserCdm*.

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/media/cdm/browser_cdm_manager.cc

Issue 894173002: Adds hook for content embedders to get media::BrowserCdm*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 11 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

« chromecast/browser/media/cma_message_filter_host.h ('K') | « content/browser/media/cdm/browser_cdm_manager.h ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | content/public/browser/render_process_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index 358f42f8fd90ec78f61cf8b66aad15ab3ae59dd2..72da3079ddf8ea9003d2f5e5372c223ebc79f0bf 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -184,7 +184,8 @@ bool BrowserCdmManager::OnMessageReceived(const IPC::Message& msg) {

return handled;

}

-media::BrowserCdm* BrowserCdmManager::GetCdm(int render_frame_id, int cdm_id) {

+media::BrowserCdm* BrowserCdmManager::GetCdm(int render_frame_id,

+ int cdm_id) const {

DCHECK(task_runner_->RunsTasksOnCurrentThread());

return cdm_map_.get(GetId(render_frame_id, cdm_id));

}