content/renderer/media/crypto/proxy_media_keys.cc - Issue 835683002: media: Always define |cdm_id| in CdmContext.

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/media/crypto/proxy_media_keys.cc

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments addressed Created 5 years, 9 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:

Index: content/renderer/media/crypto/proxy_media_keys.cc

diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc

index fd6626ffec0a8d5a2ba5c78004a78926cf0fab16..7953a280af84824cdcea238bebac6d0ec4778634 100644

--- a/content/renderer/media/crypto/proxy_media_keys.cc

+++ b/content/renderer/media/crypto/proxy_media_keys.cc

@@ -125,7 +125,7 @@ media::CdmContext* ProxyMediaKeys::GetCdmContext() {

}

media::Decryptor* ProxyMediaKeys::GetDecryptor() {

- return NULL;

+ return nullptr;

}

int ProxyMediaKeys::GetCdmId() const {

« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | media/base/cdm_context.h » ('j') | no next file with comments »