Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 94484ae3c3170c810044ad31ff2a2f37c91068f9
https://github.com/WebKit/WebKit/commit/94484ae3c3170c810044ad31ff2a2f37c91068f9
Author: Andy Estes <[email protected]>
Date: 2025-11-23 (Sun, 23 Nov 2025)
Changed paths:
M Source/WebCore/Modules/airplay/WebMediaSessionManager.h
M Source/WebCore/Modules/airplay/WebMediaSessionManager.mm
M Source/WebCore/WebCore.xcodeproj/project.pbxproj
M Source/WebCore/page/ChromeClient.h
M Source/WebCore/page/Page.cpp
M Source/WebCore/page/Page.h
M Source/WebCore/platform/audio/ios/MediaSessionHelperIOS.mm
M Source/WebCore/platform/graphics/MediaPlaybackTarget.h
M Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetCocoa.h
M Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
M
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
R Source/WebCore/platform/graphics/cocoa/MediaPlaybackTargetContext.h
M Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp
M Source/WebCore/platform/mock/MediaPlaybackTargetMock.h
M Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp
M Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h
M Source/WebCore/testing/Internals.cpp
M Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp
M Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.cpp
M Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.h
M Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.mm
M
Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.serialization.in
A Source/WebKit/Platform/cocoa/MediaPlaybackTargetSerialized.cpp
A Source/WebKit/Platform/cocoa/MediaPlaybackTargetSerialized.h
M Source/WebKit/Platform/cocoa/WebPrivacyHelpers.mm
M Source/WebKit/Scripts/webkit/messages.py
M Source/WebKit/SourcesCocoa.txt
M Source/WebKit/UIProcess/WebPageProxy.cpp
M Source/WebKit/UIProcess/WebPageProxy.h
M Source/WebKit/UIProcess/WebPageProxy.messages.in
M Source/WebKit/WebKit.xcodeproj/project.pbxproj
M Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp
M Source/WebKit/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.cpp
M Source/WebKit/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.h
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
M Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
M Source/WebKit/WebProcess/WebPage/WebPage.h
M Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
M Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h
M Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm
M Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.h
M Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.mm
M Source/WebKitLegacy/mac/WebView/WebView.mm
M Source/WebKitLegacy/mac/WebView/WebViewInternal.h
Log Message:
-----------
Merge MediaPlaybackTargetContext and MediaPlaybackTarget
https://bugs.webkit.org/show_bug.cgi?id=302998
rdar://165253999
Reviewed by Eric Carlson.
Simplified MediaPlaybackTarget and friends by folding each
MediaPlaybackTargetContext subclass into
its corresponding MediaPlaybackTarget subclass, with the exception of
MediaPlaybackTarget(Context)Serialized,
where it is helpful to maintain a separate value type for IPC serialization.
* Source/WebCore/Modules/airplay/WebMediaSessionManager.h:
* Source/WebCore/Modules/airplay/WebMediaSessionManager.mm:
(WebCore::WebMediaSessionManager::setMockMediaPlaybackTargetPickerState):
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/page/ChromeClient.h:
(WebCore::ChromeClient::setMockMediaPlaybackTargetPickerState):
* Source/WebCore/page/Page.cpp:
(WebCore::Page::setMockMediaPlaybackTargetPickerState):
* Source/WebCore/page/Page.h:
* Source/WebCore/platform/audio/ios/MediaSessionHelperIOS.mm:
(MediaSessionHelperIOS::activeVideoRouteDidChange):
* Source/WebCore/platform/graphics/MediaPlaybackTarget.h:
(WebCore::MediaPlaybackTarget::type const):
(WebCore::MediaPlaybackTarget::MediaPlaybackTarget):
(WebCore::MediaPlaybackTarget::hasActiveRoute const): Deleted.
(WebCore::MediaPlaybackTarget::deviceName const): Deleted.
(WebCore::MediaPlaybackTarget::supportsRemoteVideoPlayback): Deleted.
* Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetCocoa.h:
(isType):
* Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm:
(WebCore::MediaPlaybackTargetCocoa::MediaPlaybackTargetCocoa):
(WebCore::MediaPlaybackTargetCocoa::deviceName const):
(WebCore::MediaPlaybackTargetCocoa::hasActiveRoute const):
(WebCore::MediaPlaybackTargetCocoa::supportsRemoteVideoPlayback const):
(WebCore::MediaPlaybackTargetCocoa::create):
(WebCore::MediaPlaybackTargetContextCocoa::MediaPlaybackTargetContextCocoa):
Deleted.
(WebCore::MediaPlaybackTargetContextCocoa::outputContext const): Deleted.
(WebCore::MediaPlaybackTargetContextCocoa::deviceName const): Deleted.
(WebCore::MediaPlaybackTargetContextCocoa::hasActiveRoute const): Deleted.
(WebCore::MediaPlaybackTargetContextCocoa::supportsRemoteVideoPlayback const):
Deleted.
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::playbackTarget):
*
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless
const):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget):
* Source/WebCore/platform/graphics/cocoa/MediaPlaybackTargetContext.h: Removed.
* Source/WebCore/platform/mock/MediaPlaybackTargetMock.cpp:
(WebCore::MediaPlaybackTargetMock::create):
(WebCore::MediaPlaybackTargetMock::MediaPlaybackTargetMock):
* Source/WebCore/platform/mock/MediaPlaybackTargetMock.h:
(isType):
* Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp:
(WebCore::MediaPlaybackTargetPickerMock::MediaPlaybackTargetPickerMock):
(WebCore::MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable):
(WebCore::MediaPlaybackTargetPickerMock::playbackTarget):
(WebCore::MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets):
(WebCore::MediaPlaybackTargetPickerMock::invalidatePlaybackTargets):
(WebCore::MediaPlaybackTargetPickerMock::setState):
* Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h:
* Source/WebCore/testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setMockMediaPlaybackTargetPickerState):
* Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:
(WebKit::RemoteMediaPlayerProxy::setWirelessPlaybackTarget):
* Source/WebKit/GPUProcess/media/ios/RemoteMediaSessionHelperProxy.cpp:
(WebKit::RemoteMediaSessionHelperProxy::activeVideoRouteDidChange):
* Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.h:
(WebKit::MediaPlaybackTargetContextSerialized::deviceName const):
(WebKit::MediaPlaybackTargetContextSerialized::hasActiveRoute const):
(WebKit::MediaPlaybackTargetContextSerialized::targetType const):
(WebKit::MediaPlaybackTargetContextSerialized::mockState const):
(isType): Deleted.
* Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.mm:
(WebKit::MediaPlaybackTargetContextSerialized::MediaPlaybackTargetContextSerialized):
(WebKit::MediaPlaybackTargetContextSerialized::playbackTarget const):
(WebKit::MediaPlaybackTargetContextSerialized::platformContext const): Deleted.
*
Source/WebKit/Platform/cocoa/MediaPlaybackTargetContextSerialized.serialization.in:
* Source/WebKit/Platform/cocoa/MediaPlaybackTargetSerialized.cpp: Added.
(WebKit::MediaPlaybackTargetSerialized::create):
(WebKit::MediaPlaybackTargetSerialized::MediaPlaybackTargetSerialized):
* Source/WebKit/Platform/cocoa/MediaPlaybackTargetSerialized.h: Added.
(isType):
* Source/WebKit/Platform/cocoa/WebPrivacyHelpers.mm:
(WebKit::isKnownTrackerAddressOrDomain):
(WebKit::isRequestToKnownCrossSiteTracker):
* Source/WebKit/Scripts/webkit/messages.py:
(conditions_for_header):
(headers_for_type):
* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setMockMediaPlaybackTargetPickerState):
(WebKit::WebPageProxy::Internals::setPlaybackTarget):
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.messages.in:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::setWirelessPlaybackTarget):
* Source/WebKit/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.cpp:
(WebKit::RemoteMediaSessionHelper::activeVideoRouteDidChange):
* Source/WebKit/WebProcess/GPU/media/ios/RemoteMediaSessionHelper.h:
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::setMockMediaPlaybackTargetPickerState):
* Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h:
* Source/WebKit/WebProcess/WebPage/WebPage.h:
* Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm:
* Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setMockMediaPlaybackTargetPickerState):
* Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.h:
* Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.mm:
(WebMediaPlaybackTargetPicker::setMockMediaPlaybackTargetPickerState):
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(-[WebView _setMockMediaPlaybackTargetPickerName:state:]):
* Source/WebKitLegacy/mac/WebView/WebViewInternal.h:
Canonical link: https://commits.webkit.org/303473@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
