components/html_viewer/html_document.cc - 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: components/html_viewer/html_document.cc

Issue 1133033003: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« components/html_viewer/html_document.h ('K') | « components/html_viewer/html_document.h ('k') | content/renderer/render_frame_impl.h » ('j') | media/blink/encrypted_media_player_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/html_viewer/html_document.cc

diff --git a/components/html_viewer/html_document.cc b/components/html_viewer/html_document.cc

index 227dae3280360905fbce1ceccaabcbc185e17b14..a8f1d54453253fde33d2ecfcccbfd2ab41d253f3 100644

--- a/components/html_viewer/html_document.cc

+++ b/components/html_viewer/html_document.cc

@@ -239,14 +239,16 @@ blink::WebLayerTreeView* HTMLDocument::layerTreeView() {

blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(

blink::WebLocalFrame* frame,

const blink::WebURL& url,

- blink::WebMediaPlayerClient* client) {

- return createMediaPlayer(frame, url, client, nullptr);

+ blink::WebMediaPlayerClient* client,

+ blink::WebContentDecryptionModule* initial_cdm) {

+ return createMediaPlayer(frame, url, client, nullptr, nullptr);

ddorwin 2015/05/26 21:43:07 need to pass initial_cdm

Srirama 2015/05/27 14:48:50 Acknowledged.

}

blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(

blink::WebLocalFrame* frame,

const blink::WebURL& url,

blink::WebMediaPlayerClient* client,

+ blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,

blink::WebContentDecryptionModule* initial_cdm) {

blink::WebMediaPlayer* player =

web_media_player_factory_