Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-09 14:38:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision 9817f7f027fe1e92cc2fce31d6002c4d669918e8

Browse source
This commit is contained in:
WPT Sync Bot 2018-03-08 20:11:36 -05:00 • committed by Josh Matthews
parent 8e52f8a523
commit f3533538ea
2144 changed files with 21364 additions and 11001 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/wpt/web-platform-tests/encrypted-media/util/drm-messagehandler.js
View file

@ -107,11 +107,14 @@ const requestConstructors = {
outputProtection: {digital : false, analogue: false, enforce: false},
storeLicense: (sessionType === 'persistent-license')};
if (!params || params.expiration === undefined) {
if (!params || (params.expiration === undefined && params.playDuration === undefined)) {
crt.profile = {purchase: {}};
} else {
crt.profile = {rental: {absoluteExpiration: (new Date(params.expiration)).toISOString(),
playDuration: 3600000 } };
var expiration = params.expiration || (Date.now().valueOf() + 3600000),
playDuration = params.playDuration || 3600000;
crt.profile = {rental: {absoluteExpiration: (new Date(expiration)).toISOString(),
playDuration: playDuration } };
}
if (content.variantId !== undefined) {

38
tests/wpt/web-platform-tests/encrypted-media/util/utils.js
View file

@ -173,32 +173,34 @@ function arrayBufferAsString(buffer)
return '0x' + array.map( function( x ) { return x < 16 ? '0'+x.toString(16) : x.toString(16); } ).join('');
}
function dumpKeyStatuses(keyStatuses)
function dumpKeyStatuses(keyStatuses,short)
{
var userAgent = navigator.userAgent.toLowerCase();
if (userAgent.indexOf('edge') === -1) {
consoleWrite("for (var entry of keyStatuses)");
if (!short) { consoleWrite("for (var entry of keyStatuses)"); }
for (var entry of keyStatuses) {
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
}
consoleWrite("for (var keyId of keyStatuses.keys())");
for (var keyId of keyStatuses.keys()) {
consoleWrite(arrayBufferAsString(keyId));
if (!short) {
consoleWrite("for (var keyId of keyStatuses.keys())");
for (var keyId of keyStatuses.keys()) {
consoleWrite(arrayBufferAsString(keyId));
}
consoleWrite("for (var status of keyStatuses.values())");
for (var status of keyStatuses.values()) {
consoleWrite(status);
}
consoleWrite("for (var entry of keyStatuses.entries())");
for (var entry of keyStatuses.entries()) {
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
}
consoleWrite("keyStatuses.forEach()");
keyStatuses.forEach(function(status, keyId) {
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
});
}
consoleWrite("for (var status of keyStatuses.values())");
for (var status of keyStatuses.values()) {
consoleWrite(status);
}
consoleWrite("for (var entry of keyStatuses.entries())");
for (var entry of keyStatuses.entries()) {
consoleWrite(arrayBufferAsString(entry[0]) + ": " + entry[1]);
}
consoleWrite("keyStatuses.forEach()");
keyStatuses.forEach(function(status, keyId) {
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
});
} else {
consoleWrite("keyStatuses.forEach()");
if (!short) { consoleWrite("keyStatuses.forEach()"); }
keyStatuses.forEach(function(keyId, status) {
consoleWrite(arrayBufferAsString(keyId) + ": " + status);
});