Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: b47597103bd7460d6b6c7be20179c282acb69f63
https://github.com/WebKit/WebKit/commit/b47597103bd7460d6b6c7be20179c282acb69f63
Author: Eric Carlson <[email protected]>
Date: 2026-01-14 (Wed, 14 Jan 2026)
Changed paths:
M Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
M Source/WTF/wtf/PlatformHave.h
M Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
M Source/WebCore/PAL/pal/mac/ScreenCaptureKitSoftLink.h
M Source/WebCore/PAL/pal/mac/ScreenCaptureKitSoftLink.mm
R Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h
M Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h
M Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm
M
Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.h
M
Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm
M Source/WebKit/UIProcess/mac/DisplayCaptureSessionManager.mm
M Source/WebKit/UIProcess/mac/UserMediaPermissionRequestProxyMac.mm
Log Message:
-----------
[macOS] Cleanup use of ScreenCaptureKit
https://bugs.webkit.org/show_bug.cgi?id=305499
rdar://168165254
Reviewed by Andy Estes.
Stop using ScreenCaptureKit SPI and remove all of the code that was only needed
pre-Sonoma.
Tested manually, it isn't possible to test ScreenCaptureKit on the bots.
* Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml:
* Source/WTF/wtf/PlatformHave.h:
* Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj:
* Source/WebCore/PAL/pal/mac/ScreenCaptureKitSoftLink.h:
* Source/WebCore/PAL/pal/mac/ScreenCaptureKitSoftLink.mm:
* Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h: Removed.
* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h:
* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
(-[WebCoreScreenCaptureKitHelper outputVideoEffectDidStopForStream:]):
(WebCore::ScreenCaptureKitCaptureSource::~ScreenCaptureKitCaptureSource):
(WebCore::ScreenCaptureKitCaptureSource::end):
(WebCore::ScreenCaptureKitCaptureSource::sessionFilterDidChange):
(WebCore::ScreenCaptureKitCaptureSource::streamConfiguration):
(WebCore::ScreenCaptureKitCaptureSource::startContentStream):
(WebCore::ScreenCaptureKitCaptureSource::streamDidOutputVideoSampleBuffer):
(WebCore::ScreenCaptureKitCaptureSource::clearSharingSession): Deleted.
*
Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.h:
(WebCore::ScreenCaptureSessionSource::contentFilter const):
(WebCore::ScreenCaptureSessionSource::sharingSession const): Deleted.
*
Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm:
(-[WebDisplayMediaPromptHelper disconnect]):
(-[WebDisplayMediaPromptHelper stopObservingPicker:]):
(WebCore::ScreenCaptureKitSharingSessionManager::isAvailable):
(WebCore::ScreenCaptureKitSharingSessionManager::cancelPicking):
(WebCore::ScreenCaptureKitSharingSessionManager::completeDeviceSelection):
(WebCore::ScreenCaptureKitSharingSessionManager::contentSharingPickerSelectedFilterForStream):
(WebCore::ScreenCaptureKitSharingSessionManager::promptForGetDisplayMedia):
(WebCore::ScreenCaptureKitSharingSessionManager::promptWithSCContentSharingPicker):
(WebCore::ScreenCaptureKitSharingSessionManager::contentSharingPickerFailedWithError):
(WebCore::operator==):
(WebCore::ScreenCaptureKitSharingSessionManager::contentFilter):
(WebCore::ScreenCaptureKitSharingSessionManager::createSessionSourceForDevice):
(WebCore::ScreenCaptureSessionSource::create):
(WebCore::ScreenCaptureSessionSource::ScreenCaptureSessionSource):
(WebCore::ScreenCaptureSessionSource::operator== const):
(-[WebDisplayMediaPromptHelper startObservingSession:]): Deleted.
(-[WebDisplayMediaPromptHelper stopObservingSession:]): Deleted.
(-[WebDisplayMediaPromptHelper sessionDidEnd:]): Deleted.
(-[WebDisplayMediaPromptHelper sessionDidChangeContent:]): Deleted.
(-[WebDisplayMediaPromptHelper pickerCanceledForSession:]): Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::useSCContentSharingPicker):
Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::findActiveSource): Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::sharingSessionDidEnd): Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::sharingSessionDidChangeContent):
Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::promptWithSCContentSharingSession):
Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::contentFilterAndSharingSessionFromCaptureDevice):
Deleted.
(WebCore::ScreenCaptureKitSharingSessionManager::cleanupSharingSession):
Deleted.
* Source/WebKit/UIProcess/mac/DisplayCaptureSessionManager.mm:
(WebKit::DisplayCaptureSessionManager::canRequestDisplayCapturePermission):
* Source/WebKit/UIProcess/mac/UserMediaPermissionRequestProxyMac.mm:
(WebKit::UserMediaPermissionRequestProxyMac::canRequestDisplayCapturePermission):
Canonical link: https://commits.webkit.org/305621@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
