webkit/renderer/media/android/media_source_delegate.h - Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

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: webkit/renderer/media/android/media_source_delegate.h

Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters. (Closed) Base URL: master

Patch Set: rebase only Created 7 years, 6 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: webkit/renderer/media/android/media_source_delegate.h

diff --git a/webkit/renderer/media/android/media_source_delegate.h b/webkit/renderer/media/android/media_source_delegate.h

index 00467d68763d2ee481b642cfa328af39cab1a788..dfe717f6dc145c99e15448b0e698aeda35d3e986 100644

--- a/webkit/renderer/media/android/media_source_delegate.h

+++ b/webkit/renderer/media/android/media_source_delegate.h

@@ -100,8 +100,7 @@ class MediaSourceDelegate : public media::DemuxerHost {

void OnDemuxerInitDone(media::PipelineStatus status);

void OnDemuxerStopDone();

void OnDemuxerOpened();

- void OnNeedKey(const std::string& key_system,

- const std::string& type,

+ void OnNeedKey(const std::string& type,

const std::string& session_id,

scoped_ptr<uint8[]> init_data,

int init_data_size);