Changeset 237493 in webkit

Timestamp:

Oct 27, 2018, 8:34:35 AM (8 years ago)

Author:

cturner@igalia.com

Message:

[EME] Add a logging macro
​https://bugs.webkit.org/show_bug.cgi?id=190984

Reviewed by Xabier Rodriguez-Calvar.

No tests since no new functionality.

• Modules/encryptedmedia/MediaKeySession.cpp:

(WebCore::MediaKeySession::MediaKeySession):
(WebCore::MediaKeySession::generateRequest):
(WebCore::MediaKeySession::update):
(WebCore::MediaKeySession::close):
(WebCore::MediaKeySession::remove):
(WebCore::MediaKeySession::sessionClosed):

• Modules/encryptedmedia/MediaKeys.cpp:

(WebCore::MediaKeys::createSession):

• Modules/encryptedmedia/NavigatorEME.cpp:

(WebCore::NavigatorEME::requestMediaKeySystemAccess):

• platform/Logging.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/encryptedmedia/MediaKeySession.cpp (modified) (11 diffs)
• Modules/encryptedmedia/MediaKeys.cpp (modified) (2 diffs)
• Modules/encryptedmedia/NavigatorEME.cpp (modified) (3 diffs)
• platform/Logging.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-27  Charlie Turner  <cturner@igalia.com>
+
+        [EME] Add a logging macro
+        https://bugs.webkit.org/show_bug.cgi?id=190984
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        No tests since no new functionality.
+
+        * Modules/encryptedmedia/MediaKeySession.cpp:
+        (WebCore::MediaKeySession::MediaKeySession):
+        (WebCore::MediaKeySession::generateRequest):
+        (WebCore::MediaKeySession::update):
+        (WebCore::MediaKeySession::close):
+        (WebCore::MediaKeySession::remove):
+        (WebCore::MediaKeySession::sessionClosed):
+        * Modules/encryptedmedia/MediaKeys.cpp:
+        (WebCore::MediaKeys::createSession):
+        * Modules/encryptedmedia/NavigatorEME.cpp:
+        (WebCore::NavigatorEME::requestMediaKeySystemAccess):
+        * platform/Logging.h:
+
 2018-10-27  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp

@@ -36 +36 @@
 #include "Document.h"
 #include "EventNames.h"
+#include "Logging.h"
 #include "MediaKeyMessageEvent.h"
 #include "MediaKeyMessageType.h"
@@ -70 +71 @@
     // W3C Editor's Draft 09 November 2016
     // createSession(), ctd.
+
+    LOG(EME, "EME - new session created");
 
     // 3.1. Let the sessionId attribute be the empty string.
@@ -121 +124 @@
     // 1. If this object is closed, return a promise rejected with an InvalidStateError.
     // 2. If this object's uninitialized value is false, return a promise rejected with an InvalidStateError.
+    LOG(EME, "EME - generate request");
+
     if (m_closed || !m_uninitialized) {
         promise->reject(InvalidStateError);
@@ -195 +200 @@
         }
 
+        LOG(EME, "EME - request license from CDM implementation");
         m_instanceSession->requestLicense(m_sessionType, initDataType, WTFMove(initData), [this, weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] (Ref<SharedBuffer>&& message, const String& sessionId, bool needsIndividualization, CDMInstanceSession::SuccessValue succeeded) mutable {
             if (!weakThis)
@@ -360 +366 @@
     // 1. If this object is closed, return a promise rejected with an InvalidStateError.
     // 2. If this object's callable value is false, return a promise rejected with an InvalidStateError.
+    LOG(EME, "EME - update session for %s", m_sessionId.utf8().data());
+
     if (m_closed || !m_callable) {
         promise->reject(InvalidStateError);
@@ -416 +424 @@
 
             if (succeeded == CDMInstanceSession::SuccessValue::Failed) {
+                LOG(EME, "EME - failed to update CDM license for %s", m_sessionId.utf8().data());
                 promise->reject(TypeError);
                 return;
@@ -425 +434 @@
             // 6.8. Queue a task to run the following steps:
             m_taskQueue.enqueueTask([this, sessionWasClosed, changedKeys = WTFMove(changedKeys), changedExpiration = WTFMove(changedExpiration), message = WTFMove(message), promise = WTFMove(promise)] () mutable {
+                LOG(EME, "EME - updating CDM license succeeded for session %s, sending a message to the license server", m_sessionId.utf8().data());
                 // 6.8.1.
                 if (sessionWasClosed) {
@@ -485 +495 @@
     // 1. Let session be the associated MediaKeySession object.
     // 2. If session is closed, return a resolved promise.
+    LOG(EME, "EME - closing session %s", m_sessionId.utf8().data());
+
     if (m_closed) {
         promise->resolve();
@@ -501 +513 @@
         // 5.1. Let cdm be the CDM instance represented by session's cdm instance value.
         // 5.2. Use cdm to close the key session associated with session.
+        LOG(EME, "EME - closing CDM session %s", m_sessionId.utf8().data());
         m_instanceSession->closeSession(m_sessionId, [this, weakThis = makeWeakPtr(*this), promise = WTFMove(promise)] () mutable {
             if (!weakThis)
@@ -526 +539 @@
     // 1. If this object is closed, return a promise rejected with an InvalidStateError.
     // 2. If this object's callable value is false, return a promise rejected with an InvalidStateError.
+    LOG(EME, "EME - removing session %s", m_sessionId.utf8().data());
+
     if (m_closed || !m_callable) {
         promise->reject(InvalidStateError);
@@ -661 +676 @@
     // https://w3c.github.io/encrypted-media/#session-closed
     // W3C Editor's Draft 09 November 2016
+    LOG(EME, "EME - session %s was closed", m_sessionId.utf8().data());
 
     // 1. Let session be the associated MediaKeySession object.

trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp

@@ -35 +35 @@
 #include "CDMClient.h"
 #include "CDMInstance.h"
+#include "Logging.h"
 #include "MediaKeySession.h"
 #include "SharedBuffer.h"
@@ -55 +56 @@
     // https://w3c.github.io/encrypted-media/#dom-mediakeys-setservercertificate
     // W3C Editor's Draft 09 November 2016
+    LOG(EME, "EME - check if a new session can be created");
 
     // When this method is invoked, the user agent must run the following steps:

trunk/Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp

@@ -35 +35 @@
 #include "Document.h"
 #include "JSMediaKeySystemAccess.h"
+#include "Logging.h"
 
 namespace WebCore {
@@ -44 +45 @@
     // https://w3c.github.io/encrypted-media/#dom-navigator-requestmediakeysystemaccess
     // W3C Editor's Draft 09 November 2016
+    LOG(EME, "EME - request media key system access for %s", keySystem.utf8().data());
 
     // When this method is invoked, the user agent must run the following steps:
@@ -61 +63 @@
         //      String comparison is case-sensitive.
         if (!CDM::supportsKeySystem(keySystem)) {
+            LOG(EME, "EME - %s is not supported", keySystem.utf8().data());
             promise->reject(NotSupportedError);
             return;

trunk/Source/WebCore/platform/Logging.h

@@ -47 +47 @@
     M(DOMTimers) \
     M(Editing) \
+    M(EME) \
     M(Events) \
     M(FileAPI) \