Source/web/WebMediaPlayerClientImpl.cpp - Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous.

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: Source/web/WebMediaPlayerClientImpl.cpp

Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: sync method Created 6 years, 4 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

« Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp ('K') | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.idl ('k') | public/platform/WebMediaPlayer.h » ('j') | public/platform/WebMediaPlayer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/web/WebMediaPlayerClientImpl.cpp

diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp

index e1e3724826298eedfdee8ea34cf7442f44aafbe1..0122d360f3ed87ddf9f0e93f19955ba0e84135a2 100644

--- a/Source/web/WebMediaPlayerClientImpl.cpp

+++ b/Source/web/WebMediaPlayerClientImpl.cpp

@@ -13,6 +13,7 @@

#include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"

#include "modules/encryptedmedia/MediaKeyNeededEvent.h"

#include "modules/mediastream/MediaStreamRegistry.h"

+#include "platform/ContentDecryptionModuleResult.h"

ddorwin 2014/08/08 02:50:52 not needed

jrummell 2014/08/08 23:15:13 Done.

#include "platform/audio/AudioBus.h"

#include "platform/audio/AudioSourceProviderClient.h"

#include "platform/geometry/IntSize.h"

@@ -217,7 +218,7 @@ void WebMediaPlayerClientImpl::load(WebMediaPlayer::LoadType loadType, const WTF

m_webMediaPlayer->setPoster(poster);

// Tell WebMediaPlayer about any connected CDM (may be null).

- m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));

+ m_webMediaPlayer->setContentDecryptionModuleSync(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));

m_webMediaPlayer->load(loadType, kurl, corsMode);

}