[webkit-changes] [WebKit/WebKit] 435b71: [Cocoa] Clean up WebAVContentKeyGroup

[aestes]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 435b71a7ab459529141228d215c9fc3e4553ee27
      https://github.com/WebKit/WebKit/commit/435b71a7ab459529141228d215c9fc3e4553ee27
  Author: Andy Estes <aestes at apple.com>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M Source/WTF/wtf/Vector.h
    M Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyGrouping.h
    M 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
    M Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.h
    M Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.mm

  Log Message:
  -----------
  [Cocoa] Clean up WebAVContentKeyGroup
https://bugs.webkit.org/show_bug.cgi?id=262257
rdar://116159842

Reviewed by Jer Noble.

Addressed several issues in WebAVContentKeyGroup and ContentKeyGroupDataSource:

- Added FIXMEs indicating that WebAVContentKeyGroup and friends can be removed once we no longer
need to support a configuration where the BuiltInCDMKeyGroupingStrategyEnabled preference is off.
- Taught WebAVContentKeyGroup to get its log channel from the data source rather than hard-coding.
- Changed WebAVContentKeyGroup to store ContentKeyGroupDataSource as a CheckedPtr rather than a
WeakPtr and removed unnecessary null checks of _dataSource (note that we can't use CheckedRef
because ivars must support default initialization).
- Added a comment explaining the implementation of -associateContentKeyRequest:.
- Added a `using WTF::flatMap` to Vector.h and removed the WTF:: prefixes from compactMap and
flatMap calls in CDMInstanceSessionFairPlayStreamingAVFObjC.

* Source/WTF/wtf/Vector.h:
* Source/WebCore/PAL/pal/graphics/cocoa/WebAVContentKeyGrouping.h:
* Source/WebCore/platform/graphics/avfoundation/ContentKeyGroupDataSource.h:
* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::contentKeyGroupDataSourceKeys const):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::contentKeyGroupDataSourceLogChannel const):
* Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.h:
* Source/WebCore/platform/graphics/avfoundation/objc/ContentKeyGroupFactoryAVFObjC.mm:
* Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.h:
* Source/WebCore/platform/graphics/avfoundation/objc/WebAVContentKeyGroup.mm:
(-[WebAVContentKeyGroup initWithContentKeySession:dataSource:]):
(-[WebAVContentKeyGroup associateContentKeyRequest:]):
(-[WebAVContentKeyGroup expire]):
(-[WebAVContentKeyGroup logIdentifier]):
(-[WebAVContentKeyGroup loggerPtr]):
(-[WebAVContentKeyGroup logChannel]):

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