LayoutTests/media/encrypted-media/encrypted-media-unprefixed-after-prefixed.html - Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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: Remove clearing (+rebase) 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 unified diff | Download patch

« no previous file with comments | « 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>Prefixed and unprefixed EME API</title>	4 <title>Prefixed and unprefixed EME API</title>

5 <script src="encrypted-media-utils.js"></script>	5 <script src="encrypted-media-utils.js"></script>

6 <script src="../../resources/testharness.js"></script>	6 <script src="../../resources/testharness.js"></script>

7 <script src="../../resources/testharnessreport.js"></script>	7 <script src="../../resources/testharnessreport.js"></script>

8 </head>	8 </head>

9 <body>	9 <body>

10 <video id="testVideo"></video>	10 <video id="testVideo"></video>

11 <div id="log"></div>	11 <div id="log"></div>

12 <p>Call unprefixed EME API after prefixed EME API.</p>	12 <p>Call unprefixed EME API after prefixed EME API.</p>

13 <script>	13 <script>

14 async_test(function(test)	14 async_test(function(test)

15 {	15 {

16 var video = document.getElementById('testVideo');	16 var video = document.getElementById('testVideo');

17 assert_not_equals(video, null);	17 assert_not_equals(video, null);

18	18

19 function loadStarted()	19 function loadStarted()

20 {	20 {

21 video.webkitGenerateKeyRequest('webkit-org.w3.clearkey');	21 video.webkitGenerateKeyRequest('webkit-org.w3.clearkey');

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

23 assert_not_equals(mediaKeys, null);	23 assert_not_equals(mediaKeys, null);

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

25 assert_throws('InvalidStateError',	25 video.setMediaKeys(mediaKeys).then(function(result) {

26 function () { video.setMediaKeys(mediaKey s); });	26 assert_unreached('setMediaKeys should have failed.') ;

27 test.done();	27 }, function(error) {

	28 assert_equals(error.name, 'InvalidStateError');

	29 assert_not_equals(error.message, '');

	30 test.done();

	31 });

28 }).catch(function(error) {	32 }).catch(function(error) {

29 forceTestFailureFromPromise(test, error);	33 forceTestFailureFromPromise(test, error);

30 });	34 });

31 }	35 }

32	36

33 video.src = '../content/test.webm';	37 video.src = '../content/test.webm';

34 waitForEventAndRunStep('loadstart', video, loadStarted, test);	38 waitForEventAndRunStep('loadstart', video, loadStarted, test);

35 }, 'Call unprefixed EME API after prefixed EME API.');	39 }, 'Call unprefixed EME API after prefixed EME API.');

36 </script>	40 </script>

37 </body>	41 </body>

38 </html>	42 </html>

OLD	NEW