content/renderer/media/crypto/proxy_decryptor.h - Issue 448893002: Update ClearKey to support CDM_6

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_decryptor.h

Issue 448893002: Update ClearKey to support CDM_6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cdm6

Patch Set: Changes Created 6 years, 4 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_decryptor.h

diff --git a/content/renderer/media/crypto/proxy_decryptor.h b/content/renderer/media/crypto/proxy_decryptor.h

index e4fd7eace5e7fb2574acb546eedb6ff8b02b136d..35b2ee9fbd127142f7d5a82734188416a51c76ed 100644

--- a/content/renderer/media/crypto/proxy_decryptor.h

+++ b/content/renderer/media/crypto/proxy_decryptor.h

@@ -97,7 +97,9 @@ class ProxyDecryptor {

const std::string& error_message);

// Called when a session is actually created or loaded.

- void SetSessionId(bool persistent, const std::string& web_session_id);

+ void SetSessionId(bool is_new_persistent_session,

ddorwin 2014/08/11 20:34:16 Since these can never both be true, we should prob

jrummell 2014/08/13 21:18:06 Done.

+ bool is_loaded_session,

+ const std::string& web_session_id);

#if defined(ENABLE_PEPPER_CDMS)

// Callback to create the Pepper plugin.