Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename VideoFullscreenInterfaceAVKit to VideoFullscreenInterfaceIOS #23071

Conversation

danae404
Copy link
Contributor

@danae404 danae404 commented Jan 22, 2024

78ed1f1

Rename VideoFullscreenInterfaceAVKit to VideoFullscreenInterfaceIOS
https://bugs.webkit.org/show_bug.cgi?id=267884
rdar://121399424

Reviewed by Andy Estes.

Rename VideoFullscreenInterfaceAVKit to VideoFullscreenInterfaceIOS for future
refactoring.

* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/HTMLMediaElement.cpp:
* Source/WebCore/platform/graphics/PlatformVideoFullscreenInterface.h:
* Source/WebCore/platform/ios/VideoFullscreenInterfaceIOS.h: Renamed from Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h.
* Source/WebCore/platform/ios/VideoFullscreenInterfaceIOS.mm: Renamed from Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm.
(clearUIColor):
(boolString):
(-[WebAVPlayerViewControllerDelegate fullscreenInterface]):
(-[WebAVPlayerViewControllerDelegate setFullscreenInterface:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerWillStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerDidStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewController:failedToStartPictureInPictureWithError:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerWillStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerDidStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart:]):
(convertToExitFullScreenReason):
(-[WebAVPlayerViewControllerDelegate playerViewController:shouldExitFullScreenWithReason:]):
(-[WebAVPlayerViewControllerDelegate playerViewController:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerShouldStartPictureInPictureFromInlineWhenEnteringBackground:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerWillStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerDidStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureController:failedToStartPictureInPictureWithError:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerWillStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerDidStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureController:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:]):
(WebAVPictureInPictureContentViewController_initWithController):
(WebAVPictureInPictureContentViewController_controller):
(WebAVPictureInPictureContentViewController_playerLayer):
(WebAVPictureInPictureContentViewController_setPlayerLayer):
(WebAVPictureInPictureContentViewController_viewWillLayoutSubviews):
(WebAVPictureInPictureContentViewController_dealloc):
(allocWebAVPictureInPictureContentViewControllerInstance):
(-[WebAVPlayerViewController initWithFullscreenInterface:]):
(-[WebAVPlayerViewController configurePlayerViewControllerWithFullscreenInterface:]):
(-[WebAVPlayerViewController dealloc]):
(-[WebAVPlayerViewController playerViewControllerShouldHandleDoneButtonTap:]):
(-[WebAVPlayerViewController setWebKitOverrideRouteSharingPolicy:routingContextUID:]):
(-[WebAVPlayerViewController enterFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController exitFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController observeValueForKeyPath:ofObject:change:context:]):
(-[WebAVPlayerViewController initObserver]):
(-[WebAVPlayerViewController removeObserver]):
(-[WebAVPlayerViewController MY_NO_RETURN]):
(-[WebAVPlayerViewController isPictureInPicturePossible]):
(-[WebAVPlayerViewController isPictureInPictureActive]):
(-[WebAVPlayerViewController pictureInPictureActive]):
(-[WebAVPlayerViewController pictureInPictureWasStartedWhenEnteringBackground]):
(-[WebAVPlayerViewController view]):
(-[WebAVPlayerViewController flashPlaybackControlsWithDuration:]):
(-[WebAVPlayerViewController showsPlaybackControls]):
(-[WebAVPlayerViewController setShowsPlaybackControls:]):
(-[WebAVPlayerViewController setAllowsPictureInPicturePlayback:]):
(-[WebAVPlayerViewController setDelegate:]):
(-[WebAVPlayerViewController setPlayerController:]):
(-[WebAVPlayerViewController avPlayerViewController]):
(-[WebAVPlayerViewController removeFromParentViewController]):
(-[WebAVPlayerViewController logIdentifier]):
(-[WebAVPlayerViewController loggerPtr]):
(-[WebAVPlayerViewController logChannel]):
(VideoFullscreenInterfaceIOS::create):
(VideoFullscreenInterfaceIOS::VideoFullscreenInterfaceIOS):
(VideoFullscreenInterfaceIOS::~VideoFullscreenInterfaceIOS):
(VideoFullscreenInterfaceIOS::playerController const):
(VideoFullscreenInterfaceIOS::avPlayerViewController const):
(VideoFullscreenInterfaceIOS::setVideoPresentationModel):
(VideoFullscreenInterfaceIOS::hasVideoChanged):
(VideoFullscreenInterfaceIOS::videoDimensionsChanged):
(VideoFullscreenInterfaceIOS::externalPlaybackChanged):
(VideoFullscreenInterfaceIOS::pictureInPictureWasStartedWhenEnteringBackground const):
(fallbackViewController):
(VideoFullscreenInterfaceIOS::presentingViewController):
(VideoFullscreenInterfaceIOS::applicationDidBecomeActive):
(VideoFullscreenInterfaceIOS::setupFullscreen):
(VideoFullscreenInterfaceIOS::enterFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreenWithoutAnimationToMode):
(VideoFullscreenInterfaceIOS::cleanupFullscreen):
(VideoFullscreenInterfaceIOS::invalidate):
(VideoFullscreenInterfaceIOS::setPlayerIdentifier):
(VideoFullscreenInterfaceIOS::requestHideAndExitFullscreen):
(VideoFullscreenInterfaceIOS::preparedToReturnToInline):
(VideoFullscreenInterfaceIOS::preparedToExitFullscreen):
(VideoFullscreenInterfaceIOS::mayAutomaticallyShowVideoPictureInPicture const):
(VideoFullscreenInterfaceIOS::prepareForPictureInPictureStop):
(VideoFullscreenInterfaceIOS::willStartPictureInPicture):
(VideoFullscreenInterfaceIOS::didStartPictureInPicture):
(VideoFullscreenInterfaceIOS::failedToStartPictureInPicture):
(VideoFullscreenInterfaceIOS::willStopPictureInPicture):
(VideoFullscreenInterfaceIOS::didStopPictureInPicture):
(VideoFullscreenInterfaceIOS::prepareForPictureInPictureStopWithCompletionHandler):
(VideoFullscreenInterfaceIOS::shouldExitFullscreenWithReason):
(VideoFullscreenInterfaceIOS::setHasVideoContentLayer):
(VideoFullscreenInterfaceIOS::setInlineRect):
(VideoFullscreenInterfaceIOS::doSetup):
(VideoFullscreenInterfaceIOS::preparedToReturnToStandby):
(VideoFullscreenInterfaceIOS::finalizeSetup):
(VideoFullscreenInterfaceIOS::doEnterFullscreen):
(VideoFullscreenInterfaceIOS::doExitFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreenHandler):
(VideoFullscreenInterfaceIOS::enterFullscreenHandler):
(VideoFullscreenInterfaceIOS::returnToStandby):
(VideoFullscreenInterfaceIOS::watchdogTimerFired):
(VideoFullscreenInterfaceIOS::setMode):
(VideoFullscreenInterfaceIOS::clearMode):
(VideoFullscreenInterfaceIOS::isPlayingVideoInEnhancedFullscreen const):
(VideoFullscreenInterfaceIOS::logIdentifier const):
(VideoFullscreenInterfaceIOS::loggerPtr const):
(VideoFullscreenInterfaceIOS::logChannel const):
(WebCore::setSupportsPictureInPicture):
(WebCore::supportsPictureInPicture):
* Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm:
(VideoFullscreenControllerContext::setUpFullscreen):
* Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm:
* Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
* Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

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

8b671a6

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 watch-sim

@danae404 danae404 self-assigned this Jan 22, 2024
@danae404 danae404 added the Media Bugs related to the HTML 5 Media elements. label Jan 22, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 22, 2024
@aestes
Copy link
Contributor

aestes commented Jan 22, 2024

Please include a radar link instead of "Include a Radar link (OOPS!)."

@danae404 danae404 removed the merging-blocked Applied to prevent a change from being merged label Jan 22, 2024
@danae404 danae404 force-pushed the eng/Rename-VideoFullscreenInterfaceAVKit-to-VideoFullscreenInterfaceIOS branch from b82157c to cbe6e28 Compare January 22, 2024 23:34
@danae404 danae404 force-pushed the eng/Rename-VideoFullscreenInterfaceAVKit-to-VideoFullscreenInterfaceIOS branch from cbe6e28 to 8b671a6 Compare January 23, 2024 00:05
@danae404 danae404 added the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2024
https://bugs.webkit.org/show_bug.cgi?id=267884
rdar://121399424

Reviewed by Andy Estes.

Rename VideoFullscreenInterfaceAVKit to VideoFullscreenInterfaceIOS for future
refactoring.

* Source/WebCore/SourcesCocoa.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/html/HTMLMediaElement.cpp:
* Source/WebCore/platform/graphics/PlatformVideoFullscreenInterface.h:
* Source/WebCore/platform/ios/VideoFullscreenInterfaceIOS.h: Renamed from Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h.
* Source/WebCore/platform/ios/VideoFullscreenInterfaceIOS.mm: Renamed from Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm.
(clearUIColor):
(boolString):
(-[WebAVPlayerViewControllerDelegate fullscreenInterface]):
(-[WebAVPlayerViewControllerDelegate setFullscreenInterface:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerWillStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerDidStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewController:failedToStartPictureInPictureWithError:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerWillStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerDidStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerShouldAutomaticallyDismissAtPictureInPictureStart:]):
(convertToExitFullScreenReason):
(-[WebAVPlayerViewControllerDelegate playerViewController:shouldExitFullScreenWithReason:]):
(-[WebAVPlayerViewControllerDelegate playerViewController:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:]):
(-[WebAVPlayerViewControllerDelegate playerViewControllerShouldStartPictureInPictureFromInlineWhenEnteringBackground:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerWillStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerDidStartPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureController:failedToStartPictureInPictureWithError:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerWillStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureControllerDidStopPictureInPicture:]):
(-[WebAVPlayerViewControllerDelegate pictureInPictureController:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:]):
(WebAVPictureInPictureContentViewController_initWithController):
(WebAVPictureInPictureContentViewController_controller):
(WebAVPictureInPictureContentViewController_playerLayer):
(WebAVPictureInPictureContentViewController_setPlayerLayer):
(WebAVPictureInPictureContentViewController_viewWillLayoutSubviews):
(WebAVPictureInPictureContentViewController_dealloc):
(allocWebAVPictureInPictureContentViewControllerInstance):
(-[WebAVPlayerViewController initWithFullscreenInterface:]):
(-[WebAVPlayerViewController configurePlayerViewControllerWithFullscreenInterface:]):
(-[WebAVPlayerViewController dealloc]):
(-[WebAVPlayerViewController playerViewControllerShouldHandleDoneButtonTap:]):
(-[WebAVPlayerViewController setWebKitOverrideRouteSharingPolicy:routingContextUID:]):
(-[WebAVPlayerViewController enterFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController exitFullScreenAnimated:completionHandler:]):
(-[WebAVPlayerViewController observeValueForKeyPath:ofObject:change:context:]):
(-[WebAVPlayerViewController initObserver]):
(-[WebAVPlayerViewController removeObserver]):
(-[WebAVPlayerViewController MY_NO_RETURN]):
(-[WebAVPlayerViewController isPictureInPicturePossible]):
(-[WebAVPlayerViewController isPictureInPictureActive]):
(-[WebAVPlayerViewController pictureInPictureActive]):
(-[WebAVPlayerViewController pictureInPictureWasStartedWhenEnteringBackground]):
(-[WebAVPlayerViewController view]):
(-[WebAVPlayerViewController flashPlaybackControlsWithDuration:]):
(-[WebAVPlayerViewController showsPlaybackControls]):
(-[WebAVPlayerViewController setShowsPlaybackControls:]):
(-[WebAVPlayerViewController setAllowsPictureInPicturePlayback:]):
(-[WebAVPlayerViewController setDelegate:]):
(-[WebAVPlayerViewController setPlayerController:]):
(-[WebAVPlayerViewController avPlayerViewController]):
(-[WebAVPlayerViewController removeFromParentViewController]):
(-[WebAVPlayerViewController logIdentifier]):
(-[WebAVPlayerViewController loggerPtr]):
(-[WebAVPlayerViewController logChannel]):
(VideoFullscreenInterfaceIOS::create):
(VideoFullscreenInterfaceIOS::VideoFullscreenInterfaceIOS):
(VideoFullscreenInterfaceIOS::~VideoFullscreenInterfaceIOS):
(VideoFullscreenInterfaceIOS::playerController const):
(VideoFullscreenInterfaceIOS::avPlayerViewController const):
(VideoFullscreenInterfaceIOS::setVideoPresentationModel):
(VideoFullscreenInterfaceIOS::hasVideoChanged):
(VideoFullscreenInterfaceIOS::videoDimensionsChanged):
(VideoFullscreenInterfaceIOS::externalPlaybackChanged):
(VideoFullscreenInterfaceIOS::pictureInPictureWasStartedWhenEnteringBackground const):
(fallbackViewController):
(VideoFullscreenInterfaceIOS::presentingViewController):
(VideoFullscreenInterfaceIOS::applicationDidBecomeActive):
(VideoFullscreenInterfaceIOS::setupFullscreen):
(VideoFullscreenInterfaceIOS::enterFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreenWithoutAnimationToMode):
(VideoFullscreenInterfaceIOS::cleanupFullscreen):
(VideoFullscreenInterfaceIOS::invalidate):
(VideoFullscreenInterfaceIOS::setPlayerIdentifier):
(VideoFullscreenInterfaceIOS::requestHideAndExitFullscreen):
(VideoFullscreenInterfaceIOS::preparedToReturnToInline):
(VideoFullscreenInterfaceIOS::preparedToExitFullscreen):
(VideoFullscreenInterfaceIOS::mayAutomaticallyShowVideoPictureInPicture const):
(VideoFullscreenInterfaceIOS::prepareForPictureInPictureStop):
(VideoFullscreenInterfaceIOS::willStartPictureInPicture):
(VideoFullscreenInterfaceIOS::didStartPictureInPicture):
(VideoFullscreenInterfaceIOS::failedToStartPictureInPicture):
(VideoFullscreenInterfaceIOS::willStopPictureInPicture):
(VideoFullscreenInterfaceIOS::didStopPictureInPicture):
(VideoFullscreenInterfaceIOS::prepareForPictureInPictureStopWithCompletionHandler):
(VideoFullscreenInterfaceIOS::shouldExitFullscreenWithReason):
(VideoFullscreenInterfaceIOS::setHasVideoContentLayer):
(VideoFullscreenInterfaceIOS::setInlineRect):
(VideoFullscreenInterfaceIOS::doSetup):
(VideoFullscreenInterfaceIOS::preparedToReturnToStandby):
(VideoFullscreenInterfaceIOS::finalizeSetup):
(VideoFullscreenInterfaceIOS::doEnterFullscreen):
(VideoFullscreenInterfaceIOS::doExitFullscreen):
(VideoFullscreenInterfaceIOS::exitFullscreenHandler):
(VideoFullscreenInterfaceIOS::enterFullscreenHandler):
(VideoFullscreenInterfaceIOS::returnToStandby):
(VideoFullscreenInterfaceIOS::watchdogTimerFired):
(VideoFullscreenInterfaceIOS::setMode):
(VideoFullscreenInterfaceIOS::clearMode):
(VideoFullscreenInterfaceIOS::isPlayingVideoInEnhancedFullscreen const):
(VideoFullscreenInterfaceIOS::logIdentifier const):
(VideoFullscreenInterfaceIOS::loggerPtr const):
(VideoFullscreenInterfaceIOS::logChannel const):
(WebCore::setSupportsPictureInPicture):
(WebCore::supportsPictureInPicture):
* Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm:
(VideoFullscreenControllerContext::setUpFullscreen):
* Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm:
* Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
* Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:

Canonical link: https://commits.webkit.org/273363@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Rename-VideoFullscreenInterfaceAVKit-to-VideoFullscreenInterfaceIOS branch from 8b671a6 to 78ed1f1 Compare January 23, 2024 18:01
@webkit-commit-queue
Copy link
Collaborator

Committed 273363@main (78ed1f1): https://commits.webkit.org/273363@main

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

@webkit-commit-queue webkit-commit-queue merged commit 78ed1f1 into WebKit:main Jan 23, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Media Bugs related to the HTML 5 Media elements.
Projects
None yet
5 participants