[Cocoa] Activate DisplayCaptureCapability before prompting for getDisplayMedia#64060
Merged
webkit-commit-queue merged 1 commit intoMay 2, 2026
Conversation
Collaborator
|
EWS run on current version of this PR (hash 3306cce) Details
|
jernoble
approved these changes
May 1, 2026
Contributor
Author
The API test failure is unrelated. |
…playMedia https://bugs.webkit.org/show_bug.cgi?id=313843 rdar://176044721 Reviewed by Jer Noble. Activate the display capture endowment while a getDisplayMedia() permission prompt is pending. Track whether a getDisplayMedia() prompt is in progress with two new MediaProducerMediaState bits: IsPromptingForWindowCapture and IsPromptingForScreenCapture. Include these bits in the display capture capability activation/deactivation checks so the endowment is held for the full duration of the prompt, not just once capture begins. Clear the prompting state on denial, cancellation, and page invalidation, preserve it across transient media state updates until DisplayCaptureMask is set. Tested manually. * Source/WebCore/page/MediaProducer.h: * Source/WebCore/page/MediaProducer.serialization.in: * Source/WebKit/UIProcess/Cocoa/UserMediaPermissionRequestProxyCocoa.mm: (WebKit::UserMediaPermissionRequestProxyCocoa::invalidate): (WebKit::UserMediaPermissionRequestProxyCocoa::promptForGetDisplayMedia): * Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm: (WebKit::WebPageProxy::shouldActivateDisplayCaptureCapability const): (WebKit::WebPageProxy::shouldDeactivateDisplayCaptureCapability const): * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::setIsPromptingForGetDisplayMedia): (WebKit::WebPageProxy::isPlayingMediaDidChange): * Source/WebKit/UIProcess/WebPageProxy.h: Canonical link: https://commits.webkit.org/312477@main
3306cce to
9ccf6f3
Compare
Collaborator
|
Committed 312477@main (9ccf6f3): https://commits.webkit.org/312477@main Reviewed commits have been landed. Closing PR #64060 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.
9ccf6f3
3306cce