summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@protonmail.ch>2019-02-08 14:40:12 -0600
committertrav90 <travawine@protonmail.ch>2019-02-08 14:40:12 -0600
commit05a51611bc15f436adac30ea7097a48bb7c7b51e (patch)
tree3212704bbd1faa317fd7d83ee581da677339a9e8
parent3a6a37ca1b335dc97247f7facae46bc026802e03 (diff)
downloadUXP-05a51611bc15f436adac30ea7097a48bb7c7b51e.tar
UXP-05a51611bc15f436adac30ea7097a48bb7c7b51e.tar.gz
UXP-05a51611bc15f436adac30ea7097a48bb7c7b51e.tar.lz
UXP-05a51611bc15f436adac30ea7097a48bb7c7b51e.tar.xz
UXP-05a51611bc15f436adac30ea7097a48bb7c7b51e.zip
Build bustage fixes
-rw-r--r--dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp b/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp
index ab62ba7ef..150480644 100644
--- a/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp
+++ b/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp
@@ -302,7 +302,7 @@ WidevineDecryptor::GetCurrentWallTime()
}
void
-ChromiumCDMChild::OnResolveKeyStatusPromise(uint32_t aPromiseId,
+WidevineDecryptor::OnResolveKeyStatusPromise(uint32_t aPromiseId,
cdm::KeyStatus aKeyStatus) {
//TODO: The callback of GetStatusForPolicy. See Mozilla bug 1404230.
}
@@ -351,6 +351,10 @@ ConvertCDMErrorToCDMException(cdm::Error error) {
return cdm::Exception::kExceptionTypeError;
case cdm::kQuotaExceededError:
return cdm::Exception::kExceptionQuotaExceededError;
+
+ case cdm::kUnknownError:
+ case cdm::kClientError:
+ case cdm::kOutputError:
break;
}
@@ -370,7 +374,7 @@ WidevineDecryptor::OnRejectPromise(uint32_t aPromiseId,
return;
}
Log("Decryptor::OnRejectPromise(aPromiseId=%d, err=%d, sysCode=%u, msg=%s)",
- aPromiseId, (int)aError, aSystemCode, aErrorMessage);
+ aPromiseId, (int)aException, aSystemCode, aErrorMessage);
mCallback->RejectPromise(aPromiseId,
ToGMPDOMException(aException),
!aErrorMessageSize ? "" : aErrorMessage,