Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 08:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1324925 - Backed out changeset 229e1278d976. r=backout

Browse Source 
MozReview-Commit-ID: NnHo7YXFls
This commit is contained in:
Chris Pearce 2017-01-27 12:30:33 +13:00
parent 0d6e9dc9ff
commit c4a0c6d738
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/eme/MediaKeySession.cpp
View File

@ -638,14 +638,14 @@ MediaKeySession::MakePromise(ErrorResult& aRv, const nsACString& aName)
}
void
MediaKeySession::SetExpiration(double aSecondsSinceEpoch)
MediaKeySession::SetExpiration(double aExpiration)
{
EME_LOG("MediaKeySession[%p,'%s'] SetExpiry(%.12lf) (%.2lf hours from now)",
this,
NS_ConvertUTF16toUTF8(mSessionId).get(),
aSecondsSinceEpoch,
aSecondsSinceEpoch - double(time(0)) / (60 * 60));
mExpiration = aSecondsSinceEpoch;
aExpiration,
(aExpiration - 1000.0 * double(time(0))) / (1000.0 * 60 * 60));
mExpiration = aExpiration;
}
EventHandlerNonNull*

5
dom/media/gmp/GMPDecryptorChild.cpp
View File

@ -125,11 +125,10 @@ GMPDecryptorChild::SessionMessage(const char* aSessionId,
void
GMPDecryptorChild::ExpirationChange(const char* aSessionId,
uint32_t aSessionIdLength,
GMPTimestamp aMillisecondsSinceEpoch)
GMPTimestamp aExpiryTime)
{
CALL_ON_GMP_THREAD(SendExpirationChange,
nsCString(aSessionId, aSessionIdLength),
aMillisecondsSinceEpoch / 1e3);
nsCString(aSessionId, aSessionIdLength), aExpiryTime);
}
void

6
dom/media/gmp/GMPDecryptorParent.cpp
View File

@ -307,16 +307,16 @@ GMPDecryptorParent::RecvSessionMessage(const nsCString& aSessionId,
mozilla::ipc::IPCResult
GMPDecryptorParent::RecvExpirationChange(const nsCString& aSessionId,
const double& aSecondsSinceEpoch)
const double& aExpiryTime)
{
LOGD(("GMPDecryptorParent[%p]::RecvExpirationChange(sessionId='%s', expiry=%lf)",
this, aSessionId.get(), aSecondsSinceEpoch));
this, aSessionId.get(), aExpiryTime));
if (!mIsOpen) {
NS_WARNING("Trying to use a dead GMP decrypter!");
return IPC_FAIL_NO_REASON(this);
}
mCallback->ExpirationChange(aSessionId, aSecondsSinceEpoch);
mCallback->ExpirationChange(aSessionId, aExpiryTime);
return IPC_OK();
}

2
dom/media/gmp/PGMPDecryptor.ipdl
View File

@ -71,7 +71,7 @@ parent:
GMPSessionMessageType aMessageType,
uint8_t[] aMessage);
async ExpirationChange(nsCString aSessionId, double aSecondsSinceEpoch);
async ExpirationChange(nsCString aSessionId, double aExpiryTime);
async SessionClosed(nsCString aSessionId);