[webkit-changes] [WebKit/WebKit] d67b38: [Cocoa] AVContentKeyRequest is recreated when rene...

[Jer Noble]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: d67b38a67e2a4e1f1a5976b3eeed43d245dc5311
      https://github.com/WebKit/WebKit/commit/d67b38a67e2a4e1f1a5976b3eeed43d245dc5311
  Author: Jer Noble <jer.noble at apple.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h
    M Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm

  Log Message:
  -----------
  [Cocoa] AVContentKeyRequest is recreated when renewing via -renewExpiringResponseDataForContentKeyRequest:
https://bugs.webkit.org/show_bug.cgi?id=266282
rdar://119555484

Reviewed by Andy Estes.

In certain configurations of AVContentKeySession, when a request is renewed via
-renewExpiringResponseDataForContentKeyRequest:, instead of returning the same
AVContentKeyRequest object in the -contentKeySession:didProvideRenewingContentKeyRequest:
delegate callback, it will return an entirely new AVContentKeyRequest. This breaks
WebKit's renewal path.

To work around this behavior, track the request being renewed in a new ivar, and when
the delegate method is called, use both requests' -identifier property to check
equality. Then replace the old request in the list of m_requests with the new request.

* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::didProvideRenewingRequest):

Canonical link: https://commits.webkit.org/271946@main