diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2019-11-10 15:35:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-10 15:35:44 -0500 |
| commit | b00601953bade944cd6df9cde6fcdd1f10d76feb (patch) | |
| tree | 71531773f24b5e2ed5f47d8958cfa7268a169bcf /dom/media/eme/MediaKeySystemAccessManager.cpp | |
| parent | ccb7e2c646eebbd4742b072f6f02195659fb0d9d (diff) | |
| parent | c43b770a0399b5e03a6f6e4d2292e0408b186433 (diff) | |
| download | UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.gz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.lz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.xz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.zip | |
Merge pull request #1277 from adeshkp/remove-adobe-primetime
Remove Adobe Primetime support
Diffstat (limited to 'dom/media/eme/MediaKeySystemAccessManager.cpp')
| -rw-r--r-- | dom/media/eme/MediaKeySystemAccessManager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dom/media/eme/MediaKeySystemAccessManager.cpp b/dom/media/eme/MediaKeySystemAccessManager.cpp index 8fefc62ec..ed31059e2 100644 --- a/dom/media/eme/MediaKeySystemAccessManager.cpp +++ b/dom/media/eme/MediaKeySystemAccessManager.cpp @@ -95,8 +95,7 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise, // Ensure keysystem is supported. if (!IsWidevineKeySystem(aKeySystem) && - !IsClearkeyKeySystem(aKeySystem) && - !IsPrimetimeKeySystem(aKeySystem)) { + !IsClearkeyKeySystem(aKeySystem)) { // Not to inform user, because nothing to do if the keySystem is not // supported. aPromise->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR, @@ -132,7 +131,7 @@ MediaKeySystemAccessManager::Request(DetailedPromise* aPromise, LogToBrowserConsole(NS_ConvertUTF8toUTF16(msg)); if (status == MediaKeySystemStatus::Cdm_not_installed && - (IsPrimetimeKeySystem(aKeySystem) || IsWidevineKeySystem(aKeySystem))) { + IsWidevineKeySystem(aKeySystem)) { // These are cases which could be resolved by downloading a new(er) CDM. // When we send the status to chrome, chrome's GMPProvider will attempt to // download or update the CDM. In AwaitInstall() we add listeners to wait |