Changeset 259858 in webkit

Timestamp:

Apr 10, 2020, 3:32:59 AM (6 years ago)

Author:

cturner@igalia.com

Message:

[EME][GStreamer] Relax proxy initialization assert
​https://bugs.webkit.org/show_bug.cgi?id=210258

Reviewed by Xabier Rodriguez-Calvar.

update() may be called on a session before its parent MediaKeys object
has been associated with a media element. Supporting this is officially
optional, but enough sites (including the W3C EME tests) depend on this
optional behaviour that we should support it.

Covered by imported/w3c/web-platform-tests/encrypted-media.

• platform/encryptedmedia/CDMProxy.cpp:

(WebCore::CDMInstanceProxy::mergeKeysFrom): Since the background
proxy may not be installed yet, don't ASSERT() it exists.

• platform/encryptedmedia/CDMProxy.h:

(WebCore::KeyStore::hasKeys const):
(WebCore::CDMInstanceProxy::setProxy): Now, when the background
proxy is installed, check if any keys have been made available as
described above, and if so, set them.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/encryptedmedia/CDMProxy.cpp (modified) (1 diff)
• platform/encryptedmedia/CDMProxy.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-10  Charlie Turner  <cturner@igalia.com>
+
+        [EME][GStreamer] Relax proxy initialization assert
+        https://bugs.webkit.org/show_bug.cgi?id=210258
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        update() may be called on a session before its parent MediaKeys object
+        has been associated with a media element. Supporting this is officially
+        optional, but enough sites (including the W3C EME tests) depend on this
+        optional behaviour that we should support it.
+
+        Covered by imported/w3c/web-platform-tests/encrypted-media.
+
+        * platform/encryptedmedia/CDMProxy.cpp:
+        (WebCore::CDMInstanceProxy::mergeKeysFrom): Since the background
+        proxy may not be installed yet, don't ASSERT() it exists.
+        * platform/encryptedmedia/CDMProxy.h:
+        (WebCore::KeyStore::hasKeys const):
+        (WebCore::CDMInstanceProxy::setProxy): Now, when the background
+        proxy is installed, check if any keys have been made available as
+        described above, and if so, set them.
+
 2020-04-10  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.cpp

@@ -288 +288 @@
     ASSERT(isMainThread());
     m_keyStore.merge(keyStore);
-    LOG(EME, "EME - CDMInstanceProxy - merging keys into proxy instance and notifying CDMProxy of changes");
-    ASSERT(m_cdmProxy);
-    m_cdmProxy->updateKeyStore(keyStore);
+    if (m_cdmProxy) {
+        LOG(EME, "EME - CDMInstanceProxy - merging keys into proxy instance and notifying CDMProxy of changes");
+        m_cdmProxy->updateKeyStore(keyStore);
+    }
 }
 

trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.h

@@ -89 +89 @@
     bool add(RefPtr<Key>&&);
     bool remove(const RefPtr<Key>&);
+    bool hasKeys() const { return m_keys.size(); }
     unsigned numKeys() const { return m_keys.size(); }
     const Vector<uint8_t>& keyValue(const Vector<uint8_t>& keyID) const;
@@ -152 +153 @@
         m_cdmProxy = WTFMove(proxy);
         m_cdmProxy->setInstance(this);
+        // The CDM instance may be attached after an update(). Not
+        // recommended, but apps and the W3C test-suite do this.
+        if (m_keyStore.hasKeys())
+            m_cdmProxy->updateKeyStore(m_keyStore);
     }
     void mergeKeysFrom(const KeyStore&);