[webkit-changes] [WebKit/WebKit] 6d3a4d: [Cocoa] Introduce ContentKeyGroupDataSource

[aestes]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 6d3a4daea19447f4d2ba60649391cd8fdc57b750
      https://github.com/WebKit/WebKit/commit/6d3a4daea19447f4d2ba60649391cd8fdc57b750
  Author: Andy Estes <aestes at apple.com>
  Date:   2023-09-19 (Tue, 19 Sep 2023)

  Changed paths:
    M Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
    A Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyGrouping.h
    M Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyReportGroupExtras.h
    R Source/WebCore/PAL/pal/graphics/cocoa/WebContentKeyGrouping.h
    M Source/WebCore/SourcesCocoa.txt
    M Source/WebCore/WebCore.xcodeproj/project.pbxproj
    A Source/WebCore/platform/graphics/avfoundation/ContentKeyGroupDataSource.h
    M Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h
    M Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm
    M Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.h
    M Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.mm
    A Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.h
    A Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.mm
    R Source/WebCore/platform/graphics/avfoundation/objc/WebContentKeyGroup.h
    R Source/WebCore/platform/graphics/avfoundation/objc/WebContentKeyGroup.mm

  Log Message:
  -----------
  [Cocoa] Introduce ContentKeyGroupDataSource
https://bugs.webkit.org/show_bug.cgi?id=261688
rdar://115670853

Reviewed by Brady Eidson.

Introduced WebCore::ContentKeyGroupDataSource as a data source for providing content keys and
logging to WebAVContentKeyGroup (renamed from WebContentKeyGroup to avoid confusion with the
existing term "WebContent"). Changed CDMInstanceSessionFairPlayStreamingAVFObjC to conform to
ContentKeyGroupDataSource. While here, changed WebCoreFPSContentKeySessionDelegate to store a
WeakPtr to CDMInstanceFairPlayStreamingAVFObjC, removed a number of HAVE(AVCONTENTKEYREPORTGROUP),
and made some small style fixes for * placement.

* Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj:
* Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyGrouping.h: Renamed from Source/WebCore/PAL/pal/graphics/cocoa/bContentKeyGrouping.h.
* Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyReportGroupExtras.h:
* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/platform/graphics/avfoundation/ContentKeyGroupDataSource.h: Copied from Source/WebCore/platform/graphics/foundation/objc/ContentKeyGroupFactoryAVFObjC.h.
* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(-[WebCoreFPSContentKeySessionDelegate initWithParent:]):
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::contentKeySession):
(WebCore::groupForRequest):
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::sessionForRequest const):
(WebCore::CDMInstanceFairPlayStreamingAVFObjC::sessionForGroup const):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::CDMInstanceSessionFairPlayStreamingAVFObjC):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::requestLicense):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::removeSessionData):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::didProvideRequest):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::ensureSessionOrGroup):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::contentKeyGroupDataSourceKeys const):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::contentKeyGroupDataSourceLogIdentifier const):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::contentKeyGroupDataSourceLoggerPtr const):
(-[WebCoreFPSContentKeySessionDelegate invalidate]): Deleted.
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::~CDMInstanceSessionFairPlayStreamingAVFObjC): Deleted.
* Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.mm:
(WebCore::ContentKeyGroupFactoryAVFObjC::createContentKeyGroup):
* Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.h: Renamed from Source/WebCore/platform/graphics/foundation/objc/WebContentKeyGroup.h.
* Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.mm: Added.
(-[WebAVContentKeyGroup initWithContentKeySession:dataSource:]):
(-[WebAVContentKeyGroup contentProtectionSessionIdentifier]):
(-[WebAVContentKeyGroup associateContentKeyRequest:]):
(-[WebAVContentKeyGroup expire]):
(-[WebAVContentKeyGroup processContentKeyRequestWithIdentifier:initializationData:options:]):
(-[WebAVContentKeyGroup logIdentifier]):
(-[WebAVContentKeyGroup loggerPtr]):
(-[WebAVContentKeyGroup logChannel]):
* Source/WebCore/platform/graphics/avfoundation/objc/WebContentKeyGroup.mm: Removed.

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