Bug 1290830 - [Part3] Fix timestamp type from double to int64_t for ExpirationChange in PGMPDecryptor.ipdl. r?cpearce draft
authorJames Cheng <jacheng@mozilla.com>
Mon, 15 Aug 2016 13:19:01 +0800
changeset 400557 1e5fc91a03cd7c98c37e01836709a110262762bd
parent 400556 488560880b9cfc0aceded763bfb321009c4ee4e0
child 528239 9d6b9af1edf8f3e1407cf4a93cec4a09338b498e
push id26188
push userbmo:jacheng@mozilla.com
push dateMon, 15 Aug 2016 05:40:19 +0000
reviewerscpearce
bugs1290830
milestone51.0a1
Bug 1290830 - [Part3] Fix timestamp type from double to int64_t for ExpirationChange in PGMPDecryptor.ipdl. r?cpearce MozReview-Commit-ID: 4dznu2Md1r3
dom/media/gmp/GMPDecryptorParent.cpp
dom/media/gmp/GMPDecryptorParent.h
dom/media/gmp/PGMPDecryptor.ipdl
--- a/dom/media/gmp/GMPDecryptorParent.cpp
+++ b/dom/media/gmp/GMPDecryptorParent.cpp
@@ -290,19 +290,19 @@ GMPDecryptorParent::RecvSessionMessage(c
     return false;
   }
   mCallback->SessionMessage(aSessionId, ToMediaKeyMessageType(aMessageType), aMessage);
   return true;
 }
 
 bool
 GMPDecryptorParent::RecvExpirationChange(const nsCString& aSessionId,
-                                         const double& aExpiryTime)
+                                         const int64_t& aExpiryTime)
 {
-  LOGD(("GMPDecryptorParent[%p]::RecvExpirationChange(sessionId='%s', expiry=%lf)",
+  LOGD(("GMPDecryptorParent[%p]::RecvExpirationChange(sessionId='%s', expiry=%lld)",
         this, aSessionId.get(), aExpiryTime));
 
   if (!mIsOpen) {
     NS_WARNING("Trying to use a dead GMP decrypter!");
     return false;
   }
   mCallback->ExpirationChange(aSessionId, aExpiryTime);
   return true;
--- a/dom/media/gmp/GMPDecryptorParent.h
+++ b/dom/media/gmp/GMPDecryptorParent.h
@@ -84,17 +84,17 @@ private:
                          const GMPDOMException& aException,
                          const nsCString& aMessage) override;
 
   bool RecvSessionMessage(const nsCString& aSessionId,
                           const GMPSessionMessageType& aMessageType,
                           nsTArray<uint8_t>&& aMessage) override;
 
   bool RecvExpirationChange(const nsCString& aSessionId,
-                            const double& aExpiryTime) override;
+                            const int64_t& aExpiryTime) override;
 
   bool RecvSessionClosed(const nsCString& aSessionId) override;
 
   bool RecvSessionError(const nsCString& aSessionId,
                         const GMPDOMException& aException,
                         const uint32_t& aSystemCode,
                         const nsCString& aMessage) override;
 
--- a/dom/media/gmp/PGMPDecryptor.ipdl
+++ b/dom/media/gmp/PGMPDecryptor.ipdl
@@ -65,29 +65,29 @@ parent:
   async RejectPromise(uint32_t aPromiseId,
                       GMPDOMException aDOMExceptionCode,
                       nsCString aMessage);
 
   async SessionMessage(nsCString aSessionId,
                        GMPSessionMessageType aMessageType,
                        uint8_t[] aMessage);
 
-  async ExpirationChange(nsCString aSessionId, double aExpiryTime);
+  async ExpirationChange(nsCString aSessionId, int64_t aExpiryTime);
 
   async SessionClosed(nsCString aSessionId);
 
   async SessionError(nsCString aSessionId,
                      GMPDOMException aDOMExceptionCode,
                      uint32_t aSystemCode,
                      nsCString aMessage);
 
   async KeyStatusChanged(nsCString aSessionId, uint8_t[] aKey,
                          GMPMediaKeyStatus aStatus);
 
-  async KeyStatusUnknown(nsCString aSessionId, uint8_t[] aKey);
+  async ForgetKeyStatus(nsCString aSessionId, uint8_t[] aKey);
 
   async Decrypted(uint32_t aId, GMPErr aResult, uint8_t[] aBuffer);
 
   async Shutdown();
 };
 
 } // namespace gmp
 } // namespace mozilla