From f14cc10a3d1fe026773e399d10d332e2ddf04e67 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Thu, 26 Nov 2015 13:51:05 +1300
Subject: [PATCH] Bug 1227790 - Update GMP API to include new MediaKeyStatus
 types. r=jwwang

---
 dom/media/eme/MediaKeyStatusMap.cpp    | 4 +++-
 dom/media/gmp/gmp-api/gmp-decryption.h | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dom/media/eme/MediaKeyStatusMap.cpp b/dom/media/eme/MediaKeyStatusMap.cpp
index 694475e1c76c..3b43ca9e1124 100644
--- a/dom/media/eme/MediaKeyStatusMap.cpp
+++ b/dom/media/eme/MediaKeyStatusMap.cpp
@@ -108,8 +108,10 @@ ToMediaKeyStatus(GMPMediaKeyStatus aStatus) {
     case kGMPUsable: return MediaKeyStatus::Usable;
     case kGMPExpired: return MediaKeyStatus::Expired;
     case kGMPOutputDownscaled: return MediaKeyStatus::Output_downscaled;
-    case kGMPOutputNotAllowed: return MediaKeyStatus::Output_not_allowed;
+    case kGMPOutputRestricted: return MediaKeyStatus::Output_restricted;
     case kGMPInternalError: return MediaKeyStatus::Internal_error;
+    case kGMPReleased: return MediaKeyStatus::Released;
+    case kGMPStatusPending: return MediaKeyStatus::Status_pending;
     default: return MediaKeyStatus::Internal_error;
   }
 }
diff --git a/dom/media/gmp/gmp-api/gmp-decryption.h b/dom/media/gmp/gmp-api/gmp-decryption.h
index 9956ba8e25dc..86c845a424a8 100644
--- a/dom/media/gmp/gmp-api/gmp-decryption.h
+++ b/dom/media/gmp/gmp-api/gmp-decryption.h
@@ -94,10 +94,12 @@ enum GMPMediaKeyStatus {
   kGMPUsable = 0,
   kGMPExpired = 1,
   kGMPOutputDownscaled = 2,
-  kGMPOutputNotAllowed = 3,
+  kGMPOutputRestricted = 3,
   kGMPInternalError = 4,
-  kGMPUnknown = 5,
-  kGMPMediaKeyStatusInvalid = 6 // Must always be last.
+  kGMPUnknown = 5, // Removes key from MediaKeyStatusMap
+  kGMPReleased = 6,
+  kGMPStatusPending = 7,
+  kGMPMediaKeyStatusInvalid = 8 // Must always be last.
 };
 
 // Time in milliseconds, as offset from epoch, 1 Jan 1970.