content/renderer/media/crypto/proxy_decryptor.h - Issue 616183002: Revert of Pass initDataType instead of contentType on OnNeedKey().

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 616183002: Revert of Pass initDataType instead of contentType on OnNeedKey(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« no previous file with comments | « content/renderer/media/crypto/encrypted_media_player_support_impl.cc ('k') | content/renderer/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 66d402ec77f9ab1104cef35109a0b4a10cbb8df8..0a6c298d682fd42932c0899c1163ec3dfacd022a 100644

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

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

@@ -72,7 +72,7 @@

const GURL& security_origin);

// May only be called after InitializeCDM() succeeds.

- bool GenerateKeyRequest(const std::string& init_data_type,

+ bool GenerateKeyRequest(const std::string& type,

const uint8* init_data,

int init_data_length);

void AddKey(const uint8* key, int key_length,