Add MediaKeySession.expiration attribute.

Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
 #include "platform/Logging.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebContentDecryptionModuleException.h"
 #include "public/platform/WebContentDecryptionModuleSession.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferView.h"
+#include <cmath>
+#include <limits>

[sandersd (OOO until July 31), 2014/10/01 22:57:52]

These should be between the two exiting #include blocks.

[jrummell, 2014/10/03 00:36:10]

Blink style guide says this is correct (and the presubmit check complains if
done the other way).
http://www.chromium.org/blink/coding-style#TOC-include-Statements

 
 namespace blink {
 
 static bool isKeySystemSupportedWithInitDataType(const String& keySystem, const String& initDataType)
 {
     ASSERT(!keySystem.isEmpty());
 
     // FIXME: initDataType != contentType. Implement this properly.
     // http://crbug.com/385874.
     String contentType = initDataType;
@@ skipping 149 matching lines @@
     session->suspendIfNeeded();
     return session.get();
 }
 
 MediaKeySession::MediaKeySession(ScriptState* scriptState, MediaKeys* mediaKeys, const String& sessionType)
     : ActiveDOMObject(scriptState->executionContext())
     , m_keySystem(mediaKeys->keySystem())
     , m_asyncEventQueue(GenericEventQueue::create(this))
     , m_mediaKeys(mediaKeys)
     , m_sessionType(sessionType)
+    , m_expiration(std::numeric_limits<double>::quiet_NaN())
     , m_isUninitialized(true)
     , m_isCallable(false)
     , m_isClosed(false)
     , m_closedPromise(new ClosedPromise(scriptState->executionContext(), this, ClosedPromise::Closed))
     , m_actionTimer(this, &MediaKeySession::actionTimerFired)
 {
     WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this);
 
     // Create the matching Chromium object. It will not be usable until
     // initializeNewSession() is called in response to the user calling
     // generateRequest().
     WebContentDecryptionModule* cdm = mediaKeys->contentDecryptionModule();
     m_session = adoptPtr(cdm->createSession());
     m_session->setClientInterface(this);
 
     // MediaKeys::createSession(), step 2.
     // 2.1 Let the sessionId attribute be the empty string.
     ASSERT(sessionId().isEmpty());
 
     // 2.2 Let the expiration attribute be NaN.
-    // FIXME: Add expiration property.
+    ASSERT(std::isnan(m_expiration));
 
     // 2.3 Let the closed attribute be a new promise.
     ASSERT(!closed(scriptState).isUndefinedOrNull());
 
     // 2.4 Let the session type be sessionType.
     ASSERT(sessionType == m_sessionType);
 
     // 2.5 Let uninitialized be true.
     ASSERT(m_isUninitialized);
 
@@ skipping 346 matching lines @@
         errorCode = MediaKeyErrorCodeClient;
         break;
     default:
         // All other exceptions get converted into Unknown.
         errorCode = MediaKeyErrorCodeUnknown;
         break;
     }
     error(errorCode, systemCode);
 }
 
+void MediaKeySession::expirationChanged(double updatedExpiryTimeInMS)
+{
+    m_expiration = updatedExpiryTimeInMS;
+}
+
 const AtomicString& MediaKeySession::interfaceName() const
 {
     return EventTargetNames::MediaKeySession;
 }
 
 ExecutionContext* MediaKeySession::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
@@ skipping 29 matching lines @@
 {
     visitor->trace(m_error);
     visitor->trace(m_asyncEventQueue);
     visitor->trace(m_pendingActions);
     visitor->trace(m_mediaKeys);
     visitor->trace(m_closedPromise);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink