media/blink/cdm_session_adapter.cc - Issue 748473002: Introduce CdmContext interface.

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: media/blink/cdm_session_adapter.cc

Issue 748473002: Introduce CdmContext interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@set_cdm

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:

Index: media/blink/cdm_session_adapter.cc

diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc

index e54f43eaf9f1003bea718708d4610abb5c243c40..380430685273b77e216fcba23212b231e31ab123 100644

--- a/media/blink/cdm_session_adapter.cc

+++ b/media/blink/cdm_session_adapter.cc

@@ -128,7 +128,7 @@ void CdmSessionAdapter::GetUsableKeyIds(

}

Decryptor* CdmSessionAdapter::GetDecryptor() {

- return media_keys_->GetDecryptor();

+ return media_keys_->GetCdmContext()->GetDecryptor();

}

const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const {

@@ -137,7 +137,7 @@ const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const {

#if defined(ENABLE_BROWSER_CDMS)

int CdmSessionAdapter::GetCdmId() const {

- return media_keys_->GetCdmId();

+ return media_keys_->GetCdmContext()->GetCdmId();

}

#endif // defined(ENABLE_BROWSER_CDMS)