Skip to content

Commit

Permalink
Rename VideoFullscreenInterfaceAVKit to VideoFullscreenInterfaceIOS
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@danae404
danae404 committed Jan 23, 2024
1 parent 4191fac commit 78ed1f1
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 106 deletions.
2 changes: 1 addition & 1 deletion Source/WebCore/SourcesCocoa.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ platform/ios/UIFoundationSoftLink.mm
platform/ios/UIViewControllerUtilities.mm
platform/ios/UserAgentIOS.mm
platform/ios/ValidationBubbleIOS.mm
platform/ios/VideoFullscreenInterfaceAVKit.mm @no-unify
platform/ios/VideoFullscreenInterfaceIOS.mm @no-unify
platform/ios/WebAVPlayerController.mm
platform/ios/WebBackgroundTaskController.mm
platform/ios/WebCoreMotionManager.mm
Expand Down
16 changes: 8 additions & 8 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1272,8 +1272,8 @@
3F42B31D1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F42B31B1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
3F8020351E9E47BF00DEC61D /* CoreAudioCaptureDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F8020321E9E381D00DEC61D /* CoreAudioCaptureDevice.h */; };
3F8020371E9E47C500DEC61D /* CoreAudioCaptureDeviceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F8020341E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */; };
3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceIOS.mm */; };
3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
3FF813A71DBA8640009BF001 /* PointerLockController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFC434F192406A900A0D3B5 /* PointerLockController.h */; settings = {ATTRIBUTES = (Private, ); }; };
410398A72B593B7100C9E03D /* MediaStreamTrackDataHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 410398A52B593B7000C9E03D /* MediaStreamTrackDataHolder.h */; settings = {ATTRIBUTES = (Private, ); }; };
4107908C1FC3F0330061B27A /* ClientOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 4107908A1FC3E4F20061B27A /* ClientOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -9625,8 +9625,8 @@
3F8020321E9E381D00DEC61D /* CoreAudioCaptureDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAudioCaptureDevice.h; sourceTree = "<group>"; };
3F8020331E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreAudioCaptureDeviceManager.cpp; sourceTree = "<group>"; };
3F8020341E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreAudioCaptureDeviceManager.h; sourceTree = "<group>"; };
3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenInterfaceAVKit.mm; sourceTree = "<group>"; };
3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenInterfaceAVKit.h; sourceTree = "<group>"; };
3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenInterfaceIOS.mm; sourceTree = "<group>"; };
3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenInterfaceIOS.h; sourceTree = "<group>"; };
41024FC823CF254F00FDF98E /* SampleBufferDisplayLayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SampleBufferDisplayLayer.cpp; sourceTree = "<group>"; };
4102EE0E27830E6300D6BE74 /* FormDataConsumer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FormDataConsumer.h; sourceTree = "<group>"; };
4102EE1027830E6300D6BE74 /* FormDataConsumer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FormDataConsumer.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -30172,8 +30172,8 @@
F4C80CC52ABA43EB00DEB820 /* UIViewControllerUtilities.mm */,
A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */,
837B7D1F1DC3F54C00D051FC /* ValidationBubbleIOS.mm */,
3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */,
3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */,
3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceIOS.h */,
3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceIOS.mm */,
CDA29A2C1CBF73FC00901CCF /* WebAVPlayerController.h */,
CDA29A2D1CBF73FC00901CCF /* WebAVPlayerController.mm */,
1F36EA9A1E21BA1700621E25 /* WebBackgroundTaskController.h */,
Expand Down Expand Up @@ -42363,7 +42363,7 @@
41DEEFB02719B29000CB8D74 /* VideoFrameRequestCallback.h in Headers */,
416049332743B0E800A86FA0 /* VideoFrameTimeMetadata.h in Headers */,
E300511729DB9A1300E1C3A4 /* VideoFullscreenCaptions.h in Headers */,
3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceAVKit.h in Headers */,
3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceIOS.h in Headers */,
52B0D4C21C57FF910077CE53 /* VideoFullscreenInterfaceMac.h in Headers */,
1DAB3114251D725C00FC9485 /* VideoLayerManager.h in Headers */,
1DAB3115251D74DB00FC9485 /* VideoLayerManagerObjC.h in Headers */,
Expand Down Expand Up @@ -44056,7 +44056,7 @@
7CE68344192143A800F4D928 /* UserMessageHandlerDescriptor.cpp in Sources */,
7C73FB07191EF417007DE061 /* UserMessageHandlersNamespace.cpp in Sources */,
E300511629DB92D300E1C3A4 /* VideoFullscreenCaptions.mm in Sources */,
3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm in Sources */,
3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceIOS.mm in Sources */,
41FFD2C42756570F00501BBF /* VideoLayerManagerObjC.mm in Sources */,
26F9A83818A046AC00AEB88A /* ViewportConfiguration.cpp in Sources */,
CDED1C3C24CD305700934E12 /* VP9UtilitiesCocoa.mm in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/html/HTMLMediaElement.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@

#if PLATFORM(IOS_FAMILY)
#include "RuntimeApplicationChecks.h"
#include "VideoFullscreenInterfaceAVKit.h"
#include "VideoFullscreenInterfaceIOS.h"
#endif

#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Expand Down
4 changes: 2 additions & 2 deletions Source/WebCore/platform/graphics/PlatformVideoFullscreenInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
namespace WebCore {

class NullVideoFullscreenInterface;
class VideoFullscreenInterfaceAVKit;
class VideoFullscreenInterfaceIOS;
class VideoFullscreenInterfaceMac;

#if PLATFORM(WATCHOS)
using PlatformVideoFullscreenInterface = NullVideoFullscreenInterface;
#elif PLATFORM(IOS_FAMILY)
using PlatformVideoFullscreenInterface = VideoFullscreenInterfaceAVKit;
using PlatformVideoFullscreenInterface = VideoFullscreenInterfaceIOS;
#elif PLATFORM(MAC)
using PlatformVideoFullscreenInterface = VideoFullscreenInterfaceMac;
#endif
Expand Down
12 changes: 6 additions & 6 deletions ...tform/ios/VideoFullscreenInterfaceAVKit.h → ...latform/ios/VideoFullscreenInterfaceIOS.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ namespace WebCore {
class FloatRect;
class FloatSize;

class VideoFullscreenInterfaceAVKit final
class VideoFullscreenInterfaceIOS final
: public VideoPresentationModelClient
, public PlaybackSessionModelClient
, public VideoFullscreenCaptions
, public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<VideoFullscreenInterfaceAVKit, WTF::DestructionThread::MainRunLoop> {
, public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<VideoFullscreenInterfaceIOS, WTF::DestructionThread::MainRunLoop> {
public:
WEBCORE_EXPORT static Ref<VideoFullscreenInterfaceAVKit> create(PlaybackSessionInterfaceAVKit&);
virtual ~VideoFullscreenInterfaceAVKit();
WEBCORE_EXPORT static Ref<VideoFullscreenInterfaceIOS> create(PlaybackSessionInterfaceAVKit&);
WEBCORE_EXPORT virtual ~VideoFullscreenInterfaceIOS();
WEBCORE_EXPORT void setVideoPresentationModel(VideoPresentationModel*);
PlaybackSessionInterfaceAVKit& playbackSessionInterface() const { return m_playbackSessionInterface.get(); }
PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionInterface->playbackSessionModel(); }
Expand Down Expand Up @@ -166,12 +166,12 @@ class VideoFullscreenInterfaceAVKit final
#if !RELEASE_LOG_DISABLED
const void* logIdentifier() const;
const Logger* loggerPtr() const;
const char* logClassName() const { return "VideoFullscreenInterfaceAVKit"; };
const char* logClassName() const { return "VideoFullscreenInterfaceIOS"; };
WTFLogChannel& logChannel() const;
#endif

private:
WEBCORE_EXPORT VideoFullscreenInterfaceAVKit(PlaybackSessionInterfaceAVKit&);
WEBCORE_EXPORT VideoFullscreenInterfaceIOS(PlaybackSessionInterfaceAVKit&);

void doSetup();
void finalizeSetup();
Expand Down
Loading

0 comments on commit 78ed1f1

Please sign in to comment.