content/renderer/render_frame_impl.h - Issue 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions

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 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add new path for createMediaPlayer() Created 5 years, 5 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

« content/renderer/media/android/webmediaplayer_android.cc ('K') | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | content/renderer/render_frame_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.h

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

index 5d640a9d643263502cdf5cd6b0564049f8662c62..00c82898b9963a52b37c33aa1661a6a3a5aede0a 100644

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

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

@@ -355,11 +355,18 @@ class CONTENT_EXPORT RenderFrameImpl

const blink::WebPluginParams&) override;

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

const blink::WebPluginParams& params);

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

virtual blink::WebMediaPlayer* createMediaPlayer(

blink::WebLocalFrame* frame,

const blink::WebURL& url,

blink::WebMediaPlayerClient* client,

blink::WebContentDecryptionModule* initial_cdm);

+ virtual blink::WebMediaPlayer* createMediaPlayer(

+ blink::WebLocalFrame* frame,

+ const blink::WebURL& url,

+ blink::WebMediaPlayerClient* client,

+ blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,

+ blink::WebContentDecryptionModule* initial_cdm);

virtual blink::WebApplicationCacheHost* createApplicationCacheHost(

blink::WebLocalFrame* frame,

blink::WebApplicationCacheHostClient* client);

@@ -807,6 +814,7 @@ class CONTENT_EXPORT RenderFrameImpl

#if defined(OS_ANDROID)

blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(

blink::WebMediaPlayerClient* client,

+ blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,

media::MediaPermission* media_permission,

blink::WebContentDecryptionModule* initial_cdm);