content/renderer/render_frame_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: content/renderer/render_frame_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: content/renderer/render_frame_impl.h

diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h

index be85ce971d685ae9050ac01e2257090aff96a541..e80c4afc71f53efc27fbf2aaee0cdd1d87180850 100644

--- a/content/renderer/render_frame_impl.h

+++ b/content/renderer/render_frame_impl.h

@@ -272,10 +272,16 @@ class CONTENT_EXPORT RenderFrameImpl

// blink::WebFrameClient implementation:

virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame,

const blink::WebPluginParams& params);

+ // TODO(jrummell): Remove this method once blink updated.

virtual blink::WebMediaPlayer* createMediaPlayer(

blink::WebLocalFrame* frame,

const blink::WebURL& url,

blink::WebMediaPlayerClient* client);

+ virtual blink::WebMediaPlayer* createMediaPlayer(

+ blink::WebLocalFrame* frame,

+ const blink::WebURL& url,

+ blink::WebMediaPlayerClient* client,

+ blink::WebContentDecryptionModule* initial_cdm);

virtual blink::WebContentDecryptionModule* createContentDecryptionModule(

blink::WebLocalFrame* frame,

const blink::WebSecurityOrigin& security_origin,

@@ -617,7 +623,8 @@ class CONTENT_EXPORT RenderFrameImpl

#if defined(OS_ANDROID)

blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(

const blink::WebURL& url,

- blink::WebMediaPlayerClient* client);

+ blink::WebMediaPlayerClient* client,

+ blink::WebContentDecryptionModule* initial_cdm);

RendererMediaPlayerManager* GetMediaPlayerManager();

#endif