LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html - 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: LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html

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

« LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html ('K') | « LayoutTests/media/encrypted-media/encrypted-media-setmediakeys.html ('k') | LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html » ('j') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html b/LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html

index 6ae791155c38e26370251baf827560393a525236..fa85dfb6eee5fbca0f78158ec68e447c277dc817 100644

--- a/LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html

+++ b/LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html

@@ -22,9 +22,11 @@

MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {

assert_not_equals(mediaKeys, null);

assert_equals(mediaKeys.keySystem, 'org.w3.clearkey');

- assert_throws('InvalidStateError',

- function () { video.setMediaKeys(mediaKeys); });

- test.done();

+ video.setMediaKeys(mediaKeys).then(function(result) {

+ assert_unreached('setMediaKeys should have failed.');

+ }, function(error) {

+ test.done();

ddorwin 2014/08/08 02:50:51 check the error

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

+ });

}).catch(function(error) {

forceTestFailureFromPromise(test, error);

});