[X2Go-Commits] [pale-moon] 14/294: Build bustage fixes

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 05a51611bc15f436adac30ea7097a48bb7c7b51e
Author: trav90 <travawine at protonmail.ch>
Date:   Fri Feb 8 14:40:12 2019 -0600

    Build bustage fixes
---
 dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp b/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp
index ab62ba7..1504806 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,

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git