Changeset 254288 in webkit

Timestamp:

Jan 9, 2020, 12:18:40 PM (7 years ago)

Author:

jer.noble@apple.com

Message:

[Cocoa] persistent-usage-record message fails first time; succeeds subsequent times
​https://bugs.webkit.org/show_bug.cgi?id=205970
<rdar://problem/57785647>

Reviewed by Eric Carlson.

The AVContentKeySession is created too early; before the CDM has a chance to provide the storage path
for persistent usage records. Delay creation of the AVCKS until it's actually needed during the first
license request.

Drive-by fix: fix the exceptional case where a PUR session is closed but PUR data isn't available; send
a null message rather than an empty array.

• platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
• platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:

(WebCore::CDMInstanceFairPlayStreamingAVFObjC::contentKeySession):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::removeSessionData):
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::CDMInstanceFairPlayStreamingAVFObjC): Deleted.
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::ensureSession): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-09  Jer Noble  <jer.noble@apple.com>
+
+        [Cocoa] persistent-usage-record message fails first time; succeeds subsequent times
+        https://bugs.webkit.org/show_bug.cgi?id=205970
+        <rdar://problem/57785647>
+
+        Reviewed by Eric Carlson.
+
+        The AVContentKeySession is created too early; before the CDM has a chance to provide the storage path
+        for persistent usage records. Delay creation of the AVCKS until it's actually needed during the first
+        license request.
+
+        Drive-by fix: fix the exceptional case where a PUR session is closed but PUR data isn't available; send
+        a null message rather than an empty array.
+
+        * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
+        * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
+        (WebCore::CDMInstanceFairPlayStreamingAVFObjC::contentKeySession):
+        (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::removeSessionData):
+        (WebCore::CDMInstanceFairPlayStreamingAVFObjC::CDMInstanceFairPlayStreamingAVFObjC): Deleted.
+        (WebCore::CDMInstanceFairPlayStreamingAVFObjC::ensureSession): Deleted.
+
 2020-01-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h

@@ -88 +88 @@
     bool persistentStateAllowed() const { return m_persistentStateAllowed; }
     SharedBuffer* serverCertificate() const { return m_serverCertificate.get(); }
-    AVContentKeySession* contentKeySession() { return m_session.get(); }
+    AVContentKeySession* contentKeySession();
 
     // AVContentKeySessionDelegateClient
@@ -107 +107 @@
 
 private:
-    void ensureSession();
-
     RetainPtr<AVContentKeySession> m_session;
     RetainPtr<WebCoreFPSContentKeySessionDelegate> m_delegate;

trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm

@@ -160 +160 @@
 namespace WebCore {
 
-CDMInstanceFairPlayStreamingAVFObjC::CDMInstanceFairPlayStreamingAVFObjC()
-{
-    if (PAL::getAVContentKeyReportGroupClass())
-        ensureSession();
-}
-
-void CDMInstanceFairPlayStreamingAVFObjC::ensureSession()
+CDMInstanceFairPlayStreamingAVFObjC::CDMInstanceFairPlayStreamingAVFObjC() = default;
+
+AVContentKeySession* CDMInstanceFairPlayStreamingAVFObjC::contentKeySession()
 {
     if (m_session)
-        return;
+        return m_session.get();
 
     if (!PAL::canLoad_AVFoundation_AVContentKeySystemFairPlayStreaming())
-        return;
+        return nullptr;
+
+    if (!PAL::getAVContentKeyReportGroupClass())
+        return nullptr;
 
     auto storageURL = this->storageURL();
@@ -181 +180 @@
 
     if (!m_session)
-        return;
+        return nullptr;
 
     if (!m_delegate)
@@ -187 +186 @@
 
     [m_session setDelegate:m_delegate.get() queue:dispatch_get_main_queue()];
+    return m_session.get();
 }
 
@@ -817 +817 @@
         }
 
+        if (!expiredSessionsArray.get().count) {
+            callback(WTFMove(changedKeys), WTF::nullopt, Succeeded);
+            return;
+        }
+
         RetainPtr<NSData> expiredSessionsData = [NSPropertyListSerialization dataWithPropertyList:expiredSessionsArray.get() format:NSPropertyListBinaryFormat_v1_0 options:kCFPropertyListImmutable error:nullptr];