Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 0bba38cb4b4c8fd349eefdc8825821582dc5a965
https://github.com/WebKit/WebKit/commit/0bba38cb4b4c8fd349eefdc8825821582dc5a965
Author: Jer Noble <jer.no...@apple.com>
Date: 2025-03-19 (Wed, 19 Mar 2025)
Changed paths:
M Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.cpp
M Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.h
M Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp
M Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp
M Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h
M Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp
M Source/WebCore/platform/graphics/LegacyCDMSession.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/CDMSessionAVContentKeySession.mm
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.cpp
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.h
M Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.messages.in
M Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMSession.cpp
Log Message:
-----------
[Cocoa] Use mediaKeysHashSalt() in more places
rdar://146422515
https://bugs.webkit.org/show_bug.cgi?id=289987
Reviewed by Andy Estes.
Use mediaKeysHashSalt() in all the places where -[AVContentKeyRequest
makeStreamingContentKeyRequestDataForApp:contentIdentifier:options:completionHandler:]
is called, by adding a static method optionsForKeyRequestWithHashSalt() which
can
be used in both CDMInstanceFairPlayStreamingAVFObjC as well as
CDMSessionAVContentKeySession.
To make mediaKeyHashSalt() avalable in the LegacyCDMSession codepath, make
legacy requests take the same
trip through MediaKeySystemRequest.
* Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.cpp:
(WebCore::MediaKeySystemRequest::create):
(WebCore::MediaKeySystemRequest::MediaKeySystemRequest):
(WebCore::MediaKeySystemRequest::deny):
* Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.h:
(WebCore::MediaKeySystemRequest::setAllowCallback):
* Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp:
(WebCore::NavigatorEME::requestMediaKeySystemAccess):
(WebCore::tryNextSupportedConfiguration):
* Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp:
(WebCore::WebKitMediaKeySession::generateKeyRequest):
* Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:
* Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeys.cpp:
(WebCore::WebKitMediaKeys::createSession):
* Source/WebCore/platform/graphics/LegacyCDMSession.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.h:
*
Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::didProvideRequest):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::didProvideRequests):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::optionsForKeyRequestWithHashSalt):
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::didProvideRenewingRequest):
*
Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
(WebCore::CDMSessionAVContentKeySession::update):
* Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.cpp:
(WebKit::RemoteLegacyCDMSessionProxy::generateKeyRequest):
* Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.h:
* Source/WebKit/GPUProcess/media/RemoteLegacyCDMSessionProxy.messages.in:
* Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMSession.cpp:
(WebKit::RemoteLegacyCDMSession::generateKeyRequest):
Canonical link: https://commits.webkit.org/292370@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
