Use __func__ instead of __FUNCTION__.

third_party/WebKit/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 307 matching lines @@
     , m_mediaKeys(mediaKeys)
     , m_sessionType(sessionType)
     , m_expiration(std::numeric_limits<double>::quiet_NaN())
     , m_keyStatusesMap(new MediaKeyStatusMap())
     , m_isUninitialized(true)
     , m_isCallable(false)
     , m_isClosed(false)
     , m_closedPromise(new ClosedPromise(scriptState->getExecutionContext(), this, ClosedPromise::Closed))
     , m_actionTimer(this, &MediaKeySession::actionTimerFired)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
     ThreadState::current()->registerPreFinalizer(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 = wrapUnique(cdm->createSession());
     m_session->setClientInterface(this);
 
     // From https://w3c.github.io/encrypted-media/#createSession:
@@ skipping 22 matching lines @@
     // 3.8 Let the use distinctive identifier value be this object's
     // use distinctive identifier.
     // FIXME: Implement this (http://crbug.com/448922).
 
     // 3.9 Let the cdm implementation value be this object's cdm implementation.
     // 3.10 Let the cdm instance value be this object's cdm instance.
 }
 
 MediaKeySession::~MediaKeySession()
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
 }
 
 void MediaKeySession::dispose()
 {
     // Promptly clears a raw reference from content/ to an on-heap object
     // so that content/ doesn't access it in a lazy sweeping phase.
     m_session.reset();
 }
 
 String MediaKeySession::sessionId() const
 {
     return m_session->sessionId();
 }
 
 ScriptPromise MediaKeySession::closed(ScriptState* scriptState)
 {
     return m_closedPromise->promise(scriptState->world());
 }
 
 MediaKeyStatusMap* MediaKeySession::keyStatuses()
 {
     return m_keyStatusesMap;
 }
 
 ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const String& initDataTypeString, const DOMArrayPiece& initData)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") " << initDataTypeString;
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") " << initDataTypeString;
 
     // From https://w3c.github.io/encrypted-media/#generateRequest:
     // Generates a request based on the initData. When this method is invoked,
     // the user agent must run the following steps:
 
     // 1. If this object's uninitialized value is false, return a promise
     //    rejected with a new DOMException whose name is "InvalidStateError".
     if (!m_isUninitialized)
         return CreateRejectedPromiseAlreadyInitialized(scriptState);
 
@@ skipping 43 matching lines @@
     m_pendingActions.append(PendingAction::CreatePendingGenerateRequest(result, initDataType, initDataBuffer));
     DCHECK(!m_actionTimer.isActive());
     m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
 
     // 10. Return promise.
     return promise;
 }
 
 ScriptPromise MediaKeySession::load(ScriptState* scriptState, const String& sessionId)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") " << sessionId;
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") " << sessionId;
 
     // From https://w3c.github.io/encrypted-media/#load:
     // Loads the data stored for the specified session into this object. When
     // this method is invoked, the user agent must run the following steps:
 
     // 1. If this object's uninitialized value is false, return a promise
     //    rejected with a new DOMException whose name is "InvalidStateError".
     if (!m_isUninitialized)
         return CreateRejectedPromiseAlreadyInitialized(scriptState);
 
@@ skipping 33 matching lines @@
     m_pendingActions.append(PendingAction::CreatePendingLoadRequest(result, sessionId));
     DCHECK(!m_actionTimer.isActive());
     m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
 
     // 9. Return promise.
     return promise;
 }
 
 ScriptPromise MediaKeySession::update(ScriptState* scriptState, const DOMArrayPiece& response)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
     DCHECK(!m_isClosed);
 
     // From https://w3c.github.io/encrypted-media/#update:
     // Provides messages, including licenses, to the CDM. When this method is
     // invoked, the user agent must run the following steps:
 
     // 1. If this object's callable value is false, return a promise rejected
     //    with a new DOMException whose name is InvalidStateError.
     if (!m_isCallable)
         return CreateRejectedPromiseNotCallable(scriptState);
@@ skipping 17 matching lines @@
     m_pendingActions.append(PendingAction::CreatePendingUpdate(result, responseCopy));
     if (!m_actionTimer.isActive())
         m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
 
     // 6. Return promise.
     return promise;
 }
 
 ScriptPromise MediaKeySession::close(ScriptState* scriptState)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
 
     // From https://w3c.github.io/encrypted-media/#close:
     // Indicates that the application no longer needs the session and the CDM
     // should release any resources associated with this object and close it.
     // When this method is invoked, the user agent must run the following steps:
 
     // 1. If this object's callable value is false, return a promise rejected
     //    with a new DOMException whose name is "InvalidStateError".
     if (!m_isCallable)
         return CreateRejectedPromiseNotCallable(scriptState);
@@ skipping 12 matching lines @@
     m_pendingActions.append(PendingAction::CreatePendingClose(result));
     if (!m_actionTimer.isActive())
         m_actionTimer.startOneShot(0, BLINK_FROM_HERE);
 
     // 5. Return promise.
     return promise;
 }
 
 ScriptPromise MediaKeySession::remove(ScriptState* scriptState)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
 
     // From https://w3c.github.io/encrypted-media/#remove:
     // Removes stored session data associated with this object. When this
     // method is invoked, the user agent must run the following steps:
 
     // 1. If this object's callable value is false, return a promise rejected
     //    with a new DOMException whose name is "InvalidStateError".
     if (!m_isCallable)
         return CreateRejectedPromiseNotCallable(scriptState);
 
@@ skipping 36 matching lines @@
     // a local copy to avoid problems if this happens.
     HeapDeque<Member<PendingAction>> pendingActions;
     pendingActions.swap(m_pendingActions);
 
     while (!pendingActions.isEmpty()) {
         PendingAction* action = pendingActions.takeFirst();
 
         switch (action->getType()) {
         case PendingAction::GenerateRequest:
             // NOTE: Continue step 9 of MediaKeySession::generateRequest().
-            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") GenerateRequest";
+            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") GenerateRequest";
 
             // initializeNewSession() in Chromium will execute steps 9.1 to 9.7.
             m_session->initializeNewSession(action->initDataType(), static_cast<unsigned char*>(action->data()->data()), action->data()->byteLength(), m_sessionType, action->result()->result());
 
             // Remaining steps (from 9.8) executed in finishGenerateRequest(),
             // called when |result| is resolved.
             break;
 
         case PendingAction::Load:
             // NOTE: Continue step 8 of MediaKeySession::load().
-            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") Load";
+            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") Load";
 
             // 8.1 Let sanitized session ID be a validated and/or sanitized
             //     version of sessionId. The user agent should thoroughly
             //     validate the sessionId value before passing it to the CDM.
             //     At a minimum, this should include checking that the length
             //     and value (e.g. alphanumeric) are reasonable.
             // 8.2 If the previous step failed, reject promise with a new
             //     DOMException whose name is "InvalidAccessError".
             if (!isValidSessionId(action->sessionId())) {
                 action->result()->completeWithError(WebContentDecryptionModuleExceptionInvalidAccessError, 0, "Invalid sessionId");
@@ skipping 14 matching lines @@
 
             // load() in Chromium will execute steps 8.5 through 8.8.
             m_session->load(action->sessionId(), action->result()->result());
 
             // Remaining steps (from 8.9) executed in finishLoad(), called
             // when |result| is resolved.
             break;
 
         case PendingAction::Update:
             // NOTE: Continue step 5 of MediaKeySession::update().
-            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") Update";
+            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") Update";
 
             // update() in Chromium will execute steps 5.1 through 5.8.
             m_session->update(static_cast<unsigned char*>(action->data()->data()), action->data()->byteLength(), action->result()->result());
 
             // Last step (5.9 Resolve promise) will be done when |result| is
             // resolved.
             break;
 
         case PendingAction::Close:
             // NOTE: Continue step 4 of MediaKeySession::close().
-            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") Close";
+            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") Close";
 
             // close() in Chromium will execute steps 4.1 through 4.2.
             m_session->close(action->result()->result());
 
             // Last step (4.3 Resolve promise) will be done when |result| is
             // resolved.
             break;
 
         case PendingAction::Remove:
             // NOTE: Continue step 5 of MediaKeySession::remove().
-            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") Remove";
+            DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") Remove";
 
             // remove() in Chromium will execute steps 5.1 through 5.3.
             m_session->remove(action->result()->result());
 
             // Last step (5.3.3 Resolve promise) will be done when |result| is
             // resolved.
             break;
         }
     }
 }
@@ skipping 49 matching lines @@
     //      on the session, providing message type and message.
     //      (Done by the CDM.)
 
     // 8.15 Resolve promise with true.
     //      (Done by LoadSessionResultPromise.)
 }
 
 // Queue a task to fire a simple event named keymessage at the new object.
 void MediaKeySession::message(MessageType messageType, const unsigned char* message, size_t messageLength)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
 
     // Verify that 'message' not fired before session initialization is complete.
     DCHECK(m_isCallable);
 
     // From https://w3c.github.io/encrypted-media/#queue-message:
     // The following steps are run:
     // 1. Let the session be the specified MediaKeySession object.
     // 2. Queue a task to fire a simple event named message at the session.
     //    The event is of type MediaKeyMessageEvent and has:
     //    -> messageType = the specified message type
@@ skipping 13 matching lines @@
     }
     init.setMessage(DOMArrayBuffer::create(static_cast<const void*>(message), messageLength));
 
     MediaKeyMessageEvent* event = MediaKeyMessageEvent::create(EventTypeNames::message, init);
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event);
 }
 
 void MediaKeySession::close()
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")";
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")";
 
     // From https://w3c.github.io/encrypted-media/#session-close:
     // The following steps are run:
     // 1. Let the session be the associated MediaKeySession object.
     // 2. Let promise be the closed attribute of the session.
     // 3. Resolve promise.
     m_closedPromise->resolve(ToV8UndefinedGenerator());
 
     // Once closed, the session can no longer be the target of events from
     // the CDM so this object can be garbage collected.
     m_isClosed = true;
 }
 
 void MediaKeySession::expirationChanged(double updatedExpiryTimeInMS)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") " << updatedExpiryTimeInMS;
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") " << updatedExpiryTimeInMS;
 
     // From https://w3c.github.io/encrypted-media/#update-expiration:
     // The following steps are run:
     // 1. Let the session be the associated MediaKeySession object.
     // 2. Let expiration time be NaN.
     double expirationTime = std::numeric_limits<double>::quiet_NaN();
 
     // 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)
         expirationTime = updatedExpiryTimeInMS;
 
     // 4. Set the session's expiration attribute to expiration time.
     m_expiration = expirationTime;
 }
 
 void MediaKeySession::keysStatusesChange(const WebVector<WebEncryptedMediaKeyInformation>& keys, bool hasAdditionalUsableKey)
 {
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ") with " << keys.size() << " keys and hasAdditionalUsableKey is " << (hasAdditionalUsableKey ? "true" : "false");
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ") with " << keys.size() << " keys and hasAdditionalUsableKey is " << (hasAdditionalUsableKey ? "true" : "false");
 
     // From https://w3c.github.io/encrypted-media/#update-key-statuses:
     // The following steps are run:
     // 1. Let the session be the associated MediaKeySession object.
     // 2. Let the input statuses be the sequence of pairs key ID and
     //    associated MediaKeyStatus pairs.
     // 3. Let the statuses be session's keyStatuses attribute.
 
     // 4. Run the following steps to replace the contents of statuses:
     // 4.1 Empty statuses.
@@ skipping 29 matching lines @@
 
 ExecutionContext* MediaKeySession::getExecutionContext() const
 {
     return ActiveDOMObject::getExecutionContext();
 }
 
 bool MediaKeySession::hasPendingActivity() const
 {
     // Remain around if there are pending events or MediaKeys is still around
     // and we're not closed.
-    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __FUNCTION__ << "(" << this << ")"
+    DVLOG(MEDIA_KEY_SESSION_LOG_LEVEL) << __func__ << "(" << this << ")"
         << (!m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "")
         << (m_asyncEventQueue->hasPendingEvents() ? " m_asyncEventQueue->hasPendingEvents()" : "")
         << ((m_mediaKeys && !m_isClosed) ? " m_mediaKeys && !m_isClosed" : "");
 
     return !m_pendingActions.isEmpty()
         || m_asyncEventQueue->hasPendingEvents()
         || (m_mediaKeys && !m_isClosed);
 }
 
 void MediaKeySession::stop()
@@ skipping 13 matching lines @@
     visitor->trace(m_asyncEventQueue);
     visitor->trace(m_pendingActions);
     visitor->trace(m_mediaKeys);
     visitor->trace(m_keyStatusesMap);
     visitor->trace(m_closedPromise);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink