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

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

Patch Set: 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.cc

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

index 0fd74e8390402a15d3cc42dd6a12370e7555c171..c79ee7a93bb96921407ab543f142d1138eb36843 100644

--- a/media/blink/webmediaplayer_impl.cc

+++ b/media/blink/webmediaplayer_impl.cc

@@ -679,13 +679,6 @@ void WebMediaPlayerImpl::setContentDecryptionModule(

encrypted_media_support_->SetContentDecryptionModule(cdm, result);

}

-void WebMediaPlayerImpl::setContentDecryptionModuleSync(

- blink::WebContentDecryptionModule* cdm) {

- DCHECK(main_task_runner_->BelongsToCurrentThread());

- encrypted_media_support_->SetContentDecryptionModuleSync(cdm);

void WebMediaPlayerImpl::OnPipelineSeeked(bool time_changed,

PipelineStatus status) {

DVLOG(1) << __FUNCTION__ << "(" << time_changed << ", " << status << ")";