Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp

Issue 2650033007: media: Fix expiry time convertion from base::Time to JS time (Closed)
Patch Set: media: Fix expiry time convertion from base::Time to JS time Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
index ec57adb2d1bcfa4d4735e132f89ff9e7728e7b3a..e2fca3efce480500ad4bc57702be7baf15ebdf24 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -955,9 +955,7 @@ void MediaKeySession::expirationChanged(double updatedExpiryTimeInMS) {
// 3. If the new expiration time is not NaN, let expiration time be the
// new expiration time in milliseconds since 01 January 1970 UTC.
- // (Note that Chromium actually passes 0 to indicate no expiry.)
- // FIXME: Get Chromium to pass NaN.
- if (!std::isnan(updatedExpiryTimeInMS) && updatedExpiryTimeInMS != 0.0)
+ if (!std::isnan(updatedExpiryTimeInMS))
expirationTime = updatedExpiryTimeInMS;
// 4. Set the session's expiration attribute to expiration time.
« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698