media/blink/webmediaplayer_impl.h - Issue 594713002: Pass initial CDM to CreateMediaPlayer()

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: media/blink/webmediaplayer_impl.h

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes for android + mojo 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:

Index: media/blink/webmediaplayer_impl.h

diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h

index bbdf0802697939ba40ddf50067a1588a1373b128..3dc778f894c35b1e3a99e2235a0145a246fde33e 100644

--- a/media/blink/webmediaplayer_impl.h

+++ b/media/blink/webmediaplayer_impl.h

@@ -155,14 +155,12 @@ class MEDIA_EXPORT WebMediaPlayerImpl

const blink::WebString& session_id);

// TODO(jrummell): Remove this method once Blink updated to use the other

- // two methods.

+ // method.

virtual void setContentDecryptionModule(

blink::WebContentDecryptionModule* cdm);

virtual void setContentDecryptionModule(

blink::WebContentDecryptionModule* cdm,

blink::WebContentDecryptionModuleResult result);

- virtual void setContentDecryptionModuleSync(

- blink::WebContentDecryptionModule* cdm);

void OnPipelineSeeked(bool time_changed, PipelineStatus status);

void OnPipelineEnded();