Commit acf5a0d3 authored by jrummell's avatar jrummell Committed by Commit bot

Remove PROMISES_SUPPORTED check now that the promises code has landed.

BUG=358271
TEST=EME browser tests pass

Review URL: https://codereview.chromium.org/550933003

Cr-Commit-Position: refs/heads/master@{#293814}
parent d2ba7bcc
...@@ -23,11 +23,7 @@ ClearKeyPlayer.prototype.onMessage = function(message) { ...@@ -23,11 +23,7 @@ ClearKeyPlayer.prototype.onMessage = function(message) {
Utils.getInitDataFromMessage(message, this.testConfig.mediaType, true); Utils.getInitDataFromMessage(message, this.testConfig.mediaType, true);
var key = Utils.getDefaultKey(this.testConfig.forceInvalidResponse); var key = Utils.getDefaultKey(this.testConfig.forceInvalidResponse);
var jwkSet = Utils.createJWKData(initData, key); var jwkSet = Utils.createJWKData(initData, key);
if (PROMISES_SUPPORTED) { message.target.update(jwkSet).catch(function(error) {
message.target.update(jwkSet).catch(function(error) { Utils.failTest(error, KEY_ERROR);
Utils.failTest(error, KEY_ERROR); });
});
} else {
message.target.update(jwkSet);
}
}; };
...@@ -56,13 +56,10 @@ EME_VERSIONS_OPTIONS[EME_UNPREFIXED_VERSION] = EME_UNPREFIXED_VERSION; ...@@ -56,13 +56,10 @@ EME_VERSIONS_OPTIONS[EME_UNPREFIXED_VERSION] = EME_UNPREFIXED_VERSION;
EME_VERSIONS_OPTIONS[EME_PREFIXED_VERSION] = EME_PREFIXED_VERSION; EME_VERSIONS_OPTIONS[EME_PREFIXED_VERSION] = EME_PREFIXED_VERSION;
var EME_DISABLED_OPTIONS = []; var EME_DISABLED_OPTIONS = [];
var PROMISES_SUPPORTED = false;
if (!document.createElement('video').webkitAddKey) if (!document.createElement('video').webkitAddKey)
EME_DISABLED_OPTIONS.push(EME_PREFIXED_VERSION); EME_DISABLED_OPTIONS.push(EME_PREFIXED_VERSION);
if (!document.createElement('video').setMediaKeys) if (!document.createElement('video').setMediaKeys)
EME_DISABLED_OPTIONS.push(EME_UNPREFIXED_VERSION); EME_DISABLED_OPTIONS.push(EME_UNPREFIXED_VERSION);
else
PROMISES_SUPPORTED = MediaKeys.create != undefined;
// Global document elements ID's. // Global document elements ID's.
var VIDEO_ELEMENT_ID = 'video'; var VIDEO_ELEMENT_ID = 'video';
......
...@@ -59,14 +59,10 @@ PlayerUtils.registerEMEEventListeners = function(player) { ...@@ -59,14 +59,10 @@ PlayerUtils.registerEMEEventListeners = function(player) {
try { try {
var session = message.target.mediaKeys.createSession( var session = message.target.mediaKeys.createSession(
message.contentType, message.initData); message.contentType, message.initData);
if (PROMISES_SUPPORTED) { session.then(addMediaKeySessionListeners)
session.then(addMediaKeySessionListeners) .catch(function(error) {
.catch (function(error) { Utils.failTest(error, KEY_ERROR);
Utils.failTest(error, KEY_ERROR); });
});
} else {
addMediaKeySessionListeners(session);
}
} catch (e) { } catch (e) {
Utils.failTest(e); Utils.failTest(e);
} }
...@@ -74,15 +70,11 @@ PlayerUtils.registerEMEEventListeners = function(player) { ...@@ -74,15 +70,11 @@ PlayerUtils.registerEMEEventListeners = function(player) {
this.registerDefaultEventListeners(player); this.registerDefaultEventListeners(player);
try { try {
Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem); Utils.timeLog('Setting video media keys: ' + player.testConfig.keySystem);
if (PROMISES_SUPPORTED) { MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) {
MediaKeys.create(player.testConfig.keySystem).then(function(mediaKeys) { player.video.setMediaKeys(mediaKeys);
player.video.setMediaKeys(mediaKeys); }).catch(function(error) {
}).catch(function(error) { Utils.failTest(error, NOTSUPPORTEDERROR);
Utils.failTest(error, NOTSUPPORTEDERROR); });
});
} else {
player.video.setMediaKeys(new MediaKeys(player.testConfig.keySystem));
}
} catch (e) { } catch (e) {
Utils.failTest(e); Utils.failTest(e);
} }
......
...@@ -23,14 +23,9 @@ WidevinePlayer.prototype.onMessage = function(message) { ...@@ -23,14 +23,9 @@ WidevinePlayer.prototype.onMessage = function(message) {
function onSuccess(response) { function onSuccess(response) {
var key = new Uint8Array(response); var key = new Uint8Array(response);
Utils.timeLog('Update media key session with license response.', key); Utils.timeLog('Update media key session with license response.', key);
if (PROMISES_SUPPORTED) { mediaKeySession.update(key).catch(function(error) {
mediaKeySession.update(key).catch(function(error) { Utils.failTest(error, KEY_ERROR);
Utils.failTest(error, KEY_ERROR); });
});
} else {
mediaKeySession.update(key);
}
} }
Utils.sendRequest('POST', Utils.sendRequest('POST',
'arraybuffer', 'arraybuffer',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment