| 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 prefixed EME API after unprefixed EME API.</p> | 12 <p>Call prefixed EME API after unprefixed 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 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys)
{ | 21 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys)
{ |
| 22 assert_not_equals(mediaKeys, null); | 22 assert_not_equals(mediaKeys, null); |
| 23 assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); | 23 assert_equals(mediaKeys.keySystem, 'org.w3.clearkey'); |
| 24 video.setMediaKeys(mediaKeys); | 24 return video.setMediaKeys(mediaKeys); |
| 25 }).then(function(result) { |
| 25 assert_throws('InvalidStateError', | 26 assert_throws('InvalidStateError', |
| 26 function () { video.webkitGenerateKeyReque
st('webkit-org.w3.clearkey'); }); | 27 function () { video.webkitGenerateKeyReque
st('webkit-org.w3.clearkey'); }); |
| 27 test.done(); | 28 test.done(); |
| 28 }).catch(function(error) { | 29 }).catch(function(error) { |
| 29 forceTestFailureFromPromise(test, error); | 30 forceTestFailureFromPromise(test, error); |
| 30 }); | 31 }); |
| 31 } | 32 } |
| 32 | 33 |
| 33 video.src = '../content/test.webm'; | 34 video.src = '../content/test.webm'; |
| 34 waitForEventAndRunStep('loadstart', video, loadStarted, test); | 35 waitForEventAndRunStep('loadstart', video, loadStarted, test); |
| 35 }, 'Call prefixed EME API after unprefixed EME API.'); | 36 }, 'Call prefixed EME API after unprefixed EME API.'); |
| 36 </script> | 37 </script> |
| 37 </body> | 38 </body> |
| 38 </html> | 39 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 423633002:
Make HTMLMediaElement.setMediaKeys() asynchronous. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master