[Cocoa] Use mediaKeysHashSalt() in more places#42641
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Mar 19, 2025
Merged
Conversation
Collaborator
|
EWS run on previous version of this PR (hash 27d51a4) Details |
27d51a4 to
0d201d9
Compare
Collaborator
|
EWS run on current version of this PR (hash 0d201d9) Details |
aestes
approved these changes
Mar 18, 2025
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
0d201d9 to
0bba38c
Compare
Collaborator
|
Committed 292370@main (0bba38c): https://commits.webkit.org/292370@main Reviewed commits have been landed. Closing PR #42641 and removing active labels. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
0bba38c
0d201d9