content/renderer/media/crypto/proxy_media_keys.cc - Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME

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 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes 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

« no previous file with comments | « content/renderer/media/crypto/proxy_media_keys.h ('k') | content/renderer/pepper/content_decryptor_delegate.h » ('j') | content/renderer/pepper/content_decryptor_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e3867f1ddb25f87216e6410d880599dab56b3658..94fe5aa8e624ea186f3cb4299d2f953c83f54bfe 100644

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

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

@@ -161,14 +161,14 @@ void ProxyMediaKeys::OnSessionCreated(uint32 session_id,

void ProxyMediaKeys::OnSessionMessage(uint32 session_id,

const std::vector<uint8>& message,

- const GURL& destination_url) {

+ const GURL& legacy_destination_url) {

// TODO(jrummell): Once |message_type| is passed, use it rather than

// guessing from the URL.

media::MediaKeys::MessageType message_type =

- destination_url.is_empty() ? media::MediaKeys::LICENSE_REQUEST

- : media::MediaKeys::LICENSE_RENEWAL;

- session_message_cb_.Run(LookupWebSessionId(session_id), message_type,

- message);

+ legacy_destination_url.is_empty() ? media::MediaKeys::LICENSE_REQUEST

+ : media::MediaKeys::LICENSE_RENEWAL;

+ session_message_cb_.Run(LookupWebSessionId(session_id), message_type, message,

+ legacy_destination_url);

}

void ProxyMediaKeys::OnSessionReady(uint32 session_id) {