[Swift in WebKit] Fix Swift 6 warnings and errors in WKSLinearMediaPlayer #47043

rr-codes · 2025-06-23T03:22:46Z

`facbe72`

[Swift in WebKit] Fix Swift 6 warnings and errors in WKSLinearMediaPlayer
https://bugs.webkit.org/show_bug.cgi?id=294823
rdar://154057962

Reviewed by Andy Estes.

Address Swift 6 errors in WKSLinearMediaPlayer and related code.

- If it walks like a duck and talks like a duck... it's not always a duck. In this case, AVKit has a public
Swift class `PlayableViewController` and annotated with `@objc(LMPlayableViewController)`. This annotation
makes the type compatible and indistuinguishable from an Objective C type. However, Swift types cannot be accessed
by Objective-C in another framework; within their own framework, the Swift bridging header is used.

AVKit attempted to work around this by creating an Objective-C interface that was essentially a forward declaration
of `LMPlayableViewController`; this is an unsupported configuration as it removes all compile-time checking, which
results in the Swift compiler being confused.

To fix, the `LMPlayableViewController` type is now never used within WebKit; only the `PlayableViewController` type
is used from within Swift WebKit code. Consequently, a new wrapper type is created that abstracts the
`PlayableViewController` and exposes the needed symbols to Objective-C, so that the compiler can function properly.

- Use `@objc @implementation` instead of `@_objcImplementation`.

- Use `RealityKit` instead of the re-exported `RealityFoundation` module.

- Adopt `@preconcurrency` when needed, to silence errors due to the underlying framework symbols
not having proper annotations.

* Source/WebCore/platform/ios/VideoPresentationInterfaceAVKit.h:
* Source/WebCore/platform/ios/VideoPresentationInterfaceIOS.h:
(WebCore::VideoPresentationInterfaceIOS::playableViewController):
* Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.h:
* Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.mm:
(WebKit::VideoPresentationInterfaceLMK::setupFullscreen):
(WebKit::VideoPresentationInterfaceLMK::enterExternalPlayback):
(WebKit::VideoPresentationInterfaceLMK::playerViewController const):
(WebKit::VideoPresentationInterfaceLMK::playableViewController):
(WebKit::VideoPresentationInterfaceLMK::ensurePlayableViewController):
* Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.h:
* Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm:
(WebKit::VideoPresentationManagerProxy::playableViewController const):
* Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController configureEnvironmentPickerOrFullscreenVideoButtonView]):
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitExtras.h: Removed.
* Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitExtras.swift: Removed.
* Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitSPI.h: Removed.
* Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaPlayer.swift:
(SwiftOnlyData.viewController):
(WKSLinearMediaPlayer.makeViewController):
(WKSLinearMediaPlayer.enterExternalPresentation(_:(any Error)?) -> Void:)):
(WKSLinearMediaPlayer.exitExternalPresentation(_:(any Error)?) -> Void:)):
(WKSLinearMediaPlayer.enterFullscreen(_:(any Error)?) -> Void:)):
(WKSLinearMediaPlayer.exitFullscreen(_:(any Error)?) -> Void:)):
(WKSLinearMediaPlayer.maybeCreateSpatialOrImmersiveEntity):
(WKSLinearMediaPlayer.maybeClearSpatialOrImmersiveEntity):
* Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaTypes.swift:
(WKSPlayableViewControllerHost.baseViewController):
(WKSPlayableViewControllerHost.automaticallyDockOnFullScreenPresentation):
(WKSPlayableViewControllerHost.dismissFullScreenOnExitingDocking):
(WKSPlayableViewControllerHost.environmentPickerButtonViewController):
(WKSPlayableViewControllerHost.playable):
(WKSPlayableViewControllerHost.prefersAutoDimming):
* Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaPlayer.h:
* Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaTypes.h:
* Source/WebKit/WebKitSwift/WebKitSwift.h:

Canonical link: https://commits.webkit.org/296600@main

33e59b5

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T03:22:51Z

EWS run on previous version of this PR (hash d87fddc)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	❌ 🧪 mac-wk2	✅ 🛠 gtk
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	❌ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T04:06:17Z

EWS run on previous version of this PR (hash 1f51336)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	❌ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	❌ 🧪 mac-wk2	✅ 🛠 gtk
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	❌ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T04:22:04Z

EWS run on previous version of this PR (hash 9847f2a)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	~~🛠 vision~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	❌ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T04:44:08Z

EWS run on previous version of this PR (hash 7492c7c)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	❌ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
⏳ 🛠 🧪 jsc	~~🧪 api-ios~~	❌ 🧪 mac-wk2	✅ 🛠 gtk
	❌ 🛠 vision	❌ 🧪 mac-AS-debug-wk2	~~🧪 gtk-wk2~~
	❌ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	❌ 🛠 mac-safer-cpp	⏳ 🛠 jsc-armv7
	✅ 🛠 tv-sim		⏳ 🧪 jsc-armv7-tests
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T04:56:46Z

EWS run on previous version of this PR (hash 2876c9a)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	❌ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T07:15:19Z

EWS run on previous version of this PR (hash e7c9669)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T16:49:31Z

EWS run on previous version of this PR (hash 753e491)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	❌ 🧪 api-mac	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	~~🧪 vision-wk2~~	❌ 🧪 mac-intel-wk2	⏳ 🛠 playstation
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T17:51:03Z

EWS run on previous version of this PR (hash a39e08c)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 win
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	⏳ 🧪 win-tests
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	❌ 🧪 api-mac	✅ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	~~🧪 api-ios~~	❌ 🧪 mac-wk2	✅ 🛠 gtk
	~~🛠 vision~~	✅ 🧪 mac-AS-debug-wk2	~~🧪 gtk-wk2~~
	~~🛠 vision-sim~~	❌ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	⏳ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-23T18:49:31Z

EWS run on previous version of this PR (hash d35b378)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

aestes · 2025-06-23T18:03:57Z

Source/WebCore/platform/ios/VideoPresentationInterfaceIOS.h

@@ -47,7 +47,7 @@
 #include <wtf/ThreadSafeWeakPtr.h>

 OBJC_CLASS AVPlayerViewController;
-OBJC_CLASS LMPlayableViewController;
+OBJC_CLASS WKPlayableViewController;


Nit: mis-sorted

aestes · 2025-06-23T18:04:07Z

Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.h

@@ -30,7 +30,7 @@
 #include <WebCore/VideoPresentationInterfaceIOS.h>
 #include <wtf/TZoneMalloc.h>

-OBJC_CLASS LMPlayableViewController;
+OBJC_CLASS WKPlayableViewController;


Nit: mis-sorted

aestes · 2025-06-23T19:52:50Z

Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.mm

@@ -300,7 +298,7 @@ - (void)layoutSublayers

    ALWAYS_LOG_IF_POSSIBLE(LOGIDENTIFIER);
    m_playerViewController = [linearMediaPlayer() makeViewController];
-    [m_playerViewController view].alpha = 0;
+    [[m_playerViewController baseViewController] view].alpha = 0;


Nit:

Suggested change

[[m_playerViewController baseViewController] view].alpha = 0;

[m_playerViewController baseViewController].view.alpha = 0;

aestes · 2025-06-23T19:53:01Z

Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.h

@@ -45,7 +45,7 @@
 #include <wtf/WeakHashSet.h>
 #include <wtf/text/WTFString.h>

-OBJC_CLASS LMPlayableViewController;
+OBJC_CLASS WKPlayableViewController;


Nit: mis-sorted

aestes · 2025-06-23T19:56:24Z

Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaTypes.h

@@ -98,6 +94,19 @@ API_AVAILABLE(visionos(1.0))
 @property (nonatomic, readonly) float disparityAdjustment;
 @end

-NS_ASSUME_NONNULL_END
+NS_SWIFT_UI_ACTOR
+@interface WKPlayableViewController : NSObject


I think this should be called WKSPlayableViewController so long as it lives in WebKitSwift. It's also strange to call this a view controller when it isn't (i.e. is not a UIViewController).

webkit-early-warning-system · 2025-06-24T04:44:41Z

EWS run on previous version of this PR (hash eba036f)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-06-24T18:35:02Z

EWS run on previous version of this PR (hash ea175e3)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	❌ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

aestes · 2025-06-24T18:38:45Z

Source/WebCore/platform/ios/VideoPresentationInterfaceIOS.h

 OBJC_CLASS UIImage;
 OBJC_CLASS UIViewController;
 OBJC_CLASS UIWindow;
 OBJC_CLASS UIView;
 OBJC_CLASS CALayer;
 OBJC_CLASS NSError;
 OBJC_CLASS WebAVPlayerController;
+OBJC_CLASS WKSPlayableViewControllerHost;


Nit: mis-sorted

aestes · 2025-06-24T18:39:13Z

Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.h

    void setSpatialImmersive(bool) final;
    void swapFullscreenModesWith(VideoPresentationInterfaceIOS&) final;

    WKSLinearMediaPlayer *linearMediaPlayer() const;
    void ensurePlayableViewController();

-    RetainPtr<LMPlayableViewController> m_playerViewController;
+    RetainPtr<WKSPlayableViewControllerHost> m_playerViewController;


Suggested change

RetainPtr<WKSPlayableViewControllerHost> m_playerViewController;

RetainPtr<WKSPlayableViewControllerHost> m_playerViewControllerHost;

aestes · 2025-06-24T18:39:45Z

Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.h

@@ -186,7 +186,7 @@ class VideoPresentationManagerProxy
 #endif

 #if ENABLE(LINEAR_MEDIA_PLAYER)
-    LMPlayableViewController *playableViewController(PlaybackSessionContextIdentifier) const;
+        WKSPlayableViewControllerHost *playableViewController(PlaybackSessionContextIdentifier) const;


Suggested change

WKSPlayableViewControllerHost *playableViewController(PlaybackSessionContextIdentifier) const;

WKSPlayableViewControllerHost *playableViewController(PlaybackSessionContextIdentifier) const;

aestes · 2025-06-24T18:44:07Z

Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaTypes.h

+NS_SWIFT_UI_ACTOR
+@interface WKSPlayableViewControllerHost : NSObject
+
+@property (nonatomic, readonly) UIViewController *baseViewController;


Would be OK to just call this viewController or playableViewController now that the class has a better name.

aestes · 2025-06-24T20:02:13Z

r=me

I'm not 100% convinced this statement is factual:

Swift types cannot be accessed by Objective-C in another framework

... but I think the introduction of WKSPlayableViewControllerHost makes sense as a workaround to the Swift 6 compiler error.

webkit-early-warning-system · 2025-06-24T23:14:59Z

EWS run on current version of this PR (hash 33e59b5)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	⏳ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

…ayer https://bugs.webkit.org/show_bug.cgi?id=294823 rdar://154057962 Reviewed by Andy Estes. Address Swift 6 errors in WKSLinearMediaPlayer and related code. - If it walks like a duck and talks like a duck... it's not always a duck. In this case, AVKit has a public Swift class `PlayableViewController` and annotated with `@objc(LMPlayableViewController)`. This annotation makes the type compatible and indistuinguishable from an Objective C type. However, Swift types cannot be accessed by Objective-C in another framework; within their own framework, the Swift bridging header is used. AVKit attempted to work around this by creating an Objective-C interface that was essentially a forward declaration of `LMPlayableViewController`; this is an unsupported configuration as it removes all compile-time checking, which results in the Swift compiler being confused. To fix, the `LMPlayableViewController` type is now never used within WebKit; only the `PlayableViewController` type is used from within Swift WebKit code. Consequently, a new wrapper type is created that abstracts the `PlayableViewController` and exposes the needed symbols to Objective-C, so that the compiler can function properly. - Use `@objc @implementation` instead of `@_objcImplementation`. - Use `RealityKit` instead of the re-exported `RealityFoundation` module. - Adopt `@preconcurrency` when needed, to silence errors due to the underlying framework symbols not having proper annotations. * Source/WebCore/platform/ios/VideoPresentationInterfaceAVKit.h: * Source/WebCore/platform/ios/VideoPresentationInterfaceIOS.h: (WebCore::VideoPresentationInterfaceIOS::playableViewController): * Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.h: * Source/WebKit/Platform/ios/VideoPresentationInterfaceLMK.mm: (WebKit::VideoPresentationInterfaceLMK::setupFullscreen): (WebKit::VideoPresentationInterfaceLMK::enterExternalPlayback): (WebKit::VideoPresentationInterfaceLMK::playerViewController const): (WebKit::VideoPresentationInterfaceLMK::playableViewController): (WebKit::VideoPresentationInterfaceLMK::ensurePlayableViewController): * Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.h: * Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm: (WebKit::VideoPresentationManagerProxy::playableViewController const): * Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm: (-[WKFullScreenViewController configureEnvironmentPickerOrFullscreenVideoButtonView]): * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitExtras.h: Removed. * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitExtras.swift: Removed. * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaKitSPI.h: Removed. * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaPlayer.swift: (SwiftOnlyData.viewController): (WKSLinearMediaPlayer.makeViewController): (WKSLinearMediaPlayer.enterExternalPresentation(_:(any Error)?) -> Void:)): (WKSLinearMediaPlayer.exitExternalPresentation(_:(any Error)?) -> Void:)): (WKSLinearMediaPlayer.enterFullscreen(_:(any Error)?) -> Void:)): (WKSLinearMediaPlayer.exitFullscreen(_:(any Error)?) -> Void:)): (WKSLinearMediaPlayer.maybeCreateSpatialOrImmersiveEntity): (WKSLinearMediaPlayer.maybeClearSpatialOrImmersiveEntity): * Source/WebKit/WebKitSwift/LinearMediaKit/LinearMediaTypes.swift: (WKSPlayableViewControllerHost.baseViewController): (WKSPlayableViewControllerHost.automaticallyDockOnFullScreenPresentation): (WKSPlayableViewControllerHost.dismissFullScreenOnExitingDocking): (WKSPlayableViewControllerHost.environmentPickerButtonViewController): (WKSPlayableViewControllerHost.playable): (WKSPlayableViewControllerHost.prefersAutoDimming): * Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaPlayer.h: * Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaTypes.h: * Source/WebKit/WebKitSwift/WebKitSwift.h: Canonical link: https://commits.webkit.org/296600@main

webkit-commit-queue · 2025-06-25T03:02:31Z

Committed 296600@main (facbe72): https://commits.webkit.org/296600@main

Reviewed commits have been landed. Closing PR #47043 and removing active labels.

rr-codes requested review from emw-apple and cdumez as code owners June 23, 2025 03:22

rr-codes self-assigned this Jun 23, 2025

rr-codes added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Jun 23, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from d87fddc to 1f51336 Compare June 23, 2025 04:06

rr-codes requested review from hortont424, aestes, whsieh, pxlcoder, aprotyas and megangardner June 23, 2025 04:09

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 1f51336 to 9847f2a Compare June 23, 2025 04:22

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 9847f2a to 7492c7c Compare June 23, 2025 04:44

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 7492c7c to 2876c9a Compare June 23, 2025 04:56

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 2876c9a to e7c9669 Compare June 23, 2025 07:15

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from e7c9669 to 753e491 Compare June 23, 2025 16:49

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 753e491 to a39e08c Compare June 23, 2025 17:50

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from a39e08c to d35b378 Compare June 23, 2025 18:49

aestes reviewed Jun 23, 2025

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 23, 2025

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from d35b378 to eba036f Compare June 24, 2025 04:44

rr-codes changed the title ~~[Swift in WebKit] Fix Swift 6 warnings and errors in WKS code~~ [Swift in WebKit] Fix Swift 6 warnings and errors in WKSLinearMediaPlayer Jun 24, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from eba036f to ea175e3 Compare June 24, 2025 18:34

aestes approved these changes Jun 24, 2025

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Jun 24, 2025

rr-codes force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from ea175e3 to 33e59b5 Compare June 24, 2025 23:14

rr-codes added the merge-queue Applied to send a pull request to merge-queue label Jun 25, 2025

webkit-commit-queue force-pushed the eng/Swift-in-WebKit-Fix-Swift-6-warnings-and-errors-in-WKS-code branch from 33e59b5 to facbe72 Compare June 25, 2025 03:02

webkit-commit-queue merged commit facbe72 into WebKit:main Jun 25, 2025

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 25, 2025

	[[m_playerViewController baseViewController] view].alpha = 0;
	[m_playerViewController baseViewController].view.alpha = 0;

	RetainPtr<WKSPlayableViewControllerHost> m_playerViewController;
	RetainPtr<WKSPlayableViewControllerHost> m_playerViewControllerHost;

	WKSPlayableViewControllerHost *playableViewController(PlaybackSessionContextIdentifier) const;
	WKSPlayableViewControllerHost *playableViewController(PlaybackSessionContextIdentifier) const;

[Swift in WebKit] Fix Swift 6 warnings and errors in WKSLinearMediaPlayer #47043

[Swift in WebKit] Fix Swift 6 warnings and errors in WKSLinearMediaPlayer #47043

Uh oh!

Conversation

rr-codes commented Jun 23, 2025 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aestes commented Jun 24, 2025

Uh oh!

webkit-early-warning-system commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-commit-queue commented Jun 25, 2025

Uh oh!

Uh oh!

rr-codes commented Jun 23, 2025 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 23, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 24, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 24, 2025 •

edited

Loading

webkit-early-warning-system commented Jun 24, 2025 •

edited

Loading