Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html

Issue 543173002: Implement MediaKeySession.generateRequest() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: create early 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:
View unified diff | Download patch
« LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('K') | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('k') | Source/modules/encryptedmedia/MediaKeySession.h » ('j') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>Waiting for a key.</title> 4 <title>Waiting for a key.</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>
(...skipping 15 matching lines...) Expand all
26 assert_equals(event.target, video); 26 assert_equals(event.target, video);
27 assert_true(event instanceof window.MediaKeyNeededEvent); 27 assert_true(event instanceof window.MediaKeyNeededEvent);
28 assert_equals(event.type, 'needkey'); 28 assert_equals(event.type, 'needkey');
29 29
30 // The same decryption key is shared by all streams so only 30 // The same decryption key is shared by all streams so only
31 // create a shared session once. 31 // create a shared session once.
32 if (sessionCreated) 32 if (sessionCreated)
33 return; 33 return;
34 sessionCreated = true; 34 sessionCreated = true;
35 35
36 video.mediaKeys.createSession(event.contentType, event.initD ata).then(function(newSession) { 36 mediaKeySession = video.mediaKeys.createSession();
37 mediaKeySession = newSession; 37 waitForEventAndRunStep('message', mediaKeySession, onMessage , test);
38 waitForEventAndRunStep('message', mediaKeySession, onMes sage, test); 38 mediaKeySession.generateRequest(event.contentType, event.ini tData).catch(function(error) {
39 }).catch(function(error) {
40 forceTestFailureFromPromise(test, error); 39 forceTestFailureFromPromise(test, error);
41 }); 40 });
42 } 41 }
43 42
44 function onMessage(event) 43 function onMessage(event)
45 { 44 {
46 assert_true(event instanceof window.MediaKeyMessageEvent); 45 assert_true(event instanceof window.MediaKeyMessageEvent);
47 assert_equals(event.target, mediaKeySession); 46 assert_equals(event.target, mediaKeySession);
48 assert_equals(event.type, 'message'); 47 assert_equals(event.type, 'message');
49 48
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 video.setMediaKeys(mediaKeys); 95 video.setMediaKeys(mediaKeys);
97 video.src = '../content/test-encrypted.webm'; 96 video.src = '../content/test-encrypted.webm';
98 video.play(); 97 video.play();
99 }).catch(function(error) { 98 }).catch(function(error) {
100 forceTestFailureFromPromise(test, error); 99 forceTestFailureFromPromise(test, error);
101 }); 100 });
102 }, 'Waiting for a key.'); 101 }, 'Waiting for a key.');
103 </script> 102 </script>
104 </body> 103 </body>
105 </html> 104 </html>
OLDNEW
« LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('K') | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('k') | Source/modules/encryptedmedia/MediaKeySession.h » ('j') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698