Remove Web prefix from WebVideoFullscreen and WebPlaybackSession classes.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Jul 2017 07:25:39 +0000 (07:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Jul 2017 07:25:39 +0000 (07:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174437

Patch by Jeremy Jones <jeremyj@apple.com> on 2017-07-28
Reviewed by Darin Adler.

Source/WebCore:

No new tests because no behavior change.

Remove redundant Web- prefix from classes in WebCore namespace.

* WebCore.xcodeproj/project.pbxproj:
* html/HTMLMediaElement.cpp:
* html/HTMLVideoElement.cpp:
* platform/cocoa/PlaybackSessionInterface.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h.
(WebCore::PlaybackSessionInterface::~PlaybackSessionInterface):
* platform/cocoa/PlaybackSessionModel.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h.
(WebCore::PlaybackSessionModel::~PlaybackSessionModel):
(WebCore::PlaybackSessionModelClient::~PlaybackSessionModelClient):
(WebCore::PlaybackSessionModelClient::externalPlaybackChanged):
* platform/cocoa/PlaybackSessionModelMediaElement.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h.
* platform/cocoa/PlaybackSessionModelMediaElement.mm: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm.
* platform/cocoa/VideoFullscreenChangeObserver.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h.
(WebCore::VideoFullscreenChangeObserver::~VideoFullscreenChangeObserver):
* platform/cocoa/VideoFullscreenModel.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h.
(WebCore::VideoFullscreenModel::~VideoFullscreenModel):
(WebCore::VideoFullscreenModelClient::~VideoFullscreenModelClient):
* platform/cocoa/VideoFullscreenModelVideoElement.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h.
(WebCore::VideoFullscreenModelVideoElement::create):
* platform/cocoa/VideoFullscreenModelVideoElement.mm: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm.
* platform/ios/PlaybackSessionInterfaceAVKit.h: Renamed from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h.
* platform/ios/PlaybackSessionInterfaceAVKit.mm: Renamed from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm.
* platform/ios/VideoFullscreenInterfaceAVKit.h: Renamed from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h.
* platform/ios/VideoFullscreenInterfaceAVKit.mm: Renamed from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm.
* platform/ios/WebAVPlayerController.h:
* platform/ios/WebAVPlayerController.mm:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
* platform/mac/PlaybackSessionInterfaceMac.h: Renamed from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.h.
* platform/mac/PlaybackSessionInterfaceMac.mm: Renamed from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm.
* platform/mac/VideoFullscreenInterfaceMac.h: Renamed from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h.
* platform/mac/VideoFullscreenInterfaceMac.mm: Renamed from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm.
* platform/mac/WebPlaybackControlsManager.h:
* platform/mac/WebPlaybackControlsManager.mm:

Source/WebKit:

Remove redundant Web- prefix from classes in WebKit namespace.

* DerivedSources.make:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/Cocoa/PlaybackSessionManagerProxy.h: Renamed from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h.
* UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in: Renamed from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in.
* UIProcess/Cocoa/PlaybackSessionManagerProxy.mm: Added.
* UIProcess/Cocoa/VideoFullscreenManagerProxy.h: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h.
* UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in.
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm.
* UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm: Removed.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateMediaTouchBar):
* UIProcess/WebPageProxy.cpp:
(WebKit::m_weakPtrFactory):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::playbackSessionManager):
(WebKit::WebPageProxy::videoFullscreenManager):
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WebPageProxyIOS.mm:
* WebKit.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::playbackSessionManager):
(WebKit::WebPage::videoFullscreenManager):
* WebProcess/WebPage/WebPage.h:
* WebProcess/cocoa/PlaybackSessionManager.h: Renamed from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.h.
* WebProcess/cocoa/PlaybackSessionManager.messages.in: Renamed from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.messages.in.
* WebProcess/cocoa/PlaybackSessionManager.mm: Added.
* WebProcess/cocoa/VideoFullscreenManager.h: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.h.
(WebKit::VideoFullscreenInterfaceContext::create):
* WebProcess/cocoa/VideoFullscreenManager.messages.in: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.messages.in.
* WebProcess/cocoa/VideoFullscreenManager.mm: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.mm.
* WebProcess/cocoa/WebPlaybackSessionManager.mm: Removed.

Source/WebKitLegacy/mac:

Remove redundant Web- prefix from classes in WebKit namespace.

* WebView/WebView.mm:
(-[WebView _setUpPlaybackControlsManagerForMediaElement:]):
* WebView/WebViewData.h:
* WebView/WebViewData.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

54 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLVideoElement.cpp
Source/WebCore/platform/cocoa/PlaybackSessionInterface.h [moved from Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h with 95% similarity]
Source/WebCore/platform/cocoa/PlaybackSessionModel.h [moved from Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h with 90% similarity]
Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.h [moved from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h with 87% similarity]
Source/WebCore/platform/cocoa/PlaybackSessionModelMediaElement.mm [moved from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm with 80% similarity]
Source/WebCore/platform/cocoa/VideoFullscreenChangeObserver.h [moved from Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h with 94% similarity]
Source/WebCore/platform/cocoa/VideoFullscreenModel.h [moved from Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h with 85% similarity]
Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.h [moved from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h with 84% similarity]
Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm [moved from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm with 73% similarity]
Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h [moved from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h with 75% similarity]
Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm [moved from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm with 80% similarity]
Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h [moved from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h with 77% similarity]
Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm [moved from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm with 82% similarity]
Source/WebCore/platform/ios/WebAVPlayerController.h
Source/WebCore/platform/ios/WebAVPlayerController.mm
Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.h [moved from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.h with 79% similarity]
Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm [moved from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm with 77% similarity]
Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.h [moved from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h with 67% similarity]
Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm [moved from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm with 68% similarity]
Source/WebCore/platform/mac/WebPlaybackControlsManager.h
Source/WebCore/platform/mac/WebPlaybackControlsManager.mm
Source/WebKit/ChangeLog
Source/WebKit/DerivedSources.make
Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.h [moved from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h with 78% similarity]
Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in [moved from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in with 98% similarity]
Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm [new file with mode: 0644]
Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h [moved from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h with 68% similarity]
Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in [moved from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in with 98% similarity]
Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm [moved from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm with 57% similarity]
Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm [deleted file]
Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
Source/WebKit/UIProcess/WebPageProxy.cpp
Source/WebKit/UIProcess/WebPageProxy.h
Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/WebProcess/WebPage/WebPage.cpp
Source/WebKit/WebProcess/WebPage/WebPage.h
Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.h [moved from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.h with 76% similarity]
Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.messages.in [moved from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.messages.in with 98% similarity]
Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm [new file with mode: 0644]
Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.h [moved from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.h with 76% similarity]
Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.messages.in [moved from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.messages.in with 98% similarity]
Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm [moved from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.mm with 60% similarity]
Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.mm [deleted file]
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/WebView/WebView.mm
Source/WebKitLegacy/mac/WebView/WebViewData.h
Source/WebKitLegacy/mac/WebView/WebViewData.mm

index 2a19fa6..b77c492 100644 (file)
@@ -1,3 +1,47 @@
+2017-07-28  Jeremy Jones  <jeremyj@apple.com>
+
+        Remove Web prefix from WebVideoFullscreen and WebPlaybackSession classes.
+        https://bugs.webkit.org/show_bug.cgi?id=174437
+
+        Reviewed by Darin Adler.
+
+        No new tests because no behavior change.
+
+        Remove redundant Web- prefix from classes in WebCore namespace.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/HTMLMediaElement.cpp:
+        * html/HTMLVideoElement.cpp:
+        * platform/cocoa/PlaybackSessionInterface.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionInterface.h.
+        (WebCore::PlaybackSessionInterface::~PlaybackSessionInterface):
+        * platform/cocoa/PlaybackSessionModel.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModel.h.
+        (WebCore::PlaybackSessionModel::~PlaybackSessionModel):
+        (WebCore::PlaybackSessionModelClient::~PlaybackSessionModelClient):
+        (WebCore::PlaybackSessionModelClient::externalPlaybackChanged):
+        * platform/cocoa/PlaybackSessionModelMediaElement.h: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.h.
+        * platform/cocoa/PlaybackSessionModelMediaElement.mm: Renamed from Source/WebCore/platform/cocoa/WebPlaybackSessionModelMediaElement.mm.
+        * platform/cocoa/VideoFullscreenChangeObserver.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenChangeObserver.h.
+        (WebCore::VideoFullscreenChangeObserver::~VideoFullscreenChangeObserver):
+        * platform/cocoa/VideoFullscreenModel.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModel.h.
+        (WebCore::VideoFullscreenModel::~VideoFullscreenModel):
+        (WebCore::VideoFullscreenModelClient::~VideoFullscreenModelClient):
+        * platform/cocoa/VideoFullscreenModelVideoElement.h: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.h.
+        (WebCore::VideoFullscreenModelVideoElement::create):
+        * platform/cocoa/VideoFullscreenModelVideoElement.mm: Renamed from Source/WebCore/platform/cocoa/WebVideoFullscreenModelVideoElement.mm.
+        * platform/ios/PlaybackSessionInterfaceAVKit.h: Renamed from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.h.
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm: Renamed from Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm.
+        * platform/ios/VideoFullscreenInterfaceAVKit.h: Renamed from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h.
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm: Renamed from Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm.
+        * platform/ios/WebAVPlayerController.h:
+        * platform/ios/WebAVPlayerController.mm:
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        * platform/mac/PlaybackSessionInterfaceMac.h: Renamed from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.h.
+        * platform/mac/PlaybackSessionInterfaceMac.mm: Renamed from Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm.
+        * platform/mac/VideoFullscreenInterfaceMac.h: Renamed from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h.
+        * platform/mac/VideoFullscreenInterfaceMac.mm: Renamed from Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm.
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebPlaybackControlsManager.mm:
+
 2017-07-27  Jeremy Jones  <jeremyj@apple.com>
 
         Don't override _allowsMediaDocumentInlinePlayback in MediaDocument with playsinlineAttr.
index be4600d..97d7d23 100644 (file)
                3F8020361E9E47C300DEC61D /* CoreAudioCaptureDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8020311E9E381D00DEC61D /* CoreAudioCaptureDevice.cpp */; };
                3F8020371E9E47C500DEC61D /* CoreAudioCaptureDeviceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F8020341E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.h */; };
                3F8020381E9E47C900DEC61D /* CoreAudioCaptureDeviceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F8020331E9E381D00DEC61D /* CoreAudioCaptureDeviceManager.cpp */; };
-               3FBC4AF3189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3FBC4AF1189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm */; };
-               3FBC4AF4189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.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, ); }; };
                3FF1FA661E7350FD00C1002F /* CoreAudioCaptureSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F3BB5821E709EE400C701F2 /* CoreAudioCaptureSource.cpp */; };
                3FF813A71DBA8640009BF001 /* PointerLockController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CFC434F192406A900A0D3B5 /* PointerLockController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3FFFF9A8159D9A550020BBD5 /* WebKitCSSViewportRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */; };
                51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FB5503113E3E9100821176 /* JSCloseEvent.cpp */; };
                51FB67DB1AE6B82B00D06C5A /* ContentExtensionStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */; };
                51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52131E5B1C4F15760033F802 /* WebVideoFullscreenInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */; };
+               52131E5B1C4F15760033F802 /* VideoFullscreenInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52131E5A1C4F15610033F802 /* VideoFullscreenInterfaceMac.mm */; };
                526724F31CB2FEAD0075974D /* TextTrackRepresentationCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 526724F11CB2FDF60075974D /* TextTrackRepresentationCocoa.mm */; };
                52B0D4BE1C57FD1E0077CE53 /* PlatformView.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52B0D4C01C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BF1C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52B0D4C21C57FF910077CE53 /* WebVideoFullscreenInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4C11C57FF910077CE53 /* WebVideoFullscreenInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               52B0D4C01C57FD660077CE53 /* VideoFullscreenChangeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BF1C57FD660077CE53 /* VideoFullscreenChangeObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               52B0D4C21C57FF910077CE53 /* VideoFullscreenInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4C11C57FF910077CE53 /* VideoFullscreenInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                52B6C9C215E3F4DF00690B05 /* DOMNamedFlowCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C9BD15E3F4DF00690B05 /* DOMNamedFlowCollection.cpp */; };
                52B6C9C315E3F4DF00690B05 /* DOMNamedFlowCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B6C9BE15E3F4DF00690B05 /* DOMNamedFlowCollection.h */; };
                52B6C9C515E3F4DF00690B05 /* NamedFlowCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C9C015E3F4DF00690B05 /* NamedFlowCollection.cpp */; };
                52CCA9E215E3F62C0053C77F /* JSDOMNamedFlowCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52CCA9E015E3F62C0053C77F /* JSDOMNamedFlowCollection.cpp */; };
                52CCA9E315E3F62C0053C77F /* JSDOMNamedFlowCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 52CCA9E115E3F62C0053C77F /* JSDOMNamedFlowCollection.h */; };
                52D5A18F1C54592300DE34A3 /* VideoFullscreenLayerManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A18D1C54590300DE34A3 /* VideoFullscreenLayerManager.mm */; };
-               52D5A1A71C57489D00DE34A3 /* WebVideoFullscreenModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1A41C57488900DE34A3 /* WebVideoFullscreenModel.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52D5A1A81C5748A300DE34A3 /* WebVideoFullscreenModelVideoElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1A51C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52D5A1A91C5748A900DE34A3 /* WebVideoFullscreenModelVideoElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1A61C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.mm */; };
+               52D5A1A71C57489D00DE34A3 /* VideoFullscreenModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1A41C57488900DE34A3 /* VideoFullscreenModel.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               52D5A1A81C5748A300DE34A3 /* VideoFullscreenModelVideoElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1A51C57488900DE34A3 /* VideoFullscreenModelVideoElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               52D5A1A91C5748A900DE34A3 /* VideoFullscreenModelVideoElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1A61C57488900DE34A3 /* VideoFullscreenModelVideoElement.mm */; };
                52E2CAFC19FF0207001EEB4F /* MediaProducer.h in Headers */ = {isa = PBXBuildFile; fileRef = 52E2CAFB19FF0207001EEB4F /* MediaProducer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                52F10865162B6DA4009AC81E /* MixedContentChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52F10862162B6D82009AC81E /* MixedContentChecker.cpp */; };
                52F10866162B6DA8009AC81E /* MixedContentChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F10863162B6D82009AC81E /* MixedContentChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDA07FBE18E0A16A004699FA /* SystemSleepListener.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDA07FC118E0A22B004699FA /* SystemSleepListenerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */; };
                CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */; };
-               CDA29A091CBD99F400901CCF /* WebPlaybackSessionInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A081CBD99F400901CCF /* WebPlaybackSessionInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CDA29A0B1CBD9A7400901CCF /* WebPlaybackSessionModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A0A1CBD9A7400901CCF /* WebPlaybackSessionModel.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CDA29A0E1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A0C1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.mm */; };
-               CDA29A0F1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A0D1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CDA29A161CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A141CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.mm */; };
-               CDA29A171CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A151CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CDA29A301CBF74D400901CCF /* WebPlaybackSessionInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A2F1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.mm */; };
+               CDA29A091CBD99F400901CCF /* PlaybackSessionInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A081CBD99F400901CCF /* PlaybackSessionInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CDA29A0B1CBD9A7400901CCF /* PlaybackSessionModel.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A0A1CBD9A7400901CCF /* PlaybackSessionModel.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CDA29A0E1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A0C1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.mm */; };
+               CDA29A0F1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A0D1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A141CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm */; };
+               CDA29A171CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A151CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A2F1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.mm */; };
                CDA29A311CBF74DA00901CCF /* WebAVPlayerController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A2D1CBF73FC00901CCF /* WebAVPlayerController.mm */; };
-               CDA29A321CC01A9500901CCF /* WebPlaybackSessionInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A2E1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               CDA29A321CC01A9500901CCF /* PlaybackSessionInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A2E1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDA79824170A258300D45C55 /* AudioSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA79823170A258300D45C55 /* AudioSession.cpp */; };
                CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA79825170A279000D45C55 /* AudioSessionIOS.mm */; };
                CDA7982A170A3D0000D45C55 /* AudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA79821170A22DC00D45C55 /* AudioSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 /* WebVideoFullscreenInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenInterfaceAVKit.mm; sourceTree = "<group>"; };
-               3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenInterfaceAVKit.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>"; };
                3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSViewportRule.cpp; sourceTree = "<group>"; };
                3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSViewportRule.h; sourceTree = "<group>"; };
                3FFFF9AB159D9B060020BBD5 /* ViewportStyleResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportStyleResolver.cpp; sourceTree = "<group>"; };
                51FB5503113E3E9100821176 /* JSCloseEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCloseEvent.cpp; sourceTree = "<group>"; };
                51FB67D91AE6B5E400D06C5A /* ContentExtensionStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentExtensionStyleSheet.cpp; sourceTree = "<group>"; };
                51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentExtensionStyleSheet.h; sourceTree = "<group>"; };
-               52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenInterfaceMac.mm; sourceTree = "<group>"; };
+               52131E5A1C4F15610033F802 /* VideoFullscreenInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenInterfaceMac.mm; sourceTree = "<group>"; };
                526724F11CB2FDF60075974D /* TextTrackRepresentationCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextTrackRepresentationCocoa.mm; sourceTree = "<group>"; };
                526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationCocoa.h; sourceTree = "<group>"; };
                52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformView.h; sourceTree = "<group>"; };
-               52B0D4BF1C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenChangeObserver.h; sourceTree = "<group>"; };
-               52B0D4C11C57FF910077CE53 /* WebVideoFullscreenInterfaceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenInterfaceMac.h; sourceTree = "<group>"; };
+               52B0D4BF1C57FD660077CE53 /* VideoFullscreenChangeObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenChangeObserver.h; sourceTree = "<group>"; };
+               52B0D4C11C57FF910077CE53 /* VideoFullscreenInterfaceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenInterfaceMac.h; sourceTree = "<group>"; };
                52B6C9BD15E3F4DF00690B05 /* DOMNamedFlowCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMNamedFlowCollection.cpp; sourceTree = "<group>"; };
                52B6C9BE15E3F4DF00690B05 /* DOMNamedFlowCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMNamedFlowCollection.h; sourceTree = "<group>"; };
                52B6C9BF15E3F4DF00690B05 /* DOMNamedFlowCollection.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMNamedFlowCollection.idl; sourceTree = "<group>"; };
                52CCA9E115E3F62C0053C77F /* JSDOMNamedFlowCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMNamedFlowCollection.h; sourceTree = "<group>"; };
                52D5A18D1C54590300DE34A3 /* VideoFullscreenLayerManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenLayerManager.mm; sourceTree = "<group>"; };
                52D5A18E1C54590300DE34A3 /* VideoFullscreenLayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenLayerManager.h; sourceTree = "<group>"; };
-               52D5A1A41C57488900DE34A3 /* WebVideoFullscreenModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenModel.h; sourceTree = "<group>"; };
-               52D5A1A51C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenModelVideoElement.h; sourceTree = "<group>"; };
-               52D5A1A61C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenModelVideoElement.mm; sourceTree = "<group>"; };
+               52D5A1A41C57488900DE34A3 /* VideoFullscreenModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenModel.h; sourceTree = "<group>"; };
+               52D5A1A51C57488900DE34A3 /* VideoFullscreenModelVideoElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenModelVideoElement.h; sourceTree = "<group>"; };
+               52D5A1A61C57488900DE34A3 /* VideoFullscreenModelVideoElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenModelVideoElement.mm; sourceTree = "<group>"; };
                52E2CAFB19FF0207001EEB4F /* MediaProducer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaProducer.h; sourceTree = "<group>"; };
                52F10862162B6D82009AC81E /* MixedContentChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MixedContentChecker.cpp; sourceTree = "<group>"; };
                52F10863162B6D82009AC81E /* MixedContentChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MixedContentChecker.h; sourceTree = "<group>"; };
                CDA07FBC18E0A16A004699FA /* SystemSleepListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemSleepListener.h; sourceTree = "<group>"; };
                CDA07FBF18E0A22B004699FA /* SystemSleepListenerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemSleepListenerMac.mm; sourceTree = "<group>"; };
                CDA07FC018E0A22B004699FA /* SystemSleepListenerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemSleepListenerMac.h; sourceTree = "<group>"; };
-               CDA29A081CBD99F400901CCF /* WebPlaybackSessionInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionInterface.h; sourceTree = "<group>"; };
-               CDA29A0A1CBD9A7400901CCF /* WebPlaybackSessionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionModel.h; sourceTree = "<group>"; };
-               CDA29A0C1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlaybackSessionModelMediaElement.mm; sourceTree = "<group>"; };
-               CDA29A0D1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionModelMediaElement.h; sourceTree = "<group>"; };
-               CDA29A141CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlaybackSessionInterfaceMac.mm; sourceTree = "<group>"; };
-               CDA29A151CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionInterfaceMac.h; sourceTree = "<group>"; };
+               CDA29A081CBD99F400901CCF /* PlaybackSessionInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionInterface.h; sourceTree = "<group>"; };
+               CDA29A0A1CBD9A7400901CCF /* PlaybackSessionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionModel.h; sourceTree = "<group>"; };
+               CDA29A0C1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionModelMediaElement.mm; sourceTree = "<group>"; };
+               CDA29A0D1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionModelMediaElement.h; sourceTree = "<group>"; };
+               CDA29A141CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionInterfaceMac.mm; sourceTree = "<group>"; };
+               CDA29A151CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionInterfaceMac.h; sourceTree = "<group>"; };
                CDA29A2C1CBF73FC00901CCF /* WebAVPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAVPlayerController.h; sourceTree = "<group>"; };
                CDA29A2D1CBF73FC00901CCF /* WebAVPlayerController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebAVPlayerController.mm; sourceTree = "<group>"; };
-               CDA29A2E1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionInterfaceAVKit.h; sourceTree = "<group>"; };
-               CDA29A2F1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlaybackSessionInterfaceAVKit.mm; sourceTree = "<group>"; };
+               CDA29A2E1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionInterfaceAVKit.h; sourceTree = "<group>"; };
+               CDA29A2F1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionInterfaceAVKit.mm; sourceTree = "<group>"; };
                CDA79821170A22DC00D45C55 /* AudioSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AudioSession.h; sourceTree = "<group>"; };
                CDA79823170A258300D45C55 /* AudioSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioSession.cpp; sourceTree = "<group>"; };
                CDA79825170A279000D45C55 /* AudioSessionIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudioSessionIOS.mm; sourceTree = "<group>"; };
                                E1A3162C134BC32D007C9A4F /* WebNSAttributedStringExtras.mm */,
                                CD5896E01CD2B15100B3BCC8 /* WebPlaybackControlsManager.h */,
                                CD5896DF1CD2B15100B3BCC8 /* WebPlaybackControlsManager.mm */,
-                               CDA29A151CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.h */,
-                               CDA29A141CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.mm */,
+                               CDA29A151CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h */,
+                               CDA29A141CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm */,
                                CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */,
                                CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */,
                                CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */,
                                CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */,
-                               52B0D4C11C57FF910077CE53 /* WebVideoFullscreenInterfaceMac.h */,
-                               52131E5A1C4F15610033F802 /* WebVideoFullscreenInterfaceMac.mm */,
+                               52B0D4C11C57FF910077CE53 /* VideoFullscreenInterfaceMac.h */,
+                               52131E5A1C4F15610033F802 /* VideoFullscreenInterfaceMac.mm */,
                                CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */,
                                CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */,
                                9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
                                FE0D84EA1048436E001A179E /* WebEvent.mm */,
                                F482230F1E3869B80066FC79 /* WebItemProviderPasteboard.h */,
                                F482230E1E3869B80066FC79 /* WebItemProviderPasteboard.mm */,
-                               CDA29A2E1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.h */,
-                               CDA29A2F1CBF73FC00901CCF /* WebPlaybackSessionInterfaceAVKit.mm */,
+                               CDA29A2E1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.h */,
+                               CDA29A2F1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.mm */,
                                1F8756B11E22BEEF0042C40D /* WebSQLiteDatabaseTrackerClient.h */,
                                1F8756B01E22BEEF0042C40D /* WebSQLiteDatabaseTrackerClient.mm */,
                                3F42B31B1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h */,
                                3F42B31C1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm */,
-                               3FBC4AF2189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h */,
-                               3FBC4AF1189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm */,
+                               3FBC4AF2189881560046EE38 /* VideoFullscreenInterfaceAVKit.h */,
+                               3FBC4AF1189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm */,
                                E453903C0EAFD637003695C8 /* WidgetIOS.mm */,
                        );
                        path = ios;
                                CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
                                CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
                                5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */,
-                               CDA29A081CBD99F400901CCF /* WebPlaybackSessionInterface.h */,
-                               CDA29A0A1CBD9A7400901CCF /* WebPlaybackSessionModel.h */,
-                               CDA29A0D1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.h */,
-                               CDA29A0C1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.mm */,
-                               52B0D4BF1C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h */,
-                               52D5A1A41C57488900DE34A3 /* WebVideoFullscreenModel.h */,
-                               52D5A1A51C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.h */,
-                               52D5A1A61C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.mm */,
+                               CDA29A081CBD99F400901CCF /* PlaybackSessionInterface.h */,
+                               CDA29A0A1CBD9A7400901CCF /* PlaybackSessionModel.h */,
+                               CDA29A0D1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.h */,
+                               CDA29A0C1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.mm */,
+                               52B0D4BF1C57FD660077CE53 /* VideoFullscreenChangeObserver.h */,
+                               52D5A1A41C57488900DE34A3 /* VideoFullscreenModel.h */,
+                               52D5A1A51C57488900DE34A3 /* VideoFullscreenModelVideoElement.h */,
+                               52D5A1A61C57488900DE34A3 /* VideoFullscreenModelVideoElement.mm */,
                        );
                        path = cocoa;
                        sourceTree = "<group>";
                                0709D7931AE5557E004E42F8 /* WebMediaSessionManagerMac.h in Headers */,
                                E1A3162D134BC32D007C9A4F /* WebNSAttributedStringExtras.h in Headers */,
                                CD5896E21CD2B15100B3BCC8 /* WebPlaybackControlsManager.h in Headers */,
-                               CDA29A091CBD99F400901CCF /* WebPlaybackSessionInterface.h in Headers */,
-                               CDA29A321CC01A9500901CCF /* WebPlaybackSessionInterfaceAVKit.h in Headers */,
-                               CDA29A171CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.h in Headers */,
-                               CDA29A0B1CBD9A7400901CCF /* WebPlaybackSessionModel.h in Headers */,
-                               CDA29A0F1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.h in Headers */,
+                               CDA29A091CBD99F400901CCF /* PlaybackSessionInterface.h in Headers */,
+                               CDA29A321CC01A9500901CCF /* PlaybackSessionInterfaceAVKit.h in Headers */,
+                               CDA29A171CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h in Headers */,
+                               CDA29A0B1CBD9A7400901CCF /* PlaybackSessionModel.h in Headers */,
+                               CDA29A0F1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.h in Headers */,
                                1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */,
                                1CAF34830A6C405200ABE06E /* WebScriptObjectPrivate.h in Headers */,
                                1A569D1B0D7E2B82007C3983 /* WebScriptObjectProtocol.h in Headers */,
                                1F8756B21E22C3350042C40D /* WebSQLiteDatabaseTrackerClient.h in Headers */,
                                31DEA4561B39F4D900F77178 /* WebSystemBackdropLayer.h in Headers */,
                                0F580FA31496939100FB5BD8 /* WebTiledBackingLayer.h in Headers */,
-                               52B0D4C01C57FD660077CE53 /* WebVideoFullscreenChangeObserver.h in Headers */,
+                               52B0D4C01C57FD660077CE53 /* VideoFullscreenChangeObserver.h in Headers */,
                                CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */,
                                3F42B31D1881191B00278AAC /* WebVideoFullscreenControllerAVKit.h in Headers */,
                                CD82030C1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h in Headers */,
-                               3FBC4AF4189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.h in Headers */,
-                               52B0D4C21C57FF910077CE53 /* WebVideoFullscreenInterfaceMac.h in Headers */,
-                               52D5A1A71C57489D00DE34A3 /* WebVideoFullscreenModel.h in Headers */,
-                               52D5A1A81C5748A300DE34A3 /* WebVideoFullscreenModelVideoElement.h in Headers */,
+                               3FBC4AF4189881560046EE38 /* VideoFullscreenInterfaceAVKit.h in Headers */,
+                               52B0D4C21C57FF910077CE53 /* VideoFullscreenInterfaceMac.h in Headers */,
+                               52D5A1A71C57489D00DE34A3 /* VideoFullscreenModel.h in Headers */,
+                               52D5A1A81C5748A300DE34A3 /* VideoFullscreenModelVideoElement.h in Headers */,
                                F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */,
                                5D21A80313ECE5DF00BB7064 /* WebVTTParser.h in Headers */,
                                B10B6980140C174000BC1C26 /* WebVTTToken.h in Headers */,
                                0709D7921AE5557E004E42F8 /* WebMediaSessionManagerMac.cpp in Sources */,
                                E1A3162E134BC32D007C9A4F /* WebNSAttributedStringExtras.mm in Sources */,
                                CD5896E11CD2B15100B3BCC8 /* WebPlaybackControlsManager.mm in Sources */,
-                               CDA29A301CBF74D400901CCF /* WebPlaybackSessionInterfaceAVKit.mm in Sources */,
-                               CDA29A161CBDA56C00901CCF /* WebPlaybackSessionInterfaceMac.mm in Sources */,
-                               CDA29A0E1CBD9CFE00901CCF /* WebPlaybackSessionModelMediaElement.mm in Sources */,
+                               CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
+                               CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
+                               CDA29A0E1CBD9CFE00901CCF /* PlaybackSessionModelMediaElement.mm in Sources */,
                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
                                97AABD1A14FA09D5007457AE /* WebSocket.cpp in Sources */,
                                97AABD1D14FA09D5007457AE /* WebSocketChannel.cpp in Sources */,
                                CD82030B1395AB6A00F956C6 /* WebVideoFullscreenController.mm in Sources */,
                                3F42B31E1881191B00278AAC /* WebVideoFullscreenControllerAVKit.mm in Sources */,
                                CD82030D1395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm in Sources */,
-                               3FBC4AF3189881560046EE38 /* WebVideoFullscreenInterfaceAVKit.mm in Sources */,
-                               52131E5B1C4F15760033F802 /* WebVideoFullscreenInterfaceMac.mm in Sources */,
-                               52D5A1A91C5748A900DE34A3 /* WebVideoFullscreenModelVideoElement.mm in Sources */,
+                               3FBC4AF3189881560046EE38 /* VideoFullscreenInterfaceAVKit.mm in Sources */,
+                               52131E5B1C4F15760033F802 /* VideoFullscreenInterfaceMac.mm in Sources */,
+                               52D5A1A91C5748A900DE34A3 /* VideoFullscreenModelVideoElement.mm in Sources */,
                                F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */,
                                5D21A80213ECE5DF00BB7064 /* WebVTTParser.cpp in Sources */,
                                B10B6981140C174000BC1C26 /* WebVTTTokenizer.cpp in Sources */,
index c56c7aa..16e6c3a 100644 (file)
 
 #if PLATFORM(IOS)
 #include "RuntimeApplicationChecks.h"
-#include "WebVideoFullscreenInterfaceAVKit.h"
+#include "VideoFullscreenInterfaceAVKit.h"
 #endif
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
 #endif
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#include "WebVideoFullscreenModel.h"
+#include "VideoFullscreenModel.h"
 #endif
 
 #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(document().page() && document().page()->isAlwaysOnLoggingAllowed(), Media, "%p - HTMLMediaElement::" fmt, this, ##__VA_ARGS__)
index ea149e8..d6aefdf 100644 (file)
@@ -46,7 +46,7 @@
 #include "TextStream.h"
 
 #if ENABLE(VIDEO_PRESENTATION_MODE)
-#include "WebVideoFullscreenModel.h"
+#include "VideoFullscreenModel.h"
 #endif
 
 namespace WebCore {
@@ -37,9 +37,9 @@ namespace WebCore {
 
 class TimeRanges;
 
-class WebPlaybackSessionInterface {
+class PlaybackSessionInterface {
 public:
-    virtual ~WebPlaybackSessionInterface() { };
+    virtual ~PlaybackSessionInterface() { };
     virtual void resetMediaState() = 0;
 };
 
 namespace WebCore {
 
 class TimeRanges;
-class WebPlaybackSessionModelClient;
+class PlaybackSessionModelClient;
 struct MediaSelectionOption;
 
-class WebPlaybackSessionModel {
+class PlaybackSessionModel {
 public:
-    virtual ~WebPlaybackSessionModel() { };
-    virtual void addClient(WebPlaybackSessionModelClient&) = 0;
-    virtual void removeClient(WebPlaybackSessionModelClient&) = 0;
+    virtual ~PlaybackSessionModel() { };
+    virtual void addClient(PlaybackSessionModelClient&) = 0;
+    virtual void removeClient(PlaybackSessionModelClient&) = 0;
 
     virtual void play() = 0;
     virtual void pause() = 0;
@@ -83,9 +83,9 @@ public:
     virtual bool isMuted() const = 0;
 };
 
-class WebPlaybackSessionModelClient {
+class PlaybackSessionModelClient {
 public:
-    virtual ~WebPlaybackSessionModelClient() { };
+    virtual ~PlaybackSessionModelClient() { };
     virtual void durationChanged(double) { }
     virtual void currentTimeChanged(double /* currentTime */, double /* anchorTime */) { }
     virtual void bufferedTimeChanged(double) { }
@@ -97,7 +97,7 @@ public:
     virtual void legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& /* options */, uint64_t /* selectedIndex */) { }
     virtual void audioMediaSelectionIndexChanged(uint64_t) { }
     virtual void legibleMediaSelectionIndexChanged(uint64_t) { }
-    virtual void externalPlaybackChanged(bool /* enabled */, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& /* localizedDeviceName */) { }
+    virtual void externalPlaybackChanged(bool /* enabled */, PlaybackSessionModel::ExternalPlaybackTargetType, const String& /* localizedDeviceName */) { }
     virtual void wirelessVideoPlaybackDisabledChanged(bool) { }
     virtual void mutedChanged(bool) { }
 };
@@ -29,7 +29,7 @@
 
 #include "EventListener.h"
 #include "HTMLMediaElementEnums.h"
-#include "WebPlaybackSessionModel.h"
+#include "PlaybackSessionModel.h"
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
@@ -39,15 +39,15 @@ namespace WebCore {
 class AudioTrack;
 class HTMLMediaElement;
 class TextTrack;
-class WebPlaybackSessionInterface;
+class PlaybackSessionInterface;
 
-class WebPlaybackSessionModelMediaElement final : public WebPlaybackSessionModel, public EventListener {
+class PlaybackSessionModelMediaElement final : public PlaybackSessionModel, public EventListener {
 public:
-    static Ref<WebPlaybackSessionModelMediaElement> create()
+    static Ref<PlaybackSessionModelMediaElement> create()
     {
-        return adoptRef(*new WebPlaybackSessionModelMediaElement());
+        return adoptRef(*new PlaybackSessionModelMediaElement());
     }
-    WEBCORE_EXPORT virtual ~WebPlaybackSessionModelMediaElement();
+    WEBCORE_EXPORT virtual ~PlaybackSessionModelMediaElement();
     WEBCORE_EXPORT void setMediaElement(HTMLMediaElement*);
     HTMLMediaElement* mediaElement() const { return m_mediaElement.get(); }
 
@@ -55,8 +55,8 @@ public:
     void updateForEventName(const WTF::AtomicString&);
     bool operator==(const EventListener& rhs) const final { return static_cast<const WebCore::EventListener*>(this) == &rhs; }
 
-    WEBCORE_EXPORT void addClient(WebPlaybackSessionModelClient&);
-    WEBCORE_EXPORT void removeClient(WebPlaybackSessionModelClient&);
+    WEBCORE_EXPORT void addClient(PlaybackSessionModelClient&);
+    WEBCORE_EXPORT void removeClient(PlaybackSessionModelClient&);
     WEBCORE_EXPORT void play() final;
     WEBCORE_EXPORT void pause() final;
     WEBCORE_EXPORT void togglePlayState() final;
@@ -94,7 +94,7 @@ public:
     bool isMuted() const final;
 
 protected:
-    WEBCORE_EXPORT WebPlaybackSessionModelMediaElement();
+    WEBCORE_EXPORT PlaybackSessionModelMediaElement();
 
 private:
     void progressEventTimerFired();
@@ -103,7 +103,7 @@ private:
 
     RefPtr<HTMLMediaElement> m_mediaElement;
     bool m_isListening { false };
-    HashSet<WebPlaybackSessionModelClient*> m_clients;
+    HashSet<PlaybackSessionModelClient*> m_clients;
     Vector<RefPtr<TextTrack>> m_legibleTracksForMenu;
     Vector<RefPtr<AudioTrack>> m_audioTracksForMenu;
 
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WebPlaybackSessionModelMediaElement.h"
+#import "PlaybackSessionModelMediaElement.h"
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
 
 
 namespace WebCore {
 
-WebPlaybackSessionModelMediaElement::WebPlaybackSessionModelMediaElement()
+PlaybackSessionModelMediaElement::PlaybackSessionModelMediaElement()
     : EventListener(EventListener::CPPEventListenerType)
 {
 }
 
-WebPlaybackSessionModelMediaElement::~WebPlaybackSessionModelMediaElement()
+PlaybackSessionModelMediaElement::~PlaybackSessionModelMediaElement()
 {
 }
 
-void WebPlaybackSessionModelMediaElement::setMediaElement(HTMLMediaElement* mediaElement)
+void PlaybackSessionModelMediaElement::setMediaElement(HTMLMediaElement* mediaElement)
 {
     if (m_mediaElement == mediaElement)
         return;
@@ -85,12 +85,12 @@ void WebPlaybackSessionModelMediaElement::setMediaElement(HTMLMediaElement* medi
     updateForEventName(eventNameAll());
 }
 
-void WebPlaybackSessionModelMediaElement::handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event& event)
+void PlaybackSessionModelMediaElement::handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event& event)
 {
     updateForEventName(event.type());
 }
 
-void WebPlaybackSessionModelMediaElement::updateForEventName(const WTF::AtomicString& eventName)
+void PlaybackSessionModelMediaElement::updateForEventName(const WTF::AtomicString& eventName)
 {
     if (m_clients.isEmpty())
         return;
@@ -176,79 +176,79 @@ void WebPlaybackSessionModelMediaElement::updateForEventName(const WTF::AtomicSt
             client->mutedChanged(isMuted());
     }
 }
-void WebPlaybackSessionModelMediaElement::addClient(WebPlaybackSessionModelClient& client)
+void PlaybackSessionModelMediaElement::addClient(PlaybackSessionModelClient& client)
 {
     ASSERT(!m_clients.contains(&client));
     m_clients.add(&client);
 }
 
-void WebPlaybackSessionModelMediaElement::removeClient(WebPlaybackSessionModelClient& client)
+void PlaybackSessionModelMediaElement::removeClient(PlaybackSessionModelClient& client)
 {
     ASSERT(m_clients.contains(&client));
     m_clients.remove(&client);
 }
 
-void WebPlaybackSessionModelMediaElement::play()
+void PlaybackSessionModelMediaElement::play()
 {
     if (m_mediaElement)
         m_mediaElement->play();
 }
 
-void WebPlaybackSessionModelMediaElement::pause()
+void PlaybackSessionModelMediaElement::pause()
 {
     if (m_mediaElement)
         m_mediaElement->pause();
 }
 
-void WebPlaybackSessionModelMediaElement::togglePlayState()
+void PlaybackSessionModelMediaElement::togglePlayState()
 {
     if (m_mediaElement)
         m_mediaElement->togglePlayState();
 }
 
-void WebPlaybackSessionModelMediaElement::beginScrubbing()
+void PlaybackSessionModelMediaElement::beginScrubbing()
 {
     if (m_mediaElement)
         m_mediaElement->beginScrubbing();
 }
 
-void WebPlaybackSessionModelMediaElement::endScrubbing()
+void PlaybackSessionModelMediaElement::endScrubbing()
 {
     if (m_mediaElement)
         m_mediaElement->endScrubbing();
 }
 
-void WebPlaybackSessionModelMediaElement::seekToTime(double time)
+void PlaybackSessionModelMediaElement::seekToTime(double time)
 {
     if (m_mediaElement)
         m_mediaElement->setCurrentTime(time);
 }
 
-void WebPlaybackSessionModelMediaElement::fastSeek(double time)
+void PlaybackSessionModelMediaElement::fastSeek(double time)
 {
     if (m_mediaElement)
         m_mediaElement->fastSeek(time);
 }
 
-void WebPlaybackSessionModelMediaElement::beginScanningForward()
+void PlaybackSessionModelMediaElement::beginScanningForward()
 {
     if (m_mediaElement)
         m_mediaElement->beginScanning(MediaControllerInterface::Forward);
 }
 
-void WebPlaybackSessionModelMediaElement::beginScanningBackward()
+void PlaybackSessionModelMediaElement::beginScanningBackward()
 {
     if (m_mediaElement)
         m_mediaElement->beginScanning(MediaControllerInterface::Backward);
 }
 
-void WebPlaybackSessionModelMediaElement::endScanning()
+void PlaybackSessionModelMediaElement::endScanning()
 {
     if (m_mediaElement)
         m_mediaElement->endScanning();
 }
 
-void WebPlaybackSessionModelMediaElement::selectAudioMediaOption(uint64_t selectedAudioIndex)
+void PlaybackSessionModelMediaElement::selectAudioMediaOption(uint64_t selectedAudioIndex)
 {
     if (!m_mediaElement)
         return;
@@ -257,7 +257,7 @@ void WebPlaybackSessionModelMediaElement::selectAudioMediaOption(uint64_t select
         m_audioTracksForMenu[i]->setEnabled(i == selectedAudioIndex);
 }
 
-void WebPlaybackSessionModelMediaElement::selectLegibleMediaOption(uint64_t index)
+void PlaybackSessionModelMediaElement::selectLegibleMediaOption(uint64_t index)
 {
     if (!m_mediaElement)
         return;
@@ -271,7 +271,7 @@ void WebPlaybackSessionModelMediaElement::selectLegibleMediaOption(uint64_t inde
     m_mediaElement->setSelectedTextTrack(textTrack);
 }
 
-void WebPlaybackSessionModelMediaElement::togglePictureInPicture()
+void PlaybackSessionModelMediaElement::togglePictureInPicture()
 {
     if (m_mediaElement->fullscreenMode() == MediaPlayerEnums::VideoFullscreenModePictureInPicture)
         m_mediaElement->exitFullscreen();
@@ -279,18 +279,18 @@ void WebPlaybackSessionModelMediaElement::togglePictureInPicture()
         m_mediaElement->enterFullscreen(MediaPlayerEnums::VideoFullscreenModePictureInPicture);
 }
 
-void WebPlaybackSessionModelMediaElement::toggleMuted()
+void PlaybackSessionModelMediaElement::toggleMuted()
 {
     setMuted(!isMuted());
 }
 
-void WebPlaybackSessionModelMediaElement::setMuted(bool muted)
+void PlaybackSessionModelMediaElement::setMuted(bool muted)
 {
     if (m_mediaElement)
         m_mediaElement->setMuted(muted);
 }
 
-void WebPlaybackSessionModelMediaElement::updateMediaSelectionOptions()
+void PlaybackSessionModelMediaElement::updateMediaSelectionOptions()
 {
     if (!m_mediaElement)
         return;
@@ -322,7 +322,7 @@ void WebPlaybackSessionModelMediaElement::updateMediaSelectionOptions()
     }
 }
 
-void WebPlaybackSessionModelMediaElement::updateMediaSelectionIndices()
+void PlaybackSessionModelMediaElement::updateMediaSelectionIndices()
 {
     auto audioIndex = audioMediaSelectedIndex();
     auto legibleIndex = legibleMediaSelectedIndex();
@@ -333,7 +333,7 @@ void WebPlaybackSessionModelMediaElement::updateMediaSelectionIndices()
     }
 }
 
-double WebPlaybackSessionModelMediaElement::playbackStartedTime() const
+double PlaybackSessionModelMediaElement::playbackStartedTime() const
 {
     if (!m_mediaElement)
         return 0;
@@ -341,7 +341,7 @@ double WebPlaybackSessionModelMediaElement::playbackStartedTime() const
     return m_mediaElement->playbackStartedTime();
 }
 
-const Vector<AtomicString>& WebPlaybackSessionModelMediaElement::observedEventNames()
+const Vector<AtomicString>& PlaybackSessionModelMediaElement::observedEventNames()
 {
     // FIXME(157452): Remove the right-hand constructor notation once NeverDestroyed supports initializer_lists.
     static NeverDestroyed<Vector<AtomicString>> names = Vector<AtomicString>({
@@ -359,60 +359,60 @@ const Vector<AtomicString>& WebPlaybackSessionModelMediaElement::observedEventNa
     return names.get();
 }
 
-const AtomicString&  WebPlaybackSessionModelMediaElement::eventNameAll()
+const AtomicString&  PlaybackSessionModelMediaElement::eventNameAll()
 {
     static NeverDestroyed<AtomicString> eventNameAll("allEvents", AtomicString::ConstructFromLiteral);
     return eventNameAll;
 }
 
-double WebPlaybackSessionModelMediaElement::duration() const
+double PlaybackSessionModelMediaElement::duration() const
 {
     if (!m_mediaElement)
         return 0;
     return m_mediaElement->supportsSeeking() ? m_mediaElement->duration() : std::numeric_limits<double>::quiet_NaN();
 }
 
-double WebPlaybackSessionModelMediaElement::currentTime() const
+double PlaybackSessionModelMediaElement::currentTime() const
 {
     return m_mediaElement ? m_mediaElement->currentTime() : 0;
 }
 
-double WebPlaybackSessionModelMediaElement::bufferedTime() const
+double PlaybackSessionModelMediaElement::bufferedTime() const
 {
     return m_mediaElement ? m_mediaElement->maxBufferedTime() : 0;
 }
 
-bool WebPlaybackSessionModelMediaElement::isPlaying() const
+bool PlaybackSessionModelMediaElement::isPlaying() const
 {
     return m_mediaElement ? !m_mediaElement->paused() : false;
 }
 
-float WebPlaybackSessionModelMediaElement::playbackRate() const
+float PlaybackSessionModelMediaElement::playbackRate() const
 {
     return m_mediaElement ? m_mediaElement->playbackRate() : 0;
 }
 
-Ref<TimeRanges> WebPlaybackSessionModelMediaElement::seekableRanges() const
+Ref<TimeRanges> PlaybackSessionModelMediaElement::seekableRanges() const
 {
     return m_mediaElement ? m_mediaElement->seekable() : TimeRanges::create();
 }
 
-double WebPlaybackSessionModelMediaElement::seekableTimeRangesLastModifiedTime() const
+double PlaybackSessionModelMediaElement::seekableTimeRangesLastModifiedTime() const
 {
     return m_mediaElement ? m_mediaElement->seekableTimeRangesLastModifiedTime() : 0;
 }
 
-double WebPlaybackSessionModelMediaElement::liveUpdateInterval() const
+double PlaybackSessionModelMediaElement::liveUpdateInterval() const
 {
     return m_mediaElement ? m_mediaElement->liveUpdateInterval() : 0;
 }
     
-bool WebPlaybackSessionModelMediaElement::canPlayFastReverse() const
+bool PlaybackSessionModelMediaElement::canPlayFastReverse() const
 {
     return m_mediaElement ? m_mediaElement->minFastReverseRate() < 0.0 : false;
 }
 
-Vector<MediaSelectionOption> WebPlaybackSessionModelMediaElement::audioMediaSelectionOptions() const
+Vector<MediaSelectionOption> PlaybackSessionModelMediaElement::audioMediaSelectionOptions() const
 {
     Vector<MediaSelectionOption> audioOptions;
 
@@ -428,7 +428,7 @@ Vector<MediaSelectionOption> WebPlaybackSessionModelMediaElement::audioMediaSele
     return audioOptions;
 }
 
-uint64_t WebPlaybackSessionModelMediaElement::audioMediaSelectedIndex() const
+uint64_t PlaybackSessionModelMediaElement::audioMediaSelectedIndex() const
 {
     for (size_t index = 0; index < m_audioTracksForMenu.size(); ++index) {
         if (m_audioTracksForMenu[index]->enabled())
@@ -437,7 +437,7 @@ uint64_t WebPlaybackSessionModelMediaElement::audioMediaSelectedIndex() const
     return std::numeric_limits<uint64_t>::max();
 }
 
-Vector<MediaSelectionOption> WebPlaybackSessionModelMediaElement::legibleMediaSelectionOptions() const
+Vector<MediaSelectionOption> PlaybackSessionModelMediaElement::legibleMediaSelectionOptions() const
 {
     Vector<MediaSelectionOption> legibleOptions;
 
@@ -452,7 +452,7 @@ Vector<MediaSelectionOption> WebPlaybackSessionModelMediaElement::legibleMediaSe
     return legibleOptions;
 }
 
-uint64_t WebPlaybackSessionModelMediaElement::legibleMediaSelectedIndex() const
+uint64_t PlaybackSessionModelMediaElement::legibleMediaSelectedIndex() const
 {
     uint64_t selectedIndex = std::numeric_limits<uint64_t>::max();
     uint64_t offIndex = 0;
@@ -489,12 +489,12 @@ uint64_t WebPlaybackSessionModelMediaElement::legibleMediaSelectedIndex() const
     return selectedIndex;
 }
 
-bool WebPlaybackSessionModelMediaElement::externalPlaybackEnabled() const
+bool PlaybackSessionModelMediaElement::externalPlaybackEnabled() const
 {
     return m_mediaElement && m_mediaElement->webkitCurrentPlaybackTargetIsWireless();
 }
 
-WebPlaybackSessionModel::ExternalPlaybackTargetType WebPlaybackSessionModelMediaElement::externalPlaybackTargetType() const
+PlaybackSessionModel::ExternalPlaybackTargetType PlaybackSessionModelMediaElement::externalPlaybackTargetType() const
 {
     if (!m_mediaElement || !m_mediaElement->mediaControlsHost())
         return TargetTypeNone;
@@ -512,19 +512,19 @@ WebPlaybackSessionModel::ExternalPlaybackTargetType WebPlaybackSessionModelMedia
     }
 }
 
-String WebPlaybackSessionModelMediaElement::externalPlaybackLocalizedDeviceName() const
+String PlaybackSessionModelMediaElement::externalPlaybackLocalizedDeviceName() const
 {
     if (m_mediaElement && m_mediaElement->mediaControlsHost())
         return m_mediaElement->mediaControlsHost()->externalDeviceDisplayName();
     return emptyString();
 }
 
-bool WebPlaybackSessionModelMediaElement::wirelessVideoPlaybackDisabled() const
+bool PlaybackSessionModelMediaElement::wirelessVideoPlaybackDisabled() const
 {
     return m_mediaElement && m_mediaElement->mediaSession().wirelessVideoPlaybackDisabled(*m_mediaElement);
 }
 
-bool WebPlaybackSessionModelMediaElement::isMuted() const
+bool PlaybackSessionModelMediaElement::isMuted() const
 {
     return m_mediaElement ? m_mediaElement->muted() : false;
 }
@@ -30,9 +30,9 @@
 
 namespace WebCore {
 
-class WebVideoFullscreenChangeObserver {
+class VideoFullscreenChangeObserver {
 public:
-    virtual ~WebVideoFullscreenChangeObserver() { };
+    virtual ~VideoFullscreenChangeObserver() { };
     virtual void didSetupFullscreen() = 0;
     virtual void didEnterFullscreen() = 0;
     virtual void didExitFullscreen() = 0;
 
 #include "FloatRect.h"
 #include "HTMLMediaElementEnums.h"
-#include "WebPlaybackSessionModel.h"
+#include "PlaybackSessionModel.h"
 
 namespace WebCore {
 
-class WebVideoFullscreenModelClient;
+class VideoFullscreenModelClient;
 
-class WebVideoFullscreenModel {
+class VideoFullscreenModel {
 public:
-    virtual ~WebVideoFullscreenModel() { };
-    virtual void addClient(WebVideoFullscreenModelClient&) = 0;
-    virtual void removeClient(WebVideoFullscreenModelClient&)= 0;
+    virtual ~VideoFullscreenModel() { };
+    virtual void addClient(VideoFullscreenModelClient&) = 0;
+    virtual void removeClient(VideoFullscreenModelClient&)= 0;
 
     virtual void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) = 0;
     virtual void setVideoLayerFrame(FloatRect) = 0;
@@ -53,9 +53,9 @@ public:
     virtual bool hasVideo() const = 0;
 };
 
-class WebVideoFullscreenModelClient {
+class VideoFullscreenModelClient {
 public:
-    virtual ~WebVideoFullscreenModelClient() { }
+    virtual ~VideoFullscreenModelClient() { }
     virtual void hasVideoChanged(bool) = 0;
     virtual void videoDimensionsChanged(const FloatSize&) = 0;
 };
@@ -32,7 +32,7 @@
 #include "FloatRect.h"
 #include "HTMLMediaElementEnums.h"
 #include "PlatformLayer.h"
-#include "WebVideoFullscreenModel.h"
+#include "VideoFullscreenModel.h"
 #include <wtf/Function.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
@@ -43,15 +43,15 @@ namespace WebCore {
 class AudioTrack;
 class HTMLVideoElement;
 class TextTrack;
-class WebPlaybackSessionModelMediaElement;
+class PlaybackSessionModelMediaElement;
 
-class WebVideoFullscreenModelVideoElement : public WebVideoFullscreenModel, public EventListener {
+class VideoFullscreenModelVideoElement : public VideoFullscreenModel, public EventListener {
 public:
-    static RefPtr<WebVideoFullscreenModelVideoElement> create()
+    static RefPtr<VideoFullscreenModelVideoElement> create()
     {
-        return adoptRef(*new WebVideoFullscreenModelVideoElement());
+        return adoptRef(*new VideoFullscreenModelVideoElement());
     }
-    WEBCORE_EXPORT virtual ~WebVideoFullscreenModelVideoElement();
+    WEBCORE_EXPORT virtual ~VideoFullscreenModelVideoElement();
     WEBCORE_EXPORT void setVideoElement(HTMLVideoElement*);
     HTMLVideoElement* videoElement() const { return m_videoElement.get(); }
     WEBCORE_EXPORT void setVideoFullscreenLayer(PlatformLayer*, WTF::Function<void()>&& completionHandler = [] { });
@@ -61,8 +61,8 @@ public:
     void updateForEventName(const WTF::AtomicString&);
     bool operator==(const EventListener& rhs) const override { return static_cast<const WebCore::EventListener*>(this) == &rhs; }
 
-    WEBCORE_EXPORT void addClient(WebVideoFullscreenModelClient&) override;
-    WEBCORE_EXPORT void removeClient(WebVideoFullscreenModelClient&) override;
+    WEBCORE_EXPORT void addClient(VideoFullscreenModelClient&) override;
+    WEBCORE_EXPORT void removeClient(VideoFullscreenModelClient&) override;
     WEBCORE_EXPORT void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
     WEBCORE_EXPORT void setVideoLayerFrame(FloatRect) override;
     WEBCORE_EXPORT void setVideoLayerGravity(VideoGravity) override;
@@ -73,7 +73,7 @@ public:
 
 
 protected:
-    WEBCORE_EXPORT WebVideoFullscreenModelVideoElement();
+    WEBCORE_EXPORT VideoFullscreenModelVideoElement();
 
 private:
     void setHasVideo(bool);
@@ -85,7 +85,7 @@ private:
     RefPtr<HTMLVideoElement> m_videoElement;
     RetainPtr<PlatformLayer> m_videoFullscreenLayer;
     bool m_isListening { false };
-    HashSet<WebVideoFullscreenModelClient*> m_clients;
+    HashSet<VideoFullscreenModelClient*> m_clients;
     bool m_hasVideo { false };
     FloatSize m_videoDimensions;
     FloatRect m_videoFrame;
 #import "config.h"
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#import "WebVideoFullscreenModelVideoElement.h"
+#import "VideoFullscreenModelVideoElement.h"
 
 #import "DOMWindow.h"
 #import "History.h"
 #import "Logging.h"
 #import "MediaControlsHost.h"
-#import "WebPlaybackSessionModelMediaElement.h"
+#import "PlaybackSessionModelMediaElement.h"
 #import <QuartzCore/CoreAnimation.h>
 #import <WebCore/Event.h>
 #import <WebCore/EventListener.h>
 
 using namespace WebCore;
 
-WebVideoFullscreenModelVideoElement::WebVideoFullscreenModelVideoElement()
+VideoFullscreenModelVideoElement::VideoFullscreenModelVideoElement()
     : EventListener(EventListener::CPPEventListenerType)
 {
 }
 
-WebVideoFullscreenModelVideoElement::~WebVideoFullscreenModelVideoElement()
+VideoFullscreenModelVideoElement::~VideoFullscreenModelVideoElement()
 {
 }
 
-void WebVideoFullscreenModelVideoElement::setVideoElement(HTMLVideoElement* videoElement)
+void VideoFullscreenModelVideoElement::setVideoElement(HTMLVideoElement* videoElement)
 {
     if (m_videoElement == videoElement)
         return;
@@ -81,12 +81,12 @@ void WebVideoFullscreenModelVideoElement::setVideoElement(HTMLVideoElement* vide
     updateForEventName(eventNameAll());
 }
 
-void WebVideoFullscreenModelVideoElement::handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event& event)
+void VideoFullscreenModelVideoElement::handleEvent(WebCore::ScriptExecutionContext&, WebCore::Event& event)
 {
     updateForEventName(event.type());
 }
 
-void WebVideoFullscreenModelVideoElement::updateForEventName(const WTF::AtomicString& eventName)
+void VideoFullscreenModelVideoElement::updateForEventName(const WTF::AtomicString& eventName)
 {
     if (m_clients.isEmpty())
         return;
@@ -100,7 +100,7 @@ void WebVideoFullscreenModelVideoElement::updateForEventName(const WTF::AtomicSt
     }
 }
 
-void WebVideoFullscreenModelVideoElement::setVideoFullscreenLayer(PlatformLayer* videoLayer, WTF::Function<void()>&& completionHandler)
+void VideoFullscreenModelVideoElement::setVideoFullscreenLayer(PlatformLayer* videoLayer, WTF::Function<void()>&& completionHandler)
 {
     if (m_videoFullscreenLayer == videoLayer) {
         completionHandler();
@@ -123,7 +123,7 @@ void WebVideoFullscreenModelVideoElement::setVideoFullscreenLayer(PlatformLayer*
     m_videoElement->setVideoFullscreenLayer(m_videoFullscreenLayer.get(), WTFMove(completionHandler));
 }
 
-void WebVideoFullscreenModelVideoElement::waitForPreparedForInlineThen(WTF::Function<void()>&& completionHandler)
+void VideoFullscreenModelVideoElement::waitForPreparedForInlineThen(WTF::Function<void()>&& completionHandler)
 {
     if (!m_videoElement) {
         completionHandler();
@@ -133,7 +133,7 @@ void WebVideoFullscreenModelVideoElement::waitForPreparedForInlineThen(WTF::Func
     m_videoElement->waitForPreparedForInlineThen(WTFMove(completionHandler));
 }
 
-void WebVideoFullscreenModelVideoElement::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
+void VideoFullscreenModelVideoElement::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
 {
     if (m_videoElement && m_videoElement->fullscreenMode() != mode)
         m_videoElement->setFullscreenMode(mode);
@@ -148,7 +148,7 @@ void WebVideoFullscreenModelVideoElement::requestFullscreenMode(HTMLMediaElement
     }
 }
 
-void WebVideoFullscreenModelVideoElement::setVideoLayerFrame(FloatRect rect)
+void VideoFullscreenModelVideoElement::setVideoLayerFrame(FloatRect rect)
 {
     m_videoFrame = rect;
     [m_videoFullscreenLayer setBounds:CGRect(rect)];
@@ -156,14 +156,14 @@ void WebVideoFullscreenModelVideoElement::setVideoLayerFrame(FloatRect rect)
         m_videoElement->setVideoFullscreenFrame(rect);
 }
 
-void WebVideoFullscreenModelVideoElement::setVideoLayerGravity(WebVideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenModelVideoElement::setVideoLayerGravity(VideoFullscreenModel::VideoGravity gravity)
 {
     MediaPlayer::VideoGravity videoGravity = MediaPlayer::VideoGravityResizeAspect;
-    if (gravity == WebVideoFullscreenModel::VideoGravityResize)
+    if (gravity == VideoFullscreenModel::VideoGravityResize)
         videoGravity = MediaPlayer::VideoGravityResize;
-    else if (gravity == WebVideoFullscreenModel::VideoGravityResizeAspect)
+    else if (gravity == VideoFullscreenModel::VideoGravityResizeAspect)
         videoGravity = MediaPlayer::VideoGravityResizeAspect;
-    else if (gravity == WebVideoFullscreenModel::VideoGravityResizeAspectFill)
+    else if (gravity == VideoFullscreenModel::VideoGravityResizeAspectFill)
         videoGravity = MediaPlayer::VideoGravityResizeAspectFill;
     else
         ASSERT_NOT_REACHED();
@@ -171,37 +171,37 @@ void WebVideoFullscreenModelVideoElement::setVideoLayerGravity(WebVideoFullscree
     m_videoElement->setVideoFullscreenGravity(videoGravity);
 }
 
-const Vector<AtomicString>& WebVideoFullscreenModelVideoElement::observedEventNames()
+const Vector<AtomicString>& VideoFullscreenModelVideoElement::observedEventNames()
 {
     static const auto names = makeNeverDestroyed(Vector<AtomicString> { eventNames().resizeEvent });
     return names;
 }
 
-const AtomicString& WebVideoFullscreenModelVideoElement::eventNameAll()
+const AtomicString& VideoFullscreenModelVideoElement::eventNameAll()
 {
     static NeverDestroyed<AtomicString> sEventNameAll = "allEvents";
     return sEventNameAll;
 }
 
-void WebVideoFullscreenModelVideoElement::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
+void VideoFullscreenModelVideoElement::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode)
 {
     if (m_videoElement)
         m_videoElement->fullscreenModeChanged(videoFullscreenMode);
 }
 
-void WebVideoFullscreenModelVideoElement::addClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenModelVideoElement::addClient(VideoFullscreenModelClient& client)
 {
     ASSERT(!m_clients.contains(&client));
     m_clients.add(&client);
 }
 
-void WebVideoFullscreenModelVideoElement::removeClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenModelVideoElement::removeClient(VideoFullscreenModelClient& client)
 {
     ASSERT(m_clients.contains(&client));
     m_clients.remove(&client);
 }
 
-bool WebVideoFullscreenModelVideoElement::isVisible() const
+bool VideoFullscreenModelVideoElement::isVisible() const
 {
     if (!m_videoElement)
         return false;
@@ -212,7 +212,7 @@ bool WebVideoFullscreenModelVideoElement::isVisible() const
     return false;
 }
 
-void WebVideoFullscreenModelVideoElement::setHasVideo(bool hasVideo)
+void VideoFullscreenModelVideoElement::setHasVideo(bool hasVideo)
 {
     if (hasVideo == m_hasVideo)
         return;
@@ -223,7 +223,7 @@ void WebVideoFullscreenModelVideoElement::setHasVideo(bool hasVideo)
         client->hasVideoChanged(m_hasVideo);
 }
 
-void WebVideoFullscreenModelVideoElement::setVideoDimensions(const FloatSize& videoDimensions)
+void VideoFullscreenModelVideoElement::setVideoDimensions(const FloatSize& videoDimensions)
 {
     if (m_videoDimensions == videoDimensions)
         return;
@@ -30,9 +30,9 @@
 
 #include "EventListener.h"
 #include "HTMLMediaElementEnums.h"
+#include "PlaybackSessionInterface.h"
+#include "PlaybackSessionModel.h"
 #include "Timer.h"
-#include "WebPlaybackSessionInterface.h"
-#include "WebPlaybackSessionModel.h"
 #include <functional>
 #include <objc/objc.h>
 #include <wtf/RefCounted.h>
@@ -51,26 +51,26 @@ class String;
 
 namespace WebCore {
 class IntRect;
-class WebPlaybackSessionModel;
+class PlaybackSessionModel;
 class WebPlaybackSessionChangeObserver;
 
-class WEBCORE_EXPORT WebPlaybackSessionInterfaceAVKit
-    : public WebPlaybackSessionInterface
-    , public WebPlaybackSessionModelClient
-    , public RefCounted<WebPlaybackSessionInterfaceAVKit> {
+class WEBCORE_EXPORT PlaybackSessionInterfaceAVKit
+    : public PlaybackSessionInterface
+    , public PlaybackSessionModelClient
+    , public RefCounted<PlaybackSessionInterfaceAVKit> {
 
 public:
-    static Ref<WebPlaybackSessionInterfaceAVKit> create(WebPlaybackSessionModel& model)
+    static Ref<PlaybackSessionInterfaceAVKit> create(PlaybackSessionModel& model)
     {
-        return adoptRef(*new WebPlaybackSessionInterfaceAVKit(model));
+        return adoptRef(*new PlaybackSessionInterfaceAVKit(model));
     }
-    virtual ~WebPlaybackSessionInterfaceAVKit();
-    WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionModel; }
+    virtual ~PlaybackSessionInterfaceAVKit();
+    PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionModel; }
 
-    // WebPlaybackSessionInterface
+    // PlaybackSessionInterface
     WEBCORE_EXPORT void resetMediaState() override;
 
-    // WebPlaybackSessionModelClient
+    // PlaybackSessionModelClient
     WEBCORE_EXPORT void durationChanged(double) override;
     WEBCORE_EXPORT void currentTimeChanged(double currentTime, double anchorTime) override;
     WEBCORE_EXPORT void bufferedTimeChanged(double) override;
@@ -79,7 +79,7 @@ public:
     WEBCORE_EXPORT void canPlayFastReverseChanged(bool) override;
     WEBCORE_EXPORT void audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) override;
     WEBCORE_EXPORT void legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) override;
-    WEBCORE_EXPORT void externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
+    WEBCORE_EXPORT void externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
     WEBCORE_EXPORT void wirelessVideoPlaybackDisabledChanged(bool) override;
     WEBCORE_EXPORT void mutedChanged(bool) override;
 
@@ -88,10 +88,10 @@ public:
     WebAVPlayerController *playerController() const { return m_playerController.get(); }
 
 protected:
-    WEBCORE_EXPORT WebPlaybackSessionInterfaceAVKit(WebPlaybackSessionModel&);
+    WEBCORE_EXPORT PlaybackSessionInterfaceAVKit(PlaybackSessionModel&);
 
     RetainPtr<WebAVPlayerController> m_playerController;
-    WebPlaybackSessionModel* m_playbackSessionModel { nullptr };
+    PlaybackSessionModel* m_playbackSessionModel { nullptr };
 };
 
 }
@@ -25,7 +25,7 @@
 
 
 #import "config.h"
-#import "WebPlaybackSessionInterfaceAVKit.h"
+#import "PlaybackSessionInterfaceAVKit.h"
 
 #if PLATFORM(IOS)
 #if HAVE(AVKIT)
@@ -33,9 +33,9 @@
 #import "AVKitSPI.h"
 #import "Logging.h"
 #import "MediaSelectionOption.h"
+#import "PlaybackSessionModel.h"
 #import "TimeRanges.h"
 #import "WebAVPlayerController.h"
-#import "WebPlaybackSessionModel.h"
 #import <AVFoundation/AVTime.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/CString.h>
@@ -48,7 +48,7 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 namespace WebCore {
 
-WebPlaybackSessionInterfaceAVKit::WebPlaybackSessionInterfaceAVKit(WebPlaybackSessionModel& model)
+PlaybackSessionInterfaceAVKit::PlaybackSessionInterfaceAVKit(PlaybackSessionModel& model)
     : m_playerController(adoptNS([[WebAVPlayerController alloc] init]))
     , m_playbackSessionModel(&model)
 {
@@ -68,7 +68,7 @@ WebPlaybackSessionInterfaceAVKit::WebPlaybackSessionInterfaceAVKit(WebPlaybackSe
     wirelessVideoPlaybackDisabledChanged(model.wirelessVideoPlaybackDisabled());
 }
 
-WebPlaybackSessionInterfaceAVKit::~WebPlaybackSessionInterfaceAVKit()
+PlaybackSessionInterfaceAVKit::~PlaybackSessionInterfaceAVKit()
 {
     [m_playerController setPlaybackSessionInterface:nullptr];
     [m_playerController setExternalPlaybackActive:false];
@@ -76,12 +76,12 @@ WebPlaybackSessionInterfaceAVKit::~WebPlaybackSessionInterfaceAVKit()
     invalidate();
 }
 
-void WebPlaybackSessionInterfaceAVKit::resetMediaState()
+void PlaybackSessionInterfaceAVKit::resetMediaState()
 {
     [m_playerController resetMediaState];
 }
 
-void WebPlaybackSessionInterfaceAVKit::durationChanged(double duration)
+void PlaybackSessionInterfaceAVKit::durationChanged(double duration)
 {
     WebAVPlayerController* playerController = m_playerController.get();
 
@@ -97,7 +97,7 @@ void WebPlaybackSessionInterfaceAVKit::durationChanged(double duration)
     playerController.status = AVPlayerControllerStatusReadyToPlay;
 }
 
-void WebPlaybackSessionInterfaceAVKit::currentTimeChanged(double currentTime, double anchorTime)
+void PlaybackSessionInterfaceAVKit::currentTimeChanged(double currentTime, double anchorTime)
 {
     NSTimeInterval anchorTimeStamp = ![m_playerController rate] ? NAN : anchorTime;
     AVValueTiming *timing = [getAVValueTimingClass() valueTimingWithAnchorValue:currentTime
@@ -106,7 +106,7 @@ void WebPlaybackSessionInterfaceAVKit::currentTimeChanged(double currentTime, do
     [m_playerController setTiming:timing];
 }
 
-void WebPlaybackSessionInterfaceAVKit::bufferedTimeChanged(double bufferedTime)
+void PlaybackSessionInterfaceAVKit::bufferedTimeChanged(double bufferedTime)
 {
     WebAVPlayerController* playerController = m_playerController.get();
     double duration = playerController.contentDuration;
@@ -118,12 +118,12 @@ void WebPlaybackSessionInterfaceAVKit::bufferedTimeChanged(double bufferedTime)
     playerController.loadedTimeRanges = @[@0, @(normalizedBufferedTime)];
 }
 
-void WebPlaybackSessionInterfaceAVKit::rateChanged(bool isPlaying, float playbackRate)
+void PlaybackSessionInterfaceAVKit::rateChanged(bool isPlaying, float playbackRate)
 {
     [m_playerController setRate:isPlaying ? playbackRate : 0.];
 }
 
-void WebPlaybackSessionInterfaceAVKit::seekableRangesChanged(const TimeRanges& timeRanges, double lastModifiedTime, double liveUpdateInterval)
+void PlaybackSessionInterfaceAVKit::seekableRangesChanged(const TimeRanges& timeRanges, double lastModifiedTime, double liveUpdateInterval)
 {
     RetainPtr<NSMutableArray> seekableRanges = adoptNS([[NSMutableArray alloc] init]);
 
@@ -140,7 +140,7 @@ void WebPlaybackSessionInterfaceAVKit::seekableRangesChanged(const TimeRanges& t
     [m_playerController setLiveUpdateInterval:liveUpdateInterval];
 }
 
-void WebPlaybackSessionInterfaceAVKit::canPlayFastReverseChanged(bool canPlayFastReverse)
+void PlaybackSessionInterfaceAVKit::canPlayFastReverseChanged(bool canPlayFastReverse)
 {
     [m_playerController setCanScanBackward:canPlayFastReverse];
 }
@@ -156,7 +156,7 @@ static RetainPtr<NSMutableArray> mediaSelectionOptions(const Vector<MediaSelecti
     return webOptions;
 }
 
-void WebPlaybackSessionInterfaceAVKit::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void PlaybackSessionInterfaceAVKit::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
     RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
     [m_playerController setAudioMediaSelectionOptions:webOptions.get()];
@@ -164,7 +164,7 @@ void WebPlaybackSessionInterfaceAVKit::audioMediaSelectionOptionsChanged(const V
         [m_playerController setCurrentAudioMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
 }
 
-void WebPlaybackSessionInterfaceAVKit::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void PlaybackSessionInterfaceAVKit::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
     RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
     [m_playerController setLegibleMediaSelectionOptions:webOptions.get()];
@@ -172,12 +172,12 @@ void WebPlaybackSessionInterfaceAVKit::legibleMediaSelectionOptionsChanged(const
         [m_playerController setCurrentLegibleMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
 }
 
-void WebPlaybackSessionInterfaceAVKit::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType targetType, const String& localizedDeviceName)
+void PlaybackSessionInterfaceAVKit::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType targetType, const String& localizedDeviceName)
 {
     AVPlayerControllerExternalPlaybackType externalPlaybackType = AVPlayerControllerExternalPlaybackTypeNone;
-    if (targetType == WebPlaybackSessionModel::TargetTypeAirPlay)
+    if (targetType == PlaybackSessionModel::TargetTypeAirPlay)
         externalPlaybackType = AVPlayerControllerExternalPlaybackTypeAirPlay;
-    else if (targetType == WebPlaybackSessionModel::TargetTypeTVOut)
+    else if (targetType == PlaybackSessionModel::TargetTypeTVOut)
         externalPlaybackType = AVPlayerControllerExternalPlaybackTypeTVOut;
 
     WebAVPlayerController* playerController = m_playerController.get();
@@ -186,17 +186,17 @@ void WebPlaybackSessionInterfaceAVKit::externalPlaybackChanged(bool enabled, Web
     playerController.externalPlaybackActive = enabled;
 }
 
-void WebPlaybackSessionInterfaceAVKit::wirelessVideoPlaybackDisabledChanged(bool disabled)
+void PlaybackSessionInterfaceAVKit::wirelessVideoPlaybackDisabledChanged(bool disabled)
 {
     [m_playerController setAllowsExternalPlayback:!disabled];
 }
 
-void WebPlaybackSessionInterfaceAVKit::mutedChanged(bool muted)
+void PlaybackSessionInterfaceAVKit::mutedChanged(bool muted)
 {
     [m_playerController setMuted:muted];
 }
 
-void WebPlaybackSessionInterfaceAVKit::invalidate()
+void PlaybackSessionInterfaceAVKit::invalidate()
 {
     if (!m_playbackSessionModel)
         return;
@@ -31,8 +31,8 @@
 #include "EventListener.h"
 #include "HTMLMediaElementEnums.h"
 #include "PlatformLayer.h"
-#include "WebPlaybackSessionInterfaceAVKit.h"
-#include "WebVideoFullscreenModel.h"
+#include "PlaybackSessionInterfaceAVKit.h"
+#include "VideoFullscreenModel.h"
 #include <objc/objc.h>
 #include <wtf/Function.h>
 #include <wtf/RefCounted.h>
@@ -57,27 +57,27 @@ class String;
 namespace WebCore {
 class IntRect;
 class FloatSize;
-class WebVideoFullscreenModel;
-class WebVideoFullscreenChangeObserver;
+class VideoFullscreenModel;
+class VideoFullscreenChangeObserver;
     
-class WEBCORE_EXPORT WebVideoFullscreenInterfaceAVKit final
-    : public WebVideoFullscreenModelClient
-    , public WebPlaybackSessionModelClient
-    , public ThreadSafeRefCounted<WebVideoFullscreenInterfaceAVKit> {
+class WEBCORE_EXPORT VideoFullscreenInterfaceAVKit final
+    : public VideoFullscreenModelClient
+    , public PlaybackSessionModelClient
+    , public ThreadSafeRefCounted<VideoFullscreenInterfaceAVKit> {
 
 public:
-    static Ref<WebVideoFullscreenInterfaceAVKit> create(WebPlaybackSessionInterfaceAVKit&);
-    virtual ~WebVideoFullscreenInterfaceAVKit();
-    WEBCORE_EXPORT void setWebVideoFullscreenModel(WebVideoFullscreenModel*);
-    WEBCORE_EXPORT void setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver*);
-    WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionInterface->webPlaybackSessionModel(); }
+    static Ref<VideoFullscreenInterfaceAVKit> create(PlaybackSessionInterfaceAVKit&);
+    virtual ~VideoFullscreenInterfaceAVKit();
+    WEBCORE_EXPORT void setVideoFullscreenModel(VideoFullscreenModel*);
+    WEBCORE_EXPORT void setVideoFullscreenChangeObserver(VideoFullscreenChangeObserver*);
+    PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionInterface->playbackSessionModel(); }
 
-    // WebVideoFullscreenModelClient
+    // VideoFullscreenModelClient
     WEBCORE_EXPORT void hasVideoChanged(bool) final;
     WEBCORE_EXPORT void videoDimensionsChanged(const FloatSize&) final;
 
-    // WebPlaybackSessionModelClient
-    WEBCORE_EXPORT void externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) final;
+    // PlaybackSessionModelClient
+    WEBCORE_EXPORT void externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) final;
 
     WEBCORE_EXPORT virtual void setupFullscreen(UIView&, const IntRect& initialRect, UIView *, HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicturePlayback);
     WEBCORE_EXPORT virtual void enterFullscreen();
@@ -95,7 +95,7 @@ public:
         PictureInPictureStarted
     };
 
-    WebVideoFullscreenModel* model() const { return m_videoFullscreenModel; }
+    VideoFullscreenModel* model() const { return m_videoFullscreenModel; }
     bool shouldExitFullscreenWithReason(ExitFullScreenReason);
     HTMLMediaElementEnums::VideoFullscreenMode mode() const { return m_mode; }
     bool allowsPictureInPicturePlayback() const { return m_allowsPictureInPicturePlayback; }
@@ -117,18 +117,18 @@ public:
     bool isMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const { return m_mode == mode; }
 
 protected:
-    WEBCORE_EXPORT WebVideoFullscreenInterfaceAVKit(WebPlaybackSessionInterfaceAVKit&);
+    WEBCORE_EXPORT VideoFullscreenInterfaceAVKit(PlaybackSessionInterfaceAVKit&);
     void beginSession();
     void enterPictureInPicture();
     void enterFullscreenStandard();
     void watchdogTimerFired();
     WebAVPlayerController *playerController() const;
 
-    Ref<WebPlaybackSessionInterfaceAVKit> m_playbackSessionInterface;
+    Ref<PlaybackSessionInterfaceAVKit> m_playbackSessionInterface;
     RetainPtr<WebAVPlayerViewControllerDelegate> m_playerViewControllerDelegate;
     RetainPtr<AVPlayerViewController> m_playerViewController;
-    WebVideoFullscreenModel* m_videoFullscreenModel { nullptr };
-    WebVideoFullscreenChangeObserver* m_fullscreenChangeObserver { nullptr };
+    VideoFullscreenModel* m_videoFullscreenModel { nullptr };
+    VideoFullscreenChangeObserver* m_fullscreenChangeObserver { nullptr };
 
     // These are only used when fullscreen is presented in a separate window.
     RetainPtr<UIWindow> m_window;
@@ -138,7 +138,7 @@ protected:
     RetainPtr<WebAVPlayerLayerView> m_playerLayerView;
     HTMLMediaElementEnums::VideoFullscreenMode m_mode { HTMLMediaElementEnums::VideoFullscreenModeNone };
     WTF::Function<void(bool)> m_prepareToInlineCallback;
-    RunLoop::Timer<WebVideoFullscreenInterfaceAVKit> m_watchdogTimer;
+    RunLoop::Timer<VideoFullscreenInterfaceAVKit> m_watchdogTimer;
     bool m_allowsPictureInPicturePlayback { false };
     bool m_exitRequested { false };
     bool m_exitCompleted { false };
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #import "config.h"
 
 #if PLATFORM(IOS)
-
-#import "WebVideoFullscreenInterfaceAVKit.h"
+#import "VideoFullscreenInterfaceAVKit.h"
 
 #if HAVE(AVKIT)
 
 #import "AVKitSPI.h"
 #import "GeometryUtilities.h"
 #import "Logging.h"
+#import "PlaybackSessionInterfaceAVKit.h"
 #import "RuntimeApplicationChecks.h"
 #import "TimeRanges.h"
+#import "VideoFullscreenChangeObserver.h"
+#import "VideoFullscreenModel.h"
 #import "WebAVPlayerController.h"
 #import "WebCoreSystemInterface.h"
-#import "WebPlaybackSessionInterfaceAVKit.h"
-#import "WebVideoFullscreenChangeObserver.h"
-#import "WebVideoFullscreenModel.h"
+#import <AVFoundation/AVTime.h>
 #import <UIKit/UIKit.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
@@ -91,19 +90,19 @@ static const Seconds defaultWatchdogTimerInterval { 1_s };
 @class WebAVMediaSelectionOption;
 
 @interface WebAVPlayerViewControllerDelegate : NSObject <AVPlayerViewControllerDelegate_WebKitOnly> {
-    RefPtr<WebVideoFullscreenInterfaceAVKit> _fullscreenInterface;
+    RefPtr<VideoFullscreenInterfaceAVKit> _fullscreenInterface;
 }
-@property (assign) WebVideoFullscreenInterfaceAVKit* fullscreenInterface;
+@property (assign) VideoFullscreenInterfaceAVKit* fullscreenInterface;
 - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
 @end
 
 @implementation WebAVPlayerViewControllerDelegate
-- (WebVideoFullscreenInterfaceAVKit*)fullscreenInterface
+- (VideoFullscreenInterfaceAVKit*)fullscreenInterface
 {
     return _fullscreenInterface.get();
 }
 
-- (void)setFullscreenInterface:(WebVideoFullscreenInterfaceAVKit*)fullscreenInterface
+- (void)setFullscreenInterface:(VideoFullscreenInterfaceAVKit*)fullscreenInterface
 {
     _fullscreenInterface = fullscreenInterface;
 }
@@ -139,19 +138,19 @@ static const Seconds defaultWatchdogTimerInterval { 1_s };
     self.fullscreenInterface->didStopPictureInPicture();
 }
 
-static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullScreenReason(AVPlayerViewControllerExitFullScreenReason reason)
+static VideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullScreenReason(AVPlayerViewControllerExitFullScreenReason reason)
 {
     switch (reason) {
     case AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped:
-        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::DoneButtonTapped;
+        return VideoFullscreenInterfaceAVKit::ExitFullScreenReason::DoneButtonTapped;
     case AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped:
-        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::FullScreenButtonTapped;
+        return VideoFullscreenInterfaceAVKit::ExitFullScreenReason::FullScreenButtonTapped;
     case AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted:
-        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PictureInPictureStarted;
+        return VideoFullscreenInterfaceAVKit::ExitFullScreenReason::PictureInPictureStarted;
     case AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled:
-        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PinchGestureHandled;
+        return VideoFullscreenInterfaceAVKit::ExitFullScreenReason::PinchGestureHandled;
     case AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived:
-        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::RemoteControlStopEventReceived;
+        return VideoFullscreenInterfaceAVKit::ExitFullScreenReason::RemoteControlStopEventReceived;
     }
 }
 
@@ -171,7 +170,7 @@ static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullS
 @interface WebAVPlayerLayer : CALayer
 @property (nonatomic, retain) NSString *videoGravity;
 @property (nonatomic, getter=isReadyForDisplay) BOOL readyForDisplay;
-@property (nonatomic, assign) WebVideoFullscreenInterfaceAVKit* fullscreenInterface;
+@property (nonatomic, assign) VideoFullscreenInterfaceAVKit* fullscreenInterface;
 @property (nonatomic, retain) AVPlayerController *playerController;
 @property (nonatomic, retain) CALayer *videoSublayer;
 @property (nonatomic, copy, nullable) NSDictionary *pixelBufferAttributes;
@@ -180,7 +179,7 @@ static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullS
 @end
 
 @implementation WebAVPlayerLayer {
-    RefPtr<WebVideoFullscreenInterfaceAVKit> _fullscreenInterface;
+    RefPtr<VideoFullscreenInterfaceAVKit> _fullscreenInterface;
     RetainPtr<WebAVPlayerController> _avPlayerController;
     RetainPtr<CALayer> _videoSublayer;
     RetainPtr<NSString> _videoGravity;
@@ -203,12 +202,12 @@ static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullS
     [super dealloc];
 }
 
-- (WebVideoFullscreenInterfaceAVKit*)fullscreenInterface
+- (VideoFullscreenInterfaceAVKit*)fullscreenInterface
 {
     return _fullscreenInterface.get();
 }
 
-- (void)setFullscreenInterface:(WebVideoFullscreenInterfaceAVKit*)fullscreenInterface
+- (void)setFullscreenInterface:(VideoFullscreenInterfaceAVKit*)fullscreenInterface
 {
     _fullscreenInterface = fullscreenInterface;
 }
@@ -311,13 +310,13 @@ static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullS
     if (![_avPlayerController delegate])
         return;
 
-    WebCore::WebVideoFullscreenModel::VideoGravity gravity = WebCore::WebVideoFullscreenModel::VideoGravityResizeAspect;
+    WebCore::VideoFullscreenModel::VideoGravity gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspect;
     if (videoGravity == getAVLayerVideoGravityResize())
-        gravity = WebCore::WebVideoFullscreenModel::VideoGravityResize;
+        gravity = WebCore::VideoFullscreenModel::VideoGravityResize;
     if (videoGravity == getAVLayerVideoGravityResizeAspect())
-        gravity = WebCore::WebVideoFullscreenModel::VideoGravityResizeAspect;
+        gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspect;
     else if (videoGravity == getAVLayerVideoGravityResizeAspectFill())
-        gravity = WebCore::WebVideoFullscreenModel::VideoGravityResizeAspectFill;
+        gravity = WebCore::VideoFullscreenModel::VideoGravityResizeAspectFill;
     else
         ASSERT_NOT_REACHED();
     
@@ -490,35 +489,35 @@ static WebAVPlayerLayerView *allocWebAVPlayerLayerViewInstance()
     return (WebAVPlayerLayerView *)[theClass alloc];
 }
 
-Ref<WebVideoFullscreenInterfaceAVKit> WebVideoFullscreenInterfaceAVKit::create(WebPlaybackSessionInterfaceAVKit& playbackSessionInterface)
+Ref<VideoFullscreenInterfaceAVKit> VideoFullscreenInterfaceAVKit::create(PlaybackSessionInterfaceAVKit& playbackSessionInterface)
 {
-    Ref<WebVideoFullscreenInterfaceAVKit> interface = adoptRef(*new WebVideoFullscreenInterfaceAVKit(playbackSessionInterface));
+    Ref<VideoFullscreenInterfaceAVKit> interface = adoptRef(*new VideoFullscreenInterfaceAVKit(playbackSessionInterface));
     [interface->m_playerViewControllerDelegate setFullscreenInterface:interface.ptr()];
     return interface;
 }
 
-WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit(WebPlaybackSessionInterfaceAVKit& playbackSessionInterface)
+VideoFullscreenInterfaceAVKit::VideoFullscreenInterfaceAVKit(PlaybackSessionInterfaceAVKit& playbackSessionInterface)
     : m_playbackSessionInterface(playbackSessionInterface)
     , m_playerViewControllerDelegate(adoptNS([[WebAVPlayerViewControllerDelegate alloc] init]))
-    , m_watchdogTimer(RunLoop::main(), this, &WebVideoFullscreenInterfaceAVKit::watchdogTimerFired)
+    , m_watchdogTimer(RunLoop::main(), this, &VideoFullscreenInterfaceAVKit::watchdogTimerFired)
 {
 }
 
-WebVideoFullscreenInterfaceAVKit::~WebVideoFullscreenInterfaceAVKit()
+VideoFullscreenInterfaceAVKit::~VideoFullscreenInterfaceAVKit()
 {
     WebAVPlayerController* playerController = this->playerController();
     if (playerController && playerController.externalPlaybackActive)
-        externalPlaybackChanged(false, WebPlaybackSessionModel::TargetTypeNone, "");
+        externalPlaybackChanged(false, PlaybackSessionModel::TargetTypeNone, "");
     if (m_videoFullscreenModel)
         m_videoFullscreenModel->removeClient(*this);
 }
 
-WebAVPlayerController *WebVideoFullscreenInterfaceAVKit::playerController() const
+WebAVPlayerController *VideoFullscreenInterfaceAVKit::playerController() const
 {
     return m_playbackSessionInterface->playerController();
 }
 
-void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel(WebVideoFullscreenModel* model)
+void VideoFullscreenInterfaceAVKit::setVideoFullscreenModel(VideoFullscreenModel* model)
 {
     if (m_videoFullscreenModel)
         m_videoFullscreenModel->removeClient(*this);
@@ -532,18 +531,18 @@ void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel(WebVideoFullsc
     videoDimensionsChanged(m_videoFullscreenModel ? m_videoFullscreenModel->videoDimensions() : FloatSize());
 }
 
-void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver* observer)
+void VideoFullscreenInterfaceAVKit::setVideoFullscreenChangeObserver(VideoFullscreenChangeObserver* observer)
 {
     m_fullscreenChangeObserver = observer;
 }
 
-void WebVideoFullscreenInterfaceAVKit::hasVideoChanged(bool hasVideo)
+void VideoFullscreenInterfaceAVKit::hasVideoChanged(bool hasVideo)
 {
     [playerController() setHasEnabledVideo:hasVideo];
     [playerController() setHasVideo:hasVideo];
 }
 
-void WebVideoFullscreenInterfaceAVKit::videoDimensionsChanged(const FloatSize& videoDimensions)
+void VideoFullscreenInterfaceAVKit::videoDimensionsChanged(const FloatSize& videoDimensions)
 {
     WebAVPlayerLayer *playerLayer = (WebAVPlayerLayer *)[m_playerLayerView playerLayer];
 
@@ -557,14 +556,14 @@ void WebVideoFullscreenInterfaceAVKit::videoDimensionsChanged(const FloatSize& v
     [pipView setNeedsLayout];
 }
 
-void WebVideoFullscreenInterfaceAVKit::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String&)
+void VideoFullscreenInterfaceAVKit::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String&)
 {
     [m_playerLayerView setHidden:enabled];
 }
 
-void WebVideoFullscreenInterfaceAVKit::applicationDidBecomeActive()
+void VideoFullscreenInterfaceAVKit::applicationDidBecomeActive()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::applicationDidBecomeActive(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::applicationDidBecomeActive(%p)", this);
     if (m_shouldReturnToFullscreenAfterEnteringForeground && m_videoFullscreenModel && m_videoFullscreenModel->isVisible()) {
         [m_playerViewController stopPictureInPicture];
         return;
@@ -573,7 +572,7 @@ void WebVideoFullscreenInterfaceAVKit::applicationDidBecomeActive()
     // If we are both in PiP and in Fullscreen (i.e., via auto-PiP), and we did not stop fullscreen upon returning, it must be
     // because the originating view is not visible, so hide the fullscreen window.
     if (isMode(HTMLMediaElementEnums::VideoFullscreenModeStandard | HTMLMediaElementEnums::VideoFullscreenModePictureInPicture)) {
-        RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+        RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
         [m_playerViewController exitFullScreenAnimated:NO completionHandler:[protectedThis, this] (BOOL, NSError*) {
             [m_window setHidden:YES];
             [[m_playerViewController view] setHidden:YES];
@@ -589,10 +588,10 @@ void WebVideoFullscreenInterfaceAVKit::applicationDidBecomeActive()
 @property (nonatomic, assign, setter=_setIgnoreAppSupportedOrientations:) BOOL _ignoreAppSupportedOrientations;
 @end
 
-void WebVideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback)
+void VideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const WebCore::IntRect& initialRect, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback)
 {
     ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::setupFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::setupFullscreen(%p)", this);
 
     m_allowsPictureInPicturePlayback = allowsPictureInPicturePlayback;
 
@@ -658,16 +657,16 @@ void WebVideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const
 
     [CATransaction commit];
 
-    RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+    RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), [protectedThis, this] {
         if (m_fullscreenChangeObserver)
             m_fullscreenChangeObserver->didSetupFullscreen();
     });
 }
 
-void WebVideoFullscreenInterfaceAVKit::enterFullscreen()
+void VideoFullscreenInterfaceAVKit::enterFullscreen()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterFullscreen(%p)", this);
 
     m_exitCompleted = false;
     m_exitRequested = false;
@@ -681,9 +680,9 @@ void WebVideoFullscreenInterfaceAVKit::enterFullscreen()
         ASSERT_NOT_REACHED();
 }
 
-void WebVideoFullscreenInterfaceAVKit::enterPictureInPicture()
+void VideoFullscreenInterfaceAVKit::enterPictureInPicture()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterPictureInPicture(%p)", this);
     
     if ([m_playerViewController isPictureInPicturePossible])
         [m_playerViewController startPictureInPicture];
@@ -691,10 +690,10 @@ void WebVideoFullscreenInterfaceAVKit::enterPictureInPicture()
         failedToStartPictureInPicture();
 }
 
-void WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard()
+void VideoFullscreenInterfaceAVKit::enterFullscreenStandard()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard(%p)", this);
-    RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterFullscreenStandard(%p)", this);
+    RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
 
     if ([m_playerViewController isPictureInPictureActive]) {
         // NOTE: The fullscreen mode will be restored in prepareForPictureInPictureStopWithCompletionHandler().
@@ -705,7 +704,7 @@ void WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard()
 
     [m_playerViewController enterFullScreenAnimated:YES completionHandler:[this, protectedThis] (BOOL succeeded, NSError*) {
         UNUSED_PARAM(succeeded);
-        LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard - lambda(%p) - succeeded(%s)", this, boolString(succeeded));
+        LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterFullscreenStandard - lambda(%p) - succeeded(%s)", this, boolString(succeeded));
         [m_playerViewController setShowsPlaybackControls:YES];
 
         if (m_fullscreenChangeObserver)
@@ -713,7 +712,7 @@ void WebVideoFullscreenInterfaceAVKit::enterFullscreenStandard()
     }];
 }
 
-void WebVideoFullscreenInterfaceAVKit::exitFullscreen(const WebCore::IntRect& finalRect)
+void VideoFullscreenInterfaceAVKit::exitFullscreen(const WebCore::IntRect& finalRect)
 {
     m_watchdogTimer.stop();
 
@@ -724,7 +723,7 @@ void WebVideoFullscreenInterfaceAVKit::exitFullscreen(const WebCore::IntRect& fi
         return;
     }
     
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::exitFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::exitFullscreen(%p)", this);
     [m_playerViewController setShowsPlaybackControls:NO];
     
     [m_playerViewController view].frame = [m_parentView convertRect:finalRect toView:[m_playerViewController view].superview];
@@ -739,14 +738,14 @@ void WebVideoFullscreenInterfaceAVKit::exitFullscreen(const WebCore::IntRect& fi
         [m_window setHidden:NO];
         [m_playerViewController stopPictureInPicture];
     } else if (isMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture | HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
-        RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+        RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
         [m_playerViewController exitFullScreenAnimated:NO completionHandler:[protectedThis, this] (BOOL, NSError*) {
             clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
             [m_window setHidden:NO];
             [m_playerViewController stopPictureInPicture];
         }];
     } else if (isMode(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
-        RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+        RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
         [m_playerViewController exitFullScreenAnimated:YES completionHandler:[protectedThis, this] (BOOL, NSError*) {
             m_exitCompleted = true;
 
@@ -772,9 +771,9 @@ void WebVideoFullscreenInterfaceAVKit::exitFullscreen(const WebCore::IntRect& fi
 - (UIInterfaceOrientation)interfaceOrientation;
 @end
 
-void WebVideoFullscreenInterfaceAVKit::cleanupFullscreen()
+void VideoFullscreenInterfaceAVKit::cleanupFullscreen()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::cleanupFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::cleanupFullscreen(%p)", this);
     if (m_window) {
         [m_window setHidden:YES];
         [m_window setRootViewController:nil];
@@ -809,7 +808,7 @@ void WebVideoFullscreenInterfaceAVKit::cleanupFullscreen()
     m_enterRequested = false;
 }
 
-void WebVideoFullscreenInterfaceAVKit::invalidate()
+void VideoFullscreenInterfaceAVKit::invalidate()
 {
     m_videoFullscreenModel = nil;
     m_fullscreenChangeObserver = nil;
@@ -817,7 +816,7 @@ void WebVideoFullscreenInterfaceAVKit::invalidate()
     cleanupFullscreen();
 }
 
-void WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
+void VideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
 {
     if (!m_enterRequested)
         return;
@@ -825,20 +824,20 @@ void WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
     if (hasMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture))
         return;
     
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen(%p)", this);
 
     [m_window setHidden:YES];
     [[m_playerViewController view] setHidden:YES];
 
-    if (webPlaybackSessionModel() && m_videoFullscreenModel && !m_exitRequested) {
-        webPlaybackSessionModel()->pause();
+    if (playbackSessionModel() && m_videoFullscreenModel && !m_exitRequested) {
+        playbackSessionModel()->pause();
         m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
     }
 }
 
-void WebVideoFullscreenInterfaceAVKit::preparedToReturnToInline(bool visible, const IntRect& inlineRect)
+void VideoFullscreenInterfaceAVKit::preparedToReturnToInline(bool visible, const IntRect& inlineRect)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::preparedToReturnToInline(%p) - visible(%s)", this, boolString(visible));
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::preparedToReturnToInline(%p) - visible(%s)", this, boolString(visible));
     if (m_prepareToInlineCallback) {
         
         [m_playerViewController view].frame = [m_parentView convertRect:inlineRect toView:[m_playerViewController view].superview];
@@ -848,33 +847,33 @@ void WebVideoFullscreenInterfaceAVKit::preparedToReturnToInline(bool visible, co
     }
 }
 
-bool WebVideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoPictureInPicture() const
+bool VideoFullscreenInterfaceAVKit::mayAutomaticallyShowVideoPictureInPicture() const
 {
     return [playerController() isPlaying] && m_mode == HTMLMediaElementEnums::VideoFullscreenModeStandard && supportsPictureInPicture();
 }
 
-void WebVideoFullscreenInterfaceAVKit::fullscreenMayReturnToInline(WTF::Function<void(bool)>&& callback)
+void VideoFullscreenInterfaceAVKit::fullscreenMayReturnToInline(WTF::Function<void(bool)>&& callback)
 {
     m_prepareToInlineCallback = WTFMove(callback);
     if (m_fullscreenChangeObserver)
         m_fullscreenChangeObserver->fullscreenMayReturnToInline();
 }
 
-void WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture()
+void VideoFullscreenInterfaceAVKit::willStartPictureInPicture()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::willStartPictureInPicture(%p)", this);
     setMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
 }
 
-void WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture()
+void VideoFullscreenInterfaceAVKit::didStartPictureInPicture()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::didStartPictureInPicture(%p)", this);
     m_shouldReturnToFullscreenAfterEnteringForeground = [m_playerViewController pictureInPictureWasStartedWhenEnteringBackground];
     [m_playerViewController setShowsPlaybackControls:YES];
 
     if (m_mode & HTMLMediaElementEnums::VideoFullscreenModeStandard) {
         if (![m_playerViewController pictureInPictureWasStartedWhenEnteringBackground]) {
-            RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+            RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
             [m_playerViewController exitFullScreenAnimated:YES completionHandler:[protectedThis, this] (BOOL, NSError*) {
                 [m_window setHidden:YES];
                 [[m_playerViewController view] setHidden:YES];
@@ -889,9 +888,9 @@ void WebVideoFullscreenInterfaceAVKit::didStartPictureInPicture()
         m_fullscreenChangeObserver->didEnterFullscreen();
 }
 
-void WebVideoFullscreenInterfaceAVKit::failedToStartPictureInPicture()
+void VideoFullscreenInterfaceAVKit::failedToStartPictureInPicture()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::failedToStartPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::failedToStartPictureInPicture(%p)", this);
     [m_playerViewController setShowsPlaybackControls:YES];
 
     if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
@@ -906,12 +905,12 @@ void WebVideoFullscreenInterfaceAVKit::failedToStartPictureInPicture()
         m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
 }
 
-void WebVideoFullscreenInterfaceAVKit::willStopPictureInPicture()
+void VideoFullscreenInterfaceAVKit::willStopPictureInPicture()
 {
     m_shouldReturnToFullscreenWhenStoppingPiP = false;
     m_shouldReturnToFullscreenAfterEnteringForeground = false;
 
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStopPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::willStopPictureInPicture(%p)", this);
     if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard) || m_restoringFullscreenForPictureInPictureStop)
         return;
 
@@ -922,9 +921,9 @@ void WebVideoFullscreenInterfaceAVKit::willStopPictureInPicture()
         m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
 }
 
-void WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture()
+void VideoFullscreenInterfaceAVKit::didStopPictureInPicture()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::didStopPictureInPicture(%p)", this);
     if (hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard) || m_restoringFullscreenForPictureInPictureStop) {
         // ASSUMPTION: we are exiting pip because we are entering fullscreen
         clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
@@ -943,9 +942,9 @@ void WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture()
         m_fullscreenChangeObserver->didExitFullscreen();
 }
 
-void WebVideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler(void (^completionHandler)(BOOL restored))
+void VideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler(void (^completionHandler)(BOOL restored))
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler(%p)", this);
     if (m_shouldReturnToFullscreenWhenStoppingPiP || m_shouldReturnToFullscreenAfterEnteringForeground) {
         m_shouldReturnToFullscreenWhenStoppingPiP = false;
         m_shouldReturnToFullscreenAfterEnteringForeground = false;
@@ -964,16 +963,16 @@ void WebVideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithComplet
         return;
     }
 
-    RefPtr<WebVideoFullscreenInterfaceAVKit> protectedThis(this);
+    RefPtr<VideoFullscreenInterfaceAVKit> protectedThis(this);
     RetainPtr<id> strongCompletionHandler = adoptNS([completionHandler copy]);
     fullscreenMayReturnToInline([protectedThis, strongCompletionHandler](bool restored)  {
-        LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler lambda(%p) - restored(%s)", protectedThis.get(), boolString(restored));
+        LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler lambda(%p) - restored(%s)", protectedThis.get(), boolString(restored));
         void (^completionHandler)(BOOL restored) = strongCompletionHandler.get();
         completionHandler(restored);
     });
 }
 
-bool WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason reason)
+bool VideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(VideoFullscreenInterfaceAVKit::ExitFullScreenReason reason)
 {
     if (!m_videoFullscreenModel)
         return true;
@@ -987,8 +986,8 @@ bool WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(WebVideoFu
         return true;
     }
 
-    if (webPlaybackSessionModel() && (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived))
-        webPlaybackSessionModel()->pause();
+    if (playbackSessionModel() && (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived))
+        playbackSessionModel()->pause();
 
     BOOL finished = reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::PinchGestureHandled;
     m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, finished);
@@ -999,15 +998,15 @@ bool WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(WebVideoFu
     return false;
 }
 
-NO_RETURN_DUE_TO_ASSERT void WebVideoFullscreenInterfaceAVKit::watchdogTimerFired()
+NO_RETURN_DUE_TO_ASSERT void VideoFullscreenInterfaceAVKit::watchdogTimerFired()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen response in %gs; forcing fullscreen hidden.", this, defaultWatchdogTimerInterval.value());
+    LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::watchdogTimerFired(%p) - no exit fullscreen response in %gs; forcing fullscreen hidden.", this, defaultWatchdogTimerInterval.value());
     ASSERT_NOT_REACHED();
     [m_window setHidden:YES];
     [[m_playerViewController view] setHidden:YES];
 }
 
-void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode | mode;
     if (m_mode == newMode)
@@ -1018,7 +1017,7 @@ void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFulls
         m_videoFullscreenModel->fullscreenModeChanged(m_mode);
 }
 
-void WebVideoFullscreenInterfaceAVKit::clearMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenInterfaceAVKit::clearMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode & ~mode;
     if (m_mode == newMode)
index e5cff12..1b10fba 100644 (file)
@@ -28,8 +28,8 @@
 #import "AVKitSPI.h"
 
 namespace WebCore {
-class WebPlaybackSessionModel;
-class WebPlaybackSessionInterfaceAVKit;
+class PlaybackSessionModel;
+class PlaybackSessionInterfaceAVKit;
 }
 
 @interface WebAVMediaSelectionOption : NSObject
@@ -44,8 +44,8 @@ class WebPlaybackSessionInterfaceAVKit;
 }
 
 @property (retain) AVPlayerController* playerControllerProxy;
-@property (assign) WebCore::WebPlaybackSessionModel* delegate;
-@property (assign) WebCore::WebPlaybackSessionInterfaceAVKit* playbackSessionInterface;
+@property (assign) WebCore::PlaybackSessionModel* delegate;
+@property (assign) WebCore::PlaybackSessionInterfaceAVKit* playbackSessionInterface;
 
 @property (readonly) BOOL canScanForward;
 @property BOOL canScanBackward;
index 6bfc5ca..850306a 100644 (file)
@@ -31,9 +31,9 @@
 
 #import "AVKitSPI.h"
 #import "Logging.h"
+#import "PlaybackSessionInterfaceAVKit.h"
+#import "PlaybackSessionModel.h"
 #import "TimeRanges.h"
-#import "WebPlaybackSessionInterfaceAVKit.h"
-#import "WebPlaybackSessionModel.h"
 #import <AVFoundation/AVTime.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>
index ebc9a67..2684ddd 100644 (file)
 
 #import "Logging.h"
 #import "MediaSelectionOption.h"
+#import "PlaybackSessionInterfaceAVKit.h"
+#import "PlaybackSessionModelMediaElement.h"
 #import "QuartzCoreSPI.h"
 #import "TimeRanges.h"
-#import "WebPlaybackSessionInterfaceAVKit.h"
-#import "WebPlaybackSessionModelMediaElement.h"
-#import "WebVideoFullscreenChangeObserver.h"
-#import "WebVideoFullscreenInterfaceAVKit.h"
-#import "WebVideoFullscreenModelVideoElement.h"
+#import "VideoFullscreenChangeObserver.h"
+#import "VideoFullscreenInterfaceAVKit.h"
+#import "VideoFullscreenModelVideoElement.h"
 #import <QuartzCore/CoreAnimation.h>
 #import <UIKit/UIView.h>
 #import <WebCore/FrameView.h>
@@ -92,24 +92,24 @@ static IntRect elementRectInWindow(HTMLVideoElement* videoElement)
     return view->convertToContainingWindow(renderer->absoluteBoundingBoxRect());
 }
 
-class WebVideoFullscreenControllerContext;
+class VideoFullscreenControllerContext;
 
 @interface WebVideoFullscreenController (delegate)
--(void)didFinishFullscreen:(WebVideoFullscreenControllerContext*)context;
+-(void)didFinishFullscreen:(VideoFullscreenControllerContext*)context;
 @end
 
-class WebVideoFullscreenControllerContext final
-    : private WebVideoFullscreenModel
-    , private WebVideoFullscreenModelClient
-    , private WebVideoFullscreenChangeObserver
-    , private WebPlaybackSessionModel
-    , private WebPlaybackSessionModelClient
-    , public ThreadSafeRefCounted<WebVideoFullscreenControllerContext> {
+class VideoFullscreenControllerContext final
+    : private VideoFullscreenModel
+    , private VideoFullscreenModelClient
+    , private VideoFullscreenChangeObserver
+    , private PlaybackSessionModel
+    , private PlaybackSessionModelClient
+    , public ThreadSafeRefCounted<VideoFullscreenControllerContext> {
 
 public:
-    static Ref<WebVideoFullscreenControllerContext> create()
+    static Ref<VideoFullscreenControllerContext> create()
     {
-        return adoptRef(*new WebVideoFullscreenControllerContext);
+        return adoptRef(*new VideoFullscreenControllerContext);
     }
 
     void setController(WebVideoFullscreenController* controller) { m_controller = controller; }
@@ -119,22 +119,22 @@ public:
     void invalidate();
 
 private:
-    WebVideoFullscreenControllerContext() { }
+    VideoFullscreenControllerContext() { }
 
-    // WebVideoFullscreenChangeObserver
+    // VideoFullscreenChangeObserver
     void didSetupFullscreen() override;
     void didEnterFullscreen() override { }
     void didExitFullscreen() override;
     void didCleanupFullscreen() override;
     void fullscreenMayReturnToInline() override;
 
-    // WebVideoFullscreenModelClient
+    // VideoFullscreenModelClient
     void hasVideoChanged(bool) override;
     void videoDimensionsChanged(const FloatSize&) override;
 
-    // WebPlaybackSessionModel
-    void addClient(WebPlaybackSessionModelClient&) override;
-    void removeClient(WebPlaybackSessionModelClient&) override;
+    // PlaybackSessionModel
+    void addClient(PlaybackSessionModelClient&) override;
+    void removeClient(PlaybackSessionModelClient&) override;
     void play() override;
     void pause() override;
     void togglePlayState() override;
@@ -170,7 +170,7 @@ private:
     void toggleMuted() override;
     void setMuted(bool) final;
 
-    // WebPlaybackSessionModelClient
+    // PlaybackSessionModelClient
     void durationChanged(double) override;
     void currentTimeChanged(double currentTime, double anchorTime) override;
     void bufferedTimeChanged(double) override;
@@ -179,39 +179,39 @@ private:
     void canPlayFastReverseChanged(bool) override;
     void audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) override;
     void legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex) override;
-    void externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
+    void externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
     void wirelessVideoPlaybackDisabledChanged(bool) override;
     void mutedChanged(bool) override;
 
-    // WebVideoFullscreenModel
-    void addClient(WebVideoFullscreenModelClient&) override;
-    void removeClient(WebVideoFullscreenModelClient&) override;
+    // VideoFullscreenModel
+    void addClient(VideoFullscreenModelClient&) override;
+    void removeClient(VideoFullscreenModelClient&) override;
     void requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
     void setVideoLayerFrame(FloatRect) override;
-    void setVideoLayerGravity(WebVideoFullscreenModel::VideoGravity) override;
+    void setVideoLayerGravity(VideoFullscreenModel::VideoGravity) override;
     void fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode) override;
     bool isVisible() const override;
     bool hasVideo() const override;
     FloatSize videoDimensions() const override;
     bool isMuted() const override;
 
-    HashSet<WebPlaybackSessionModelClient*> m_playbackClients;
-    HashSet<WebVideoFullscreenModelClient*> m_fullscreenClients;
-    RefPtr<WebVideoFullscreenInterfaceAVKit> m_interface;
-    RefPtr<WebVideoFullscreenModelVideoElement> m_fullscreenModel;
-    RefPtr<WebPlaybackSessionModelMediaElement> m_playbackModel;
+    HashSet<PlaybackSessionModelClient*> m_playbackClients;
+    HashSet<VideoFullscreenModelClient*> m_fullscreenClients;
+    RefPtr<VideoFullscreenInterfaceAVKit> m_interface;
+    RefPtr<VideoFullscreenModelVideoElement> m_fullscreenModel;
+    RefPtr<PlaybackSessionModelMediaElement> m_playbackModel;
     RefPtr<HTMLVideoElement> m_videoElement;
     RetainPtr<UIView> m_videoFullscreenView;
     RetainPtr<WebVideoFullscreenController> m_controller;
 };
 
-#pragma mark WebVideoFullscreenChangeObserver
+#pragma mark VideoFullscreenChangeObserver
 
-void WebVideoFullscreenControllerContext::didSetupFullscreen()
+void VideoFullscreenControllerContext::didSetupFullscreen()
 {
     ASSERT(isUIThread());
     RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, videoFullscreenLayer] {
         [videoFullscreenLayer setBackgroundColor:cachedCGColor(WebCore::Color::transparent)];
         m_fullscreenModel->setVideoFullscreenLayer(videoFullscreenLayer.get(), [protectedThis, this] {
@@ -222,10 +222,10 @@ void WebVideoFullscreenControllerContext::didSetupFullscreen()
     });
 }
 
-void WebVideoFullscreenControllerContext::didExitFullscreen()
+void VideoFullscreenControllerContext::didExitFullscreen()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         m_fullscreenModel->setVideoFullscreenLayer(nil, [protectedThis, this] {
             dispatch_async(dispatch_get_main_queue(), [protectedThis, this] {
@@ -235,15 +235,15 @@ void WebVideoFullscreenControllerContext::didExitFullscreen()
     });
 }
 
-void WebVideoFullscreenControllerContext::didCleanupFullscreen()
+void VideoFullscreenControllerContext::didCleanupFullscreen()
 {
     ASSERT(isUIThread());
-    m_interface->setWebVideoFullscreenModel(nullptr);
-    m_interface->setWebVideoFullscreenChangeObserver(nullptr);
+    m_interface->setVideoFullscreenModel(nullptr);
+    m_interface->setVideoFullscreenChangeObserver(nullptr);
     m_interface = nullptr;
     m_videoFullscreenView = nil;
 
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         m_fullscreenModel->setVideoFullscreenLayer(nil);
         m_fullscreenModel->setVideoElement(nullptr);
@@ -256,10 +256,10 @@ void WebVideoFullscreenControllerContext::didCleanupFullscreen()
     });
 }
 
-void WebVideoFullscreenControllerContext::fullscreenMayReturnToInline()
+void VideoFullscreenControllerContext::fullscreenMayReturnToInline()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         IntRect clientRect = elementRectInWindow(m_videoElement.get());
         dispatch_async(dispatch_get_main_queue(), [protectedThis, this, clientRect] {
@@ -268,12 +268,12 @@ void WebVideoFullscreenControllerContext::fullscreenMayReturnToInline()
     });
 }
 
-#pragma mark WebPlaybackSessionModelClient
+#pragma mark PlaybackSessionModelClient
 
-void WebVideoFullscreenControllerContext::durationChanged(double duration)
+void VideoFullscreenControllerContext::durationChanged(double duration)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, duration] {
             protectedThis->durationChanged(duration);
         });
@@ -284,10 +284,10 @@ void WebVideoFullscreenControllerContext::durationChanged(double duration)
         client->durationChanged(duration);
 }
 
-void WebVideoFullscreenControllerContext::currentTimeChanged(double currentTime, double anchorTime)
+void VideoFullscreenControllerContext::currentTimeChanged(double currentTime, double anchorTime)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, currentTime, anchorTime] {
             protectedThis->currentTimeChanged(currentTime, anchorTime);
         });
@@ -298,10 +298,10 @@ void WebVideoFullscreenControllerContext::currentTimeChanged(double currentTime,
         client->currentTimeChanged(currentTime, anchorTime);
 }
 
-void WebVideoFullscreenControllerContext::bufferedTimeChanged(double bufferedTime)
+void VideoFullscreenControllerContext::bufferedTimeChanged(double bufferedTime)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, bufferedTime] {
             protectedThis->bufferedTimeChanged(bufferedTime);
         });
@@ -312,10 +312,10 @@ void WebVideoFullscreenControllerContext::bufferedTimeChanged(double bufferedTim
         client->bufferedTimeChanged(bufferedTime);
 }
 
-void WebVideoFullscreenControllerContext::rateChanged(bool isPlaying, float playbackRate)
+void VideoFullscreenControllerContext::rateChanged(bool isPlaying, float playbackRate)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, isPlaying, playbackRate] {
             protectedThis->rateChanged(isPlaying, playbackRate);
         });
@@ -326,10 +326,10 @@ void WebVideoFullscreenControllerContext::rateChanged(bool isPlaying, float play
         client->rateChanged(isPlaying, playbackRate);
 }
 
-void WebVideoFullscreenControllerContext::hasVideoChanged(bool hasVideo)
+void VideoFullscreenControllerContext::hasVideoChanged(bool hasVideo)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, hasVideo] {
             protectedThis->hasVideoChanged(hasVideo);
         });
@@ -340,10 +340,10 @@ void WebVideoFullscreenControllerContext::hasVideoChanged(bool hasVideo)
         client->hasVideoChanged(hasVideo);
 }
 
-void WebVideoFullscreenControllerContext::videoDimensionsChanged(const FloatSize& videoDimensions)
+void VideoFullscreenControllerContext::videoDimensionsChanged(const FloatSize& videoDimensions)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, videoDimensions = videoDimensions] {
             protectedThis->videoDimensionsChanged(videoDimensions);
         });
@@ -354,10 +354,10 @@ void WebVideoFullscreenControllerContext::videoDimensionsChanged(const FloatSize
         client->videoDimensionsChanged(videoDimensions);
 }
 
-void WebVideoFullscreenControllerContext::seekableRangesChanged(const TimeRanges& timeRanges, double lastModifiedTime, double liveUpdateInterval)
+void VideoFullscreenControllerContext::seekableRangesChanged(const TimeRanges& timeRanges, double lastModifiedTime, double liveUpdateInterval)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, platformTimeRanges = timeRanges.ranges(), lastModifiedTime, liveUpdateInterval] {
             protectedThis->seekableRangesChanged(TimeRanges::create(platformTimeRanges), lastModifiedTime, liveUpdateInterval);
         });
@@ -368,10 +368,10 @@ void WebVideoFullscreenControllerContext::seekableRangesChanged(const TimeRanges
         client->seekableRangesChanged(timeRanges, lastModifiedTime, liveUpdateInterval);
 }
 
-void WebVideoFullscreenControllerContext::canPlayFastReverseChanged(bool canPlayFastReverse)
+void VideoFullscreenControllerContext::canPlayFastReverseChanged(bool canPlayFastReverse)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, canPlayFastReverse] {
             protectedThis->canPlayFastReverseChanged(canPlayFastReverse);
         });
@@ -391,10 +391,10 @@ static Vector<MediaSelectionOption> isolatedCopy(const Vector<MediaSelectionOpti
     return optionsCopy;
 }
 
-void WebVideoFullscreenControllerContext::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void VideoFullscreenControllerContext::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, options = isolatedCopy(options), selectedIndex] {
             protectedThis->audioMediaSelectionOptionsChanged(options, selectedIndex);
         });
@@ -405,10 +405,10 @@ void WebVideoFullscreenControllerContext::audioMediaSelectionOptionsChanged(cons
         client->audioMediaSelectionOptionsChanged(options, selectedIndex);
 }
 
-void WebVideoFullscreenControllerContext::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void VideoFullscreenControllerContext::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, options = isolatedCopy(options), selectedIndex] {
             protectedThis->legibleMediaSelectionOptionsChanged(options, selectedIndex);
         });
@@ -419,7 +419,7 @@ void WebVideoFullscreenControllerContext::legibleMediaSelectionOptionsChanged(co
         client->legibleMediaSelectionOptionsChanged(options, selectedIndex);
 }
 
-void WebVideoFullscreenControllerContext::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType type, const String& localizedDeviceName)
+void VideoFullscreenControllerContext::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType type, const String& localizedDeviceName)
 {
     if (WebThreadIsCurrent()) {
         callOnMainThread([protectedThis = makeRef(*this), this, enabled, type, localizedDeviceName = localizedDeviceName.isolatedCopy()] {
@@ -433,10 +433,10 @@ void WebVideoFullscreenControllerContext::externalPlaybackChanged(bool enabled,
         client->externalPlaybackChanged(enabled, type, localizedDeviceName);
 }
 
-void WebVideoFullscreenControllerContext::wirelessVideoPlaybackDisabledChanged(bool disabled)
+void VideoFullscreenControllerContext::wirelessVideoPlaybackDisabledChanged(bool disabled)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, disabled] {
             protectedThis->wirelessVideoPlaybackDisabledChanged(disabled);
         });
@@ -447,10 +447,10 @@ void WebVideoFullscreenControllerContext::wirelessVideoPlaybackDisabledChanged(b
         client->wirelessVideoPlaybackDisabledChanged(disabled);
 }
 
-void WebVideoFullscreenControllerContext::mutedChanged(bool muted)
+void VideoFullscreenControllerContext::mutedChanged(bool muted)
 {
     if (WebThreadIsCurrent()) {
-        RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+        RefPtr<VideoFullscreenControllerContext> protectedThis(this);
         dispatch_async(dispatch_get_main_queue(), [protectedThis, muted] {
             protectedThis->mutedChanged(muted);
         });
@@ -461,34 +461,34 @@ void WebVideoFullscreenControllerContext::mutedChanged(bool muted)
         client->mutedChanged(muted);
 }
 
-#pragma mark WebVideoFullscreenModel
+#pragma mark VideoFullscreenModel
 
-void WebVideoFullscreenControllerContext::addClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenControllerContext::addClient(VideoFullscreenModelClient& client)
 {
     ASSERT(!m_fullscreenClients.contains(&client));
     m_fullscreenClients.add(&client);
 }
 
-void WebVideoFullscreenControllerContext::removeClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenControllerContext::removeClient(VideoFullscreenModelClient& client)
 {
     ASSERT(m_fullscreenClients.contains(&client));
     m_fullscreenClients.remove(&client);
 }
 
-void WebVideoFullscreenControllerContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
+void VideoFullscreenControllerContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, mode, finishedWithMedia] {
         if (m_fullscreenModel)
             m_fullscreenModel->requestFullscreenMode(mode, finishedWithMedia);
     });
 }
 
-void WebVideoFullscreenControllerContext::setVideoLayerFrame(FloatRect frame)
+void VideoFullscreenControllerContext::setVideoLayerFrame(FloatRect frame)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     RetainPtr<CALayer> videoFullscreenLayer = [m_videoFullscreenView layer];
     
     [videoFullscreenLayer setSublayerTransform:[videoFullscreenLayer transform]];
@@ -508,105 +508,105 @@ void WebVideoFullscreenControllerContext::setVideoLayerFrame(FloatRect frame)
     });
 }
 
-void WebVideoFullscreenControllerContext::setVideoLayerGravity(WebVideoFullscreenModel::VideoGravity videoGravity)
+void VideoFullscreenControllerContext::setVideoLayerGravity(VideoFullscreenModel::VideoGravity videoGravity)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, videoGravity] {
         if (m_fullscreenModel)
             m_fullscreenModel->setVideoLayerGravity(videoGravity);
     });
 }
 
-void WebVideoFullscreenControllerContext::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenControllerContext::fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, mode] {
         if (m_fullscreenModel)
             m_fullscreenModel->fullscreenModeChanged(mode);
     });
 }
 
-bool WebVideoFullscreenControllerContext::isVisible() const
+bool VideoFullscreenControllerContext::isVisible() const
 {
     ASSERT(isUIThread());
     return m_fullscreenModel ? m_fullscreenModel->isVisible() : false;
 }
 
-bool WebVideoFullscreenControllerContext::hasVideo() const
+bool VideoFullscreenControllerContext::hasVideo() const
 {
     ASSERT(isUIThread());
     return m_fullscreenModel ? m_fullscreenModel->hasVideo() : false;
 }
 
-bool WebVideoFullscreenControllerContext::isMuted() const
+bool VideoFullscreenControllerContext::isMuted() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->isMuted() : false;
 }
 
-FloatSize WebVideoFullscreenControllerContext::videoDimensions() const
+FloatSize VideoFullscreenControllerContext::videoDimensions() const
 {
     ASSERT(isUIThread());
     return m_fullscreenModel ? m_fullscreenModel->videoDimensions() : FloatSize();
 }
 
-#pragma mark - WebPlaybackSessionModel
+#pragma mark - PlaybackSessionModel
 
-void WebVideoFullscreenControllerContext::addClient(WebPlaybackSessionModelClient& client)
+void VideoFullscreenControllerContext::addClient(PlaybackSessionModelClient& client)
 {
     ASSERT(!m_playbackClients.contains(&client));
     m_playbackClients.add(&client);
 }
 
-void WebVideoFullscreenControllerContext::removeClient(WebPlaybackSessionModelClient& client)
+void VideoFullscreenControllerContext::removeClient(PlaybackSessionModelClient& client)
 {
     ASSERT(m_playbackClients.contains(&client));
     m_playbackClients.remove(&client);
 }
 
-void WebVideoFullscreenControllerContext::play()
+void VideoFullscreenControllerContext::play()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->play();
     });
 }
 
-void WebVideoFullscreenControllerContext::pause()
+void VideoFullscreenControllerContext::pause()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->pause();
     });
 }
 
-void WebVideoFullscreenControllerContext::togglePlayState()
+void VideoFullscreenControllerContext::togglePlayState()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->togglePlayState();
     });
 }
 
-void WebVideoFullscreenControllerContext::toggleMuted()
+void VideoFullscreenControllerContext::toggleMuted()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->toggleMuted();
     });
 }
 
-void WebVideoFullscreenControllerContext::setMuted(bool muted)
+void VideoFullscreenControllerContext::setMuted(bool muted)
 {
     ASSERT(isUIThread());
     WebThreadRun([protectedThis = makeRefPtr(this), this, muted] {
@@ -615,151 +615,151 @@ void WebVideoFullscreenControllerContext::setMuted(bool muted)
     });
 }
 
-void WebVideoFullscreenControllerContext::beginScrubbing()
+void VideoFullscreenControllerContext::beginScrubbing()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->beginScrubbing();
     });
 }
 
-void WebVideoFullscreenControllerContext::endScrubbing()
+void VideoFullscreenControllerContext::endScrubbing()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->endScrubbing();
     });
 }
 
-void WebVideoFullscreenControllerContext::seekToTime(double time)
+void VideoFullscreenControllerContext::seekToTime(double time)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, time] {
         if (m_playbackModel)
             m_playbackModel->seekToTime(time);
     });
 }
 
-void WebVideoFullscreenControllerContext::fastSeek(double time)
+void VideoFullscreenControllerContext::fastSeek(double time)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, time] {
         if (m_playbackModel)
             m_playbackModel->fastSeek(time);
     });
 }
 
-void WebVideoFullscreenControllerContext::beginScanningForward()
+void VideoFullscreenControllerContext::beginScanningForward()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->beginScanningForward();
     });
 }
 
-void WebVideoFullscreenControllerContext::beginScanningBackward()
+void VideoFullscreenControllerContext::beginScanningBackward()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->beginScanningBackward();
     });
 }
 
-void WebVideoFullscreenControllerContext::endScanning()
+void VideoFullscreenControllerContext::endScanning()
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this] {
         if (m_playbackModel)
             m_playbackModel->endScanning();
     });
 }
 
-void WebVideoFullscreenControllerContext::selectAudioMediaOption(uint64_t index)
+void VideoFullscreenControllerContext::selectAudioMediaOption(uint64_t index)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, index] {
         if (m_playbackModel)
             m_playbackModel->selectAudioMediaOption(index);
     });
 }
 
-void WebVideoFullscreenControllerContext::selectLegibleMediaOption(uint64_t index)
+void VideoFullscreenControllerContext::selectLegibleMediaOption(uint64_t index)
 {
     ASSERT(isUIThread());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     WebThreadRun([protectedThis, this, index] {
         if (m_playbackModel)
             m_playbackModel->selectLegibleMediaOption(index);
     });
 }
 
-double WebVideoFullscreenControllerContext::duration() const
+double VideoFullscreenControllerContext::duration() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->duration() : 0;
 }
 
-double WebVideoFullscreenControllerContext::currentTime() const
+double VideoFullscreenControllerContext::currentTime() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->currentTime() : 0;
 }
 
-double WebVideoFullscreenControllerContext::bufferedTime() const
+double VideoFullscreenControllerContext::bufferedTime() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->bufferedTime() : 0;
 }
 
-bool WebVideoFullscreenControllerContext::isPlaying() const
+bool VideoFullscreenControllerContext::isPlaying() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->isPlaying() : false;
 }
 
-float WebVideoFullscreenControllerContext::playbackRate() const
+float VideoFullscreenControllerContext::playbackRate() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->playbackRate() : 0;
 }
 
-Ref<TimeRanges> WebVideoFullscreenControllerContext::seekableRanges() const
+Ref<TimeRanges> VideoFullscreenControllerContext::seekableRanges() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->seekableRanges() : TimeRanges::create();
 }
 
-double WebVideoFullscreenControllerContext::seekableTimeRangesLastModifiedTime() const
+double VideoFullscreenControllerContext::seekableTimeRangesLastModifiedTime() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->seekableTimeRangesLastModifiedTime() : 0;
 }
 
-double WebVideoFullscreenControllerContext::liveUpdateInterval() const
+double VideoFullscreenControllerContext::liveUpdateInterval() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->liveUpdateInterval() : 0;
 }
 
-bool WebVideoFullscreenControllerContext::canPlayFastReverse() const
+bool VideoFullscreenControllerContext::canPlayFastReverse() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->canPlayFastReverse() : false;
 }
 
-Vector<MediaSelectionOption> WebVideoFullscreenControllerContext::audioMediaSelectionOptions() const
+Vector<MediaSelectionOption> VideoFullscreenControllerContext::audioMediaSelectionOptions() const
 {
     ASSERT(isUIThread());
     if (m_playbackModel)
@@ -767,13 +767,13 @@ Vector<MediaSelectionOption> WebVideoFullscreenControllerContext::audioMediaSele
     return { };
 }
 
-uint64_t WebVideoFullscreenControllerContext::audioMediaSelectedIndex() const
+uint64_t VideoFullscreenControllerContext::audioMediaSelectedIndex() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->audioMediaSelectedIndex() : -1;
 }
 
-Vector<MediaSelectionOption> WebVideoFullscreenControllerContext::legibleMediaSelectionOptions() const
+Vector<MediaSelectionOption> VideoFullscreenControllerContext::legibleMediaSelectionOptions() const
 {
     ASSERT(isUIThread());
     if (m_playbackModel)
@@ -781,31 +781,31 @@ Vector<MediaSelectionOption> WebVideoFullscreenControllerContext::legibleMediaSe
     return { };
 }
 
-uint64_t WebVideoFullscreenControllerContext::legibleMediaSelectedIndex() const
+uint64_t VideoFullscreenControllerContext::legibleMediaSelectedIndex() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->legibleMediaSelectedIndex() : -1;
 }
 
-bool WebVideoFullscreenControllerContext::externalPlaybackEnabled() const
+bool VideoFullscreenControllerContext::externalPlaybackEnabled() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->externalPlaybackEnabled() : false;
 }
 
-WebPlaybackSessionModel::ExternalPlaybackTargetType WebVideoFullscreenControllerContext::externalPlaybackTargetType() const
+PlaybackSessionModel::ExternalPlaybackTargetType VideoFullscreenControllerContext::externalPlaybackTargetType() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->externalPlaybackTargetType() : TargetTypeNone;
 }
 
-String WebVideoFullscreenControllerContext::externalPlaybackLocalizedDeviceName() const
+String VideoFullscreenControllerContext::externalPlaybackLocalizedDeviceName() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->externalPlaybackLocalizedDeviceName() : String();
 }
 
-bool WebVideoFullscreenControllerContext::wirelessVideoPlaybackDisabled() const
+bool VideoFullscreenControllerContext::wirelessVideoPlaybackDisabled() const
 {
     ASSERT(isUIThread());
     return m_playbackModel ? m_playbackModel->wirelessVideoPlaybackDisabled() : true;
@@ -813,16 +813,16 @@ bool WebVideoFullscreenControllerContext::wirelessVideoPlaybackDisabled() const
 
 #pragma mark Other
 
-void WebVideoFullscreenControllerContext::setUpFullscreen(HTMLVideoElement& videoElement, UIView *view, HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenControllerContext::setUpFullscreen(HTMLVideoElement& videoElement, UIView *view, HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     ASSERT(isMainThread());
     RetainPtr<UIView> viewRef = view;
     m_videoElement = &videoElement;
-    m_playbackModel = WebPlaybackSessionModelMediaElement::create();
+    m_playbackModel = PlaybackSessionModelMediaElement::create();
     m_playbackModel->addClient(*this);
     m_playbackModel->setMediaElement(m_videoElement.get());
 
-    m_fullscreenModel = WebVideoFullscreenModelVideoElement::create();
+    m_fullscreenModel = VideoFullscreenModelVideoElement::create();
     m_fullscreenModel->addClient(*this);
     m_fullscreenModel->setVideoElement(m_videoElement.get());
 
@@ -832,15 +832,15 @@ void WebVideoFullscreenControllerContext::setUpFullscreen(HTMLVideoElement& vide
     FloatRect videoLayerFrame = FloatRect(FloatPoint(), videoElementClientRect.size());
     m_fullscreenModel->setVideoLayerFrame(videoLayerFrame);
 
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), [protectedThis, this, videoElementClientRect, viewRef, mode, allowsPictureInPicture] {
         ASSERT(isUIThread());
 
-        Ref<WebPlaybackSessionInterfaceAVKit> sessionInterface = WebPlaybackSessionInterfaceAVKit::create(*this);
-        m_interface = WebVideoFullscreenInterfaceAVKit::create(sessionInterface.get());
-        m_interface->setWebVideoFullscreenChangeObserver(this);
-        m_interface->setWebVideoFullscreenModel(this);
-        m_interface->setWebVideoFullscreenChangeObserver(this);
+        Ref<PlaybackSessionInterfaceAVKit> sessionInterface = PlaybackSessionInterfaceAVKit::create(*this);
+        m_interface = VideoFullscreenInterfaceAVKit::create(sessionInterface.get());
+        m_interface->setVideoFullscreenChangeObserver(this);
+        m_interface->setVideoFullscreenModel(this);
+        m_interface->setVideoFullscreenChangeObserver(this);
 
         m_videoFullscreenView = adoptNS([allocUIViewInstance() init]);
         
@@ -848,25 +848,25 @@ void WebVideoFullscreenControllerContext::setUpFullscreen(HTMLVideoElement& vide
     });
 }
 
-void WebVideoFullscreenControllerContext::exitFullscreen()
+void VideoFullscreenControllerContext::exitFullscreen()
 {
     ASSERT(WebThreadIsCurrent() || isMainThread());
     IntRect clientRect = elementRectInWindow(m_videoElement.get());
-    RefPtr<WebVideoFullscreenControllerContext> protectedThis(this);
+    RefPtr<VideoFullscreenControllerContext> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), [protectedThis, this, clientRect] {
         ASSERT(isUIThread());
         m_interface->exitFullscreen(clientRect);
     });
 }
 
-void WebVideoFullscreenControllerContext::requestHideAndExitFullscreen()
+void VideoFullscreenControllerContext::requestHideAndExitFullscreen()
 {
     ASSERT(isUIThread());
     m_interface->requestHideAndExitFullscreen();
 }
 
 @implementation WebVideoFullscreenController {
-    RefPtr<WebVideoFullscreenControllerContext> _context;
+    RefPtr<VideoFullscreenControllerContext> _context;
     RefPtr<HTMLVideoElement> _videoElement;
 }
 
@@ -891,7 +891,7 @@ void WebVideoFullscreenControllerContext::requestHideAndExitFullscreen()
 - (void)enterFullscreen:(UIView *)view mode:(HTMLMediaElementEnums::VideoFullscreenMode)mode
 {
     ASSERT(isMainThread());
-    _context = WebVideoFullscreenControllerContext::create();
+    _context = VideoFullscreenControllerContext::create();
     _context->setController(self);
     _context->setUpFullscreen(*_videoElement.get(), view, mode);
 }
@@ -909,7 +909,7 @@ void WebVideoFullscreenControllerContext::requestHideAndExitFullscreen()
         _context->requestHideAndExitFullscreen();
 }
 
-- (void)didFinishFullscreen:(WebVideoFullscreenControllerContext*)context
+- (void)didFinishFullscreen:(VideoFullscreenControllerContext*)context
 {
     ASSERT(WebThreadIsCurrent());
     ASSERT_UNUSED(context, context == _context);
@@ -28,8 +28,8 @@
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
 #include "HTMLMediaElementEnums.h"
-#include "WebPlaybackSessionInterface.h"
-#include "WebPlaybackSessionModel.h"
+#include "PlaybackSessionInterface.h"
+#include "PlaybackSessionModel.h"
 #include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
@@ -38,21 +38,21 @@ OBJC_CLASS WebPlaybackControlsManager;
 
 namespace WebCore {
 class IntRect;
-class WebPlaybackSessionModel;
+class PlaybackSessionModel;
 
-class WEBCORE_EXPORT WebPlaybackSessionInterfaceMac final
-    : public WebPlaybackSessionInterface
-    , public WebPlaybackSessionModelClient
-    , public RefCounted<WebPlaybackSessionInterfaceMac> {
+class WEBCORE_EXPORT PlaybackSessionInterfaceMac final
+    : public PlaybackSessionInterface
+    , public PlaybackSessionModelClient
+    , public RefCounted<PlaybackSessionInterfaceMac> {
 public:
-    static Ref<WebPlaybackSessionInterfaceMac> create(WebPlaybackSessionModel&);
-    virtual ~WebPlaybackSessionInterfaceMac();
-    WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionModel; }
+    static Ref<PlaybackSessionInterfaceMac> create(PlaybackSessionModel&);
+    virtual ~PlaybackSessionInterfaceMac();
+    PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionModel; }
 
-    // WebPlaybackSessionInterface
+    // PlaybackSessionInterface
     WEBCORE_EXPORT void resetMediaState() final { }
 
-    // WebPlaybackSessionModelClient
+    // PlaybackSessionModelClient
     WEBCORE_EXPORT void durationChanged(double) final;
     WEBCORE_EXPORT void currentTimeChanged(double /*currentTime*/, double /*anchorTime*/) final;
     WEBCORE_EXPORT void rateChanged(bool /*isPlaying*/, float /*playbackRate*/) final;
@@ -61,7 +61,7 @@ public:
     WEBCORE_EXPORT void legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& /*options*/, uint64_t /*selectedIndex*/) final;
     WEBCORE_EXPORT void audioMediaSelectionIndexChanged(uint64_t) final;
     WEBCORE_EXPORT void legibleMediaSelectionIndexChanged(uint64_t) final;
-    WEBCORE_EXPORT void externalPlaybackChanged(bool /* enabled */, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& /* localizedDeviceName */) final;
+    WEBCORE_EXPORT void externalPlaybackChanged(bool /* enabled */, PlaybackSessionModel::ExternalPlaybackTargetType, const String& /* localizedDeviceName */) final;
 
     WEBCORE_EXPORT void invalidate();
     WEBCORE_EXPORT void ensureControlsManager();
@@ -73,8 +73,8 @@ public:
     WEBCORE_EXPORT void endScrubbing();
 
 private:
-    WebPlaybackSessionInterfaceMac(WebPlaybackSessionModel&);
-    WebPlaybackSessionModel* m_playbackSessionModel { nullptr };
+    PlaybackSessionInterfaceMac(PlaybackSessionModel&);
+    PlaybackSessionModel* m_playbackSessionModel { nullptr };
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     WebPlaybackControlsManager *m_playbackControlsManager  { nullptr };
 
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WebPlaybackSessionInterfaceMac.h"
+#import "PlaybackSessionInterfaceMac.h"
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
@@ -32,9 +32,9 @@
 #import "IntRect.h"
 #import "MediaSelectionOption.h"
 #import "MediaTimeAVFoundation.h"
+#import "PlaybackSessionModel.h"
 #import "TimeRanges.h"
 #import "WebPlaybackControlsManager.h"
-#import "WebPlaybackSessionModel.h"
 #import <AVFoundation/AVTime.h>
 
 #import "CoreMediaSoftLink.h"
@@ -46,24 +46,24 @@ using namespace WebCore;
 
 namespace WebCore {
 
-Ref<WebPlaybackSessionInterfaceMac> WebPlaybackSessionInterfaceMac::create(WebPlaybackSessionModel& model)
+Ref<PlaybackSessionInterfaceMac> PlaybackSessionInterfaceMac::create(PlaybackSessionModel& model)
 {
-    auto interface = adoptRef(*new WebPlaybackSessionInterfaceMac(model));
+    auto interface = adoptRef(*new PlaybackSessionInterfaceMac(model));
     model.addClient(interface);
     return interface;
 }
 
-WebPlaybackSessionInterfaceMac::WebPlaybackSessionInterfaceMac(WebPlaybackSessionModel& model)
+PlaybackSessionInterfaceMac::PlaybackSessionInterfaceMac(PlaybackSessionModel& model)
     : m_playbackSessionModel(&model)
 {
 }
 
-WebPlaybackSessionInterfaceMac::~WebPlaybackSessionInterfaceMac()
+PlaybackSessionInterfaceMac::~PlaybackSessionInterfaceMac()
 {
     invalidate();
 }
 
-void WebPlaybackSessionInterfaceMac::durationChanged(double duration)
+void PlaybackSessionInterfaceMac::durationChanged(double duration)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     WebPlaybackControlsManager* controlsManager = playBackControlsManager();
@@ -78,7 +78,7 @@ void WebPlaybackSessionInterfaceMac::durationChanged(double duration)
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::currentTimeChanged(double currentTime, double anchorTime)
+void PlaybackSessionInterfaceMac::currentTimeChanged(double currentTime, double anchorTime)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     WebPlaybackControlsManager* controlsManager = playBackControlsManager();
@@ -89,7 +89,7 @@ void WebPlaybackSessionInterfaceMac::currentTimeChanged(double currentTime, doub
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::rateChanged(bool isPlaying, float playbackRate)
+void PlaybackSessionInterfaceMac::rateChanged(bool isPlaying, float playbackRate)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     WebPlaybackControlsManager* controlsManager = playBackControlsManager();
@@ -102,17 +102,17 @@ void WebPlaybackSessionInterfaceMac::rateChanged(bool isPlaying, float playbackR
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::beginScrubbing()
+void PlaybackSessionInterfaceMac::beginScrubbing()
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     updatePlaybackControlsManagerTiming(m_playbackSessionModel ? m_playbackSessionModel->currentTime() : 0, [[NSProcessInfo processInfo] systemUptime], 0, false);
 #endif
-    webPlaybackSessionModel()->beginScrubbing();
+    playbackSessionModel()->beginScrubbing();
 }
 
-void WebPlaybackSessionInterfaceMac::endScrubbing()
+void PlaybackSessionInterfaceMac::endScrubbing()
 {
-    webPlaybackSessionModel()->endScrubbing();
+    playbackSessionModel()->endScrubbing();
 }
 
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
@@ -130,7 +130,7 @@ static RetainPtr<NSMutableArray> timeRangesToArray(const TimeRanges& timeRanges)
 }
 #endif
 
-void WebPlaybackSessionInterfaceMac::seekableRangesChanged(const TimeRanges& timeRanges, double, double)
+void PlaybackSessionInterfaceMac::seekableRangesChanged(const TimeRanges& timeRanges, double, double)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setSeekableTimeRanges:timeRangesToArray(timeRanges).get()];
@@ -139,7 +139,7 @@ void WebPlaybackSessionInterfaceMac::seekableRangesChanged(const TimeRanges& tim
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void PlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setAudioMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
@@ -149,7 +149,7 @@ void WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged(const Vec
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+void PlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setLegibleMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
@@ -159,7 +159,7 @@ void WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged(const V
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::audioMediaSelectionIndexChanged(uint64_t selectedIndex)
+void PlaybackSessionInterfaceMac::audioMediaSelectionIndexChanged(uint64_t selectedIndex)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setAudioMediaSelectionIndex:selectedIndex];
@@ -168,7 +168,7 @@ void WebPlaybackSessionInterfaceMac::audioMediaSelectionIndexChanged(uint64_t se
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::legibleMediaSelectionIndexChanged(uint64_t selectedIndex)
+void PlaybackSessionInterfaceMac::legibleMediaSelectionIndexChanged(uint64_t selectedIndex)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setLegibleMediaSelectionIndex:selectedIndex];
@@ -177,7 +177,7 @@ void WebPlaybackSessionInterfaceMac::legibleMediaSelectionIndexChanged(uint64_t
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String&)
+void PlaybackSessionInterfaceMac::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String&)
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [playBackControlsManager() setCanTogglePictureInPicture:!enabled];
@@ -186,7 +186,7 @@ void WebPlaybackSessionInterfaceMac::externalPlaybackChanged(bool enabled, WebPl
 #endif
 }
 
-void WebPlaybackSessionInterfaceMac::invalidate()
+void PlaybackSessionInterfaceMac::invalidate()
 {
     if (!m_playbackSessionModel)
         return;
@@ -195,7 +195,7 @@ void WebPlaybackSessionInterfaceMac::invalidate()
     m_playbackSessionModel = nullptr;
 }
 
-void WebPlaybackSessionInterfaceMac::ensureControlsManager()
+void PlaybackSessionInterfaceMac::ensureControlsManager()
 {
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     playBackControlsManager();
@@ -204,12 +204,12 @@ void WebPlaybackSessionInterfaceMac::ensureControlsManager()
 
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
 
-WebPlaybackControlsManager *WebPlaybackSessionInterfaceMac::playBackControlsManager()
+WebPlaybackControlsManager *PlaybackSessionInterfaceMac::playBackControlsManager()
 {
     return m_playbackControlsManager;
 }
 
-void WebPlaybackSessionInterfaceMac::setPlayBackControlsManager(WebPlaybackControlsManager *manager)
+void PlaybackSessionInterfaceMac::setPlayBackControlsManager(WebPlaybackControlsManager *manager)
 {
     m_playbackControlsManager = manager;
 
@@ -230,13 +230,13 @@ void WebPlaybackSessionInterfaceMac::setPlayBackControlsManager(WebPlaybackContr
     [manager setLegibleMediaSelectionOptions:m_playbackSessionModel->legibleMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->legibleMediaSelectedIndex())];
 }
 
-void WebPlaybackSessionInterfaceMac::updatePlaybackControlsManagerTiming(double currentTime, double anchorTime, double playbackRate, bool isPlaying)
+void PlaybackSessionInterfaceMac::updatePlaybackControlsManagerTiming(double currentTime, double anchorTime, double playbackRate, bool isPlaying)
 {
     WebPlaybackControlsManager *manager = playBackControlsManager();
     if (!manager)
         return;
 
-    WebPlaybackSessionModel *model = webPlaybackSessionModel();
+    PlaybackSessionModel *model = playbackSessionModel();
     if (!model)
         return;
 
@@ -28,9 +28,9 @@
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
 #include "HTMLMediaElementEnums.h"
-#include "WebPlaybackSessionInterfaceMac.h"
-#include "WebPlaybackSessionModel.h"
-#include "WebVideoFullscreenModel.h"
+#include "PlaybackSessionInterfaceMac.h"
+#include "PlaybackSessionModel.h"
+#include "VideoFullscreenModel.h"
 #include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
@@ -41,31 +41,31 @@ OBJC_CLASS WebVideoFullscreenInterfaceMacObjC;
 namespace WebCore {
 class IntRect;
 class FloatSize;
-class WebPlaybackSessionInterfaceMac;
-class WebVideoFullscreenChangeObserver;
+class PlaybackSessionInterfaceMac;
+class VideoFullscreenChangeObserver;
 
-class WEBCORE_EXPORT WebVideoFullscreenInterfaceMac
-    : public WebVideoFullscreenModelClient
-    , private WebPlaybackSessionModelClient
-    , public RefCounted<WebVideoFullscreenInterfaceMac> {
+class WEBCORE_EXPORT VideoFullscreenInterfaceMac
+    : public VideoFullscreenModelClient
+    , private PlaybackSessionModelClient
+    , public RefCounted<VideoFullscreenInterfaceMac> {
 
 public:
-    static Ref<WebVideoFullscreenInterfaceMac> create(WebPlaybackSessionInterfaceMac& playbackSessionInterface)
+    static Ref<VideoFullscreenInterfaceMac> create(PlaybackSessionInterfaceMac& playbackSessionInterface)
     {
-        return adoptRef(*new WebVideoFullscreenInterfaceMac(playbackSessionInterface));
+        return adoptRef(*new VideoFullscreenInterfaceMac(playbackSessionInterface));
     }
-    virtual ~WebVideoFullscreenInterfaceMac();
-    WebVideoFullscreenModel* webVideoFullscreenModel() const { return m_videoFullscreenModel; }
-    WebPlaybackSessionModel* webPlaybackSessionModel() const { return m_playbackSessionInterface->webPlaybackSessionModel(); }
-    WEBCORE_EXPORT void setWebVideoFullscreenModel(WebVideoFullscreenModel*);
-    WebVideoFullscreenChangeObserver* webVideoFullscreenChangeObserver() const { return m_fullscreenChangeObserver; }
-    WEBCORE_EXPORT void setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver*);
-
-    // WebPlaybackSessionModelClient
+    virtual ~VideoFullscreenInterfaceMac();
+    VideoFullscreenModel* videoFullscreenModel() const { return m_videoFullscreenModel; }
+    PlaybackSessionModel* playbackSessionModel() const { return m_playbackSessionInterface->playbackSessionModel(); }
+    WEBCORE_EXPORT void setVideoFullscreenModel(VideoFullscreenModel*);
+    VideoFullscreenChangeObserver* videoFullscreenChangeObserver() const { return m_fullscreenChangeObserver; }
+    WEBCORE_EXPORT void setVideoFullscreenChangeObserver(VideoFullscreenChangeObserver*);
+
+    // PlaybackSessionModelClient
     WEBCORE_EXPORT void rateChanged(bool isPlaying, float playbackRate) override;
-    WEBCORE_EXPORT void externalPlaybackChanged(bool  enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
+    WEBCORE_EXPORT void externalPlaybackChanged(bool  enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) override;
 
-    // WebVideoFullscreenModelClient
+    // VideoFullscreenModelClient
     WEBCORE_EXPORT void hasVideoChanged(bool) final;
     WEBCORE_EXPORT void videoDimensionsChanged(const FloatSize&) final;
 
@@ -93,10 +93,10 @@ public:
     WEBCORE_EXPORT WebVideoFullscreenInterfaceMacObjC *videoFullscreenInterfaceObjC();
 
 private:
-    WebVideoFullscreenInterfaceMac(WebPlaybackSessionInterfaceMac&);
-    Ref<WebPlaybackSessionInterfaceMac> m_playbackSessionInterface;
-    WebVideoFullscreenModel* m_videoFullscreenModel { nullptr };
-    WebVideoFullscreenChangeObserver* m_fullscreenChangeObserver { nullptr };
+    VideoFullscreenInterfaceMac(PlaybackSessionInterfaceMac&);
+    Ref<PlaybackSessionInterfaceMac> m_playbackSessionInterface;
+    VideoFullscreenModel* m_videoFullscreenModel { nullptr };
+    VideoFullscreenChangeObserver* m_fullscreenChangeObserver { nullptr };
     HTMLMediaElementEnums::VideoFullscreenMode m_mode { HTMLMediaElementEnums::VideoFullscreenModeNone };
     RetainPtr<WebVideoFullscreenInterfaceMacObjC> m_webVideoFullscreenInterfaceObjC;
 };
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WebVideoFullscreenInterfaceMac.h"
+#import "VideoFullscreenInterfaceMac.h"
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
 
 #import "Logging.h"
 #import "MediaTimeAVFoundation.h"
 #import "PIPSPI.h"
+#import "PlaybackSessionInterfaceMac.h"
 #import "TimeRanges.h"
+#import "VideoFullscreenChangeObserver.h"
+#import "VideoFullscreenModel.h"
 #import "WebPlaybackControlsManager.h"
-#import "WebPlaybackSessionInterfaceMac.h"
-#import "WebVideoFullscreenChangeObserver.h"
-#import "WebVideoFullscreenModel.h"
 #import <AVFoundation/AVTime.h>
 
 #import "CoreMediaSoftLink.h"
@@ -94,7 +94,7 @@ enum class PIPState {
 };
 
 @interface WebVideoFullscreenInterfaceMacObjC : NSObject <PIPViewControllerDelegate, WebVideoViewContainerDelegate> {
-    WebCore::WebVideoFullscreenInterfaceMac* _webVideoFullscreenInterfaceMac;
+    WebCore::VideoFullscreenInterfaceMac* _videoFullscreenInterfaceMac;
     NSSize _videoDimensions;
     RetainPtr<PIPViewController> _pipViewController;
     RetainPtr<NSViewController> _videoViewContainerController;
@@ -107,7 +107,7 @@ enum class PIPState {
     BOOL _exitingToStandardFullscreen;
 }
 
-- (instancetype)initWithWebVideoFullscreenInterfaceMac:(WebCore::WebVideoFullscreenInterfaceMac*)webVideoFullscreenInterfaceMac;
+- (instancetype)initWithVideoFullscreenInterfaceMac:(WebCore::VideoFullscreenInterfaceMac*)videoFullscreenInterfaceMac;
 - (void)invalidateFullscreenState;
 - (void)invalidate;
 
@@ -134,12 +134,12 @@ enum class PIPState {
 @synthesize didRequestExitingPIP=_didRequestExitingPIP;
 @synthesize exitingToStandardFullscreen=_exitingToStandardFullscreen;
 
-- (instancetype)initWithWebVideoFullscreenInterfaceMac:(WebCore::WebVideoFullscreenInterfaceMac*)webVideoFullscreenInterfaceMac
+- (instancetype)initWithVideoFullscreenInterfaceMac:(WebCore::VideoFullscreenInterfaceMac*)videoFullscreenInterfaceMac
 {
     if (!(self = [super init]))
         return nil;
 
-    _webVideoFullscreenInterfaceMac = webVideoFullscreenInterfaceMac;
+    _videoFullscreenInterfaceMac = videoFullscreenInterfaceMac;
     _pipState = PIPState::NotInPIP;
 
     return self;
@@ -163,7 +163,7 @@ enum class PIPState {
 - (void)invalidate
 {
     [self invalidateFullscreenState];
-    _webVideoFullscreenInterfaceMac = nullptr;
+    _videoFullscreenInterfaceMac = nullptr;
     _videoDimensions = NSZeroSize;
 }
 
@@ -192,8 +192,8 @@ enum class PIPState {
     [_pipViewController setUserCanResize:YES];
     [_pipViewController setPlaying:_playing];
     [self setVideoDimensions:NSEqualSizes(_videoDimensions, NSZeroSize) ? frame.size : _videoDimensions];
-    if (_webVideoFullscreenInterfaceMac && _webVideoFullscreenInterfaceMac->webVideoFullscreenModel())
-        _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->setVideoLayerGravity(WebVideoFullscreenModel::VideoGravityResizeAspectFill);
+    if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->videoFullscreenModel())
+        _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspectFill);
 
     _videoViewContainer = adoptNS([[WebVideoViewContainer alloc] initWithFrame:frame]);
     [_videoViewContainer setVideoViewContainerDelegate:self];
@@ -247,8 +247,8 @@ enum class PIPState {
 
     ASSERT_UNUSED(videoViewContainer, videoViewContainer == _videoViewContainer);
 
-    if (_webVideoFullscreenInterfaceMac && _webVideoFullscreenInterfaceMac->webVideoFullscreenModel())
-        _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->setVideoLayerFrame([_videoViewContainer bounds]);
+    if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->videoFullscreenModel())
+        _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerFrame([_videoViewContainer bounds]);
 }
 
 - (void)superviewDidChangeForVideoViewContainer:(WebVideoViewContainer *)videoViewContainer
@@ -272,11 +272,11 @@ enum class PIPState {
 {
     ASSERT_UNUSED(pip, pip == _pipViewController);
 
-    if (!_webVideoFullscreenInterfaceMac || !_webVideoFullscreenInterfaceMac->webVideoFullscreenChangeObserver())
+    if (!_videoFullscreenInterfaceMac || !_videoFullscreenInterfaceMac->videoFullscreenChangeObserver())
         return YES;
 
     _didRequestExitingPIP = YES;
-    _webVideoFullscreenInterfaceMac->webVideoFullscreenChangeObserver()->fullscreenMayReturnToInline();
+    _videoFullscreenInterfaceMac->videoFullscreenChangeObserver()->fullscreenMayReturnToInline();
 
     return NO;
 }
@@ -285,28 +285,28 @@ enum class PIPState {
 {
     ASSERT_UNUSED(pip, pip == _pipViewController);
 
-    if (_webVideoFullscreenInterfaceMac && _webVideoFullscreenInterfaceMac->webVideoFullscreenModel() && _videoViewContainer && _returningWindow && !NSEqualRects(_returningRect, NSZeroRect)) {
+    if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->videoFullscreenModel() && _videoViewContainer && _returningWindow && !NSEqualRects(_returningRect, NSZeroRect)) {
         [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
             context.allowsImplicitAnimation = NO;
             [_videoViewContainer setFrame:_returningRect];
-            _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->setVideoLayerFrame([_videoViewContainer bounds]);
-            _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->setVideoLayerGravity(WebVideoFullscreenModel::VideoGravityResizeAspect);
+            _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerFrame([_videoViewContainer bounds]);
+            _videoFullscreenInterfaceMac->videoFullscreenModel()->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspect);
 
             [[_returningWindow contentView] addSubview:_videoViewContainer.get() positioned:NSWindowAbove relativeTo:nil];
         } completionHandler:nil];
     }
 
-    if (_webVideoFullscreenInterfaceMac) {
+    if (_videoFullscreenInterfaceMac) {
         if (!self.isExitingToStandardFullscreen) {
-            if (WebVideoFullscreenModel* videoFullscreenModel = _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()) {
+            if (VideoFullscreenModel* videoFullscreenModel = _videoFullscreenInterfaceMac->videoFullscreenModel()) {
                 videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
-                videoFullscreenModel->setVideoLayerGravity(WebVideoFullscreenModel::VideoGravityResizeAspect);
+                videoFullscreenModel->setVideoLayerGravity(VideoFullscreenModel::VideoGravityResizeAspect);
             }
         }
 
-        _webVideoFullscreenInterfaceMac->clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
+        _videoFullscreenInterfaceMac->clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
 
-        if (WebVideoFullscreenChangeObserver* fullscreenChangeObserver = _webVideoFullscreenInterfaceMac->webVideoFullscreenChangeObserver())
+        if (VideoFullscreenChangeObserver* fullscreenChangeObserver = _videoFullscreenInterfaceMac->videoFullscreenChangeObserver())
             fullscreenChangeObserver->didExitFullscreen();
     }
 }
@@ -315,26 +315,26 @@ enum class PIPState {
 {
     ASSERT_UNUSED(pip, pip == _pipViewController);
 
-    if (_webVideoFullscreenInterfaceMac && _webVideoFullscreenInterfaceMac->webPlaybackSessionModel())
-        _webVideoFullscreenInterfaceMac->webPlaybackSessionModel()->play();
+    if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->playbackSessionModel())
+        _videoFullscreenInterfaceMac->playbackSessionModel()->play();
 }
 
 - (void)pipActionPause:(PIPViewController *)pip
 {
     ASSERT_UNUSED(pip, pip == _pipViewController);
 
-    if (_webVideoFullscreenInterfaceMac && _webVideoFullscreenInterfaceMac->webPlaybackSessionModel())
-        _webVideoFullscreenInterfaceMac->webPlaybackSessionModel()->pause();
+    if (_videoFullscreenInterfaceMac && _videoFullscreenInterfaceMac->playbackSessionModel())
+        _videoFullscreenInterfaceMac->playbackSessionModel()->pause();
 }
 
 - (void)pipActionStop:(PIPViewController *)pip
 {
     ASSERT_UNUSED(pip, pip == _pipViewController);
 
-    if (!_webVideoFullscreenInterfaceMac)
+    if (!_videoFullscreenInterfaceMac)
         return;
 
-    if (WebPlaybackSessionModel* playbackSessionModel = _webVideoFullscreenInterfaceMac->webPlaybackSessionModel())
+    if (PlaybackSessionModel* playbackSessionModel = _videoFullscreenInterfaceMac->playbackSessionModel())
         playbackSessionModel->pause();
 
     // FIXME 25096170: Should animate only if the page with the video is unobscured. For now, always close without animation.
@@ -345,24 +345,24 @@ enum class PIPState {
 
 namespace WebCore {
 
-WebVideoFullscreenInterfaceMac::WebVideoFullscreenInterfaceMac(WebPlaybackSessionInterfaceMac& playbackSessionInterface)
+VideoFullscreenInterfaceMac::VideoFullscreenInterfaceMac(PlaybackSessionInterfaceMac& playbackSessionInterface)
     : m_playbackSessionInterface(playbackSessionInterface)
 {
-    ASSERT(m_playbackSessionInterface->webPlaybackSessionModel());
-    auto model = m_playbackSessionInterface->webPlaybackSessionModel();
+    ASSERT(m_playbackSessionInterface->playbackSessionModel());
+    auto model = m_playbackSessionInterface->playbackSessionModel();
     model->addClient(*this);
     [videoFullscreenInterfaceObjC() updateIsPlaying:model->isPlaying() newPlaybackRate:model->playbackRate()];
 }
 
-WebVideoFullscreenInterfaceMac::~WebVideoFullscreenInterfaceMac()
+VideoFullscreenInterfaceMac::~VideoFullscreenInterfaceMac()
 {
-    if (m_playbackSessionInterface->webPlaybackSessionModel())
-        m_playbackSessionInterface->webPlaybackSessionModel()->removeClient(*this);
+    if (m_playbackSessionInterface->playbackSessionModel())
+        m_playbackSessionInterface->playbackSessionModel()->removeClient(*this);
     if (m_videoFullscreenModel)
         m_videoFullscreenModel->removeClient(*this);
 }
 
-void WebVideoFullscreenInterfaceMac::setWebVideoFullscreenModel(WebVideoFullscreenModel* model)
+void VideoFullscreenInterfaceMac::setVideoFullscreenModel(VideoFullscreenModel* model)
 {
     if (m_videoFullscreenModel)
         m_videoFullscreenModel->removeClient(*this);
@@ -371,12 +371,12 @@ void WebVideoFullscreenInterfaceMac::setWebVideoFullscreenModel(WebVideoFullscre
         m_videoFullscreenModel->addClient(*this);
 }
 
-void WebVideoFullscreenInterfaceMac::setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver* observer)
+void VideoFullscreenInterfaceMac::setVideoFullscreenChangeObserver(VideoFullscreenChangeObserver* observer)
 {
     m_fullscreenChangeObserver = observer;
 }
 
-void WebVideoFullscreenInterfaceMac::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenInterfaceMac::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode | mode;
     if (m_mode == newMode)
@@ -387,7 +387,7 @@ void WebVideoFullscreenInterfaceMac::setMode(HTMLMediaElementEnums::VideoFullscr
         m_videoFullscreenModel->fullscreenModeChanged(m_mode);
 }
 
-void WebVideoFullscreenInterfaceMac::clearMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenInterfaceMac::clearMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     HTMLMediaElementEnums::VideoFullscreenMode newMode = m_mode & ~mode;
     if (m_mode == newMode)
@@ -398,27 +398,27 @@ void WebVideoFullscreenInterfaceMac::clearMode(HTMLMediaElementEnums::VideoFulls
         m_videoFullscreenModel->fullscreenModeChanged(m_mode);
 }
 
-void WebVideoFullscreenInterfaceMac::rateChanged(bool isPlaying, float playbackRate)
+void VideoFullscreenInterfaceMac::rateChanged(bool isPlaying, float playbackRate)
 {
     [videoFullscreenInterfaceObjC() updateIsPlaying:isPlaying newPlaybackRate:playbackRate];
 }
 
-void WebVideoFullscreenInterfaceMac::ensureControlsManager()
+void VideoFullscreenInterfaceMac::ensureControlsManager()
 {
     m_playbackSessionInterface->ensureControlsManager();
 }
 
-WebVideoFullscreenInterfaceMacObjC *WebVideoFullscreenInterfaceMac::videoFullscreenInterfaceObjC()
+WebVideoFullscreenInterfaceMacObjC *VideoFullscreenInterfaceMac::videoFullscreenInterfaceObjC()
 {
     if (!m_webVideoFullscreenInterfaceObjC)
-        m_webVideoFullscreenInterfaceObjC = adoptNS([[WebVideoFullscreenInterfaceMacObjC alloc] initWithWebVideoFullscreenInterfaceMac:this]);
+        m_webVideoFullscreenInterfaceObjC = adoptNS([[WebVideoFullscreenInterfaceMacObjC alloc] initWithVideoFullscreenInterfaceMac:this]);
 
     return m_webVideoFullscreenInterfaceObjC.get();
 }
 
-void WebVideoFullscreenInterfaceMac::setupFullscreen(NSView& layerHostedView, const IntRect& initialRect, NSWindow *parentWindow, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback)
+void VideoFullscreenInterfaceMac::setupFullscreen(NSView& layerHostedView, const IntRect& initialRect, NSWindow *parentWindow, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::setupFullscreen(%p), initialRect:{%d, %d, %d, %d}, parentWindow:%p, mode:%d", this, initialRect.x(), initialRect.y(), initialRect.width(), initialRect.height(), parentWindow, mode);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::setupFullscreen(%p), initialRect:{%d, %d, %d, %d}, parentWindow:%p, mode:%d", this, initialRect.x(), initialRect.y(), initialRect.width(), initialRect.height(), parentWindow, mode);
 
     UNUSED_PARAM(allowsPictureInPicturePlayback);
     ASSERT(mode == HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
@@ -427,16 +427,16 @@ void WebVideoFullscreenInterfaceMac::setupFullscreen(NSView& layerHostedView, co
 
     [videoFullscreenInterfaceObjC() setUpPIPForVideoView:&layerHostedView withFrame:(NSRect)initialRect inWindow:parentWindow];
 
-    RefPtr<WebVideoFullscreenInterfaceMac> protectedThis(this);
+    RefPtr<VideoFullscreenInterfaceMac> protectedThis(this);
     dispatch_async(dispatch_get_main_queue(), [protectedThis, this] {
         if (m_fullscreenChangeObserver)
             m_fullscreenChangeObserver->didSetupFullscreen();
     });
 }
 
-void WebVideoFullscreenInterfaceMac::enterFullscreen()
+void VideoFullscreenInterfaceMac::enterFullscreen()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::enterFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::enterFullscreen(%p)", this);
 
     if (mode() == HTMLMediaElementEnums::VideoFullscreenModePictureInPicture) {
         [m_webVideoFullscreenInterfaceObjC enterPIP];
@@ -450,9 +450,9 @@ void WebVideoFullscreenInterfaceMac::enterFullscreen()
     }
 }
 
-void WebVideoFullscreenInterfaceMac::exitFullscreen(const IntRect& finalRect, NSWindow *parentWindow)
+void VideoFullscreenInterfaceMac::exitFullscreen(const IntRect& finalRect, NSWindow *parentWindow)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::exitFullscreen(%p), finalRect:{%d, %d, %d, %d}, parentWindow:%p", this, finalRect.x(), finalRect.y(), finalRect.width(), finalRect.height(), parentWindow);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::exitFullscreen(%p), finalRect:{%d, %d, %d, %d}, parentWindow:%p", this, finalRect.x(), finalRect.y(), finalRect.width(), finalRect.height(), parentWindow);
 
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [m_playbackSessionInterface->playBackControlsManager() setPictureInPictureActive:NO];
@@ -467,9 +467,9 @@ void WebVideoFullscreenInterfaceMac::exitFullscreen(const IntRect& finalRect, NS
         [m_webVideoFullscreenInterfaceObjC exitPIPAnimatingToRect:finalRect inWindow:parentWindow];
 }
 
-void WebVideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(%p), mode:%d", this, mode);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(%p), mode:%d", this, mode);
 
 #if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
     [m_playbackSessionInterface->playBackControlsManager() setPictureInPictureActive:NO];
@@ -479,7 +479,7 @@ void WebVideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(HTMLMe
         return;
 
     bool isExitingToStandardFullscreen = mode == HTMLMediaElementEnums::VideoFullscreenModeStandard;
-    // On Mac, standard fullscreen is handled by the Fullscreen API and not by WebVideoFullscreenManager.
+    // On Mac, standard fullscreen is handled by the Fullscreen API and not by VideoFullscreenManager.
     // Just update m_mode directly to HTMLMediaElementEnums::VideoFullscreenModeStandard in that case to keep
     // m_mode in sync with the fullscreen mode in HTMLMediaElement.
     if (isExitingToStandardFullscreen)
@@ -489,9 +489,9 @@ void WebVideoFullscreenInterfaceMac::exitFullscreenWithoutAnimationToMode(HTMLMe
     [m_webVideoFullscreenInterfaceObjC exitPIP];
 }
 
-void WebVideoFullscreenInterfaceMac::cleanupFullscreen()
+void VideoFullscreenInterfaceMac::cleanupFullscreen()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::cleanupFullscreen(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::cleanupFullscreen(%p)", this);
 
     [m_webVideoFullscreenInterfaceObjC exitPIP];
     [m_webVideoFullscreenInterfaceObjC invalidateFullscreenState];
@@ -500,9 +500,9 @@ void WebVideoFullscreenInterfaceMac::cleanupFullscreen()
         m_fullscreenChangeObserver->didCleanupFullscreen();
 }
 
-void WebVideoFullscreenInterfaceMac::invalidate()
+void VideoFullscreenInterfaceMac::invalidate()
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::invalidate(%p)", this);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::invalidate(%p)", this);
 
     m_videoFullscreenModel = nil;
     m_fullscreenChangeObserver = nil;
@@ -520,9 +520,9 @@ static const char* boolString(bool val)
 }
 #endif
 
-void WebVideoFullscreenInterfaceMac::preparedToReturnToInline(bool visible, const IntRect& inlineRect, NSWindow *parentWindow)
+void VideoFullscreenInterfaceMac::preparedToReturnToInline(bool visible, const IntRect& inlineRect, NSWindow *parentWindow)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::preparedToReturnToInline(%p), visible:%s, inlineRect:{%d, %d, %d, %d}, parentWindow:%p", this, boolString(visible), inlineRect.x(), inlineRect.y(), inlineRect.width(), inlineRect.height(), parentWindow);
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::preparedToReturnToInline(%p), visible:%s, inlineRect:{%d, %d, %d, %d}, parentWindow:%p", this, boolString(visible), inlineRect.x(), inlineRect.y(), inlineRect.width(), inlineRect.height(), parentWindow);
 
     if (!visible) {
         [m_webVideoFullscreenInterfaceObjC exitPIP];
@@ -533,32 +533,32 @@ void WebVideoFullscreenInterfaceMac::preparedToReturnToInline(bool visible, cons
     [m_webVideoFullscreenInterfaceObjC exitPIPAnimatingToRect:(NSRect)inlineRect inWindow:parentWindow];
 }
 
-void WebVideoFullscreenInterfaceMac::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String&)
+void VideoFullscreenInterfaceMac::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String&)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::externalPlaybackChanged(%p), enabled:%s", this, boolString(enabled));
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::externalPlaybackChanged(%p), enabled:%s", this, boolString(enabled));
 
     if (enabled && m_mode == HTMLMediaElementEnums::VideoFullscreenModePictureInPicture)
         exitFullscreen(IntRect(), nil);
 }
 
-void WebVideoFullscreenInterfaceMac::hasVideoChanged(bool hasVideo)
+void VideoFullscreenInterfaceMac::hasVideoChanged(bool hasVideo)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::hasVideoChanged(%p):%s", this, boolString(hasVideo));
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::hasVideoChanged(%p):%s", this, boolString(hasVideo));
 
     if (!hasVideo)
         exitFullscreenWithoutAnimationToMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
 }
 
-void WebVideoFullscreenInterfaceMac::videoDimensionsChanged(const FloatSize& videoDimensions)
+void VideoFullscreenInterfaceMac::videoDimensionsChanged(const FloatSize& videoDimensions)
 {
-    LOG(Fullscreen, "WebVideoFullscreenInterfaceMac::videoDimensionsChanged(%p), width:%.0f, height:%.0f", this, videoDimensions.width(), videoDimensions.height());
+    LOG(Fullscreen, "VideoFullscreenInterfaceMac::videoDimensionsChanged(%p), width:%.0f, height:%.0f", this, videoDimensions.width(), videoDimensions.height());
 
     // Width and height can be zero when we are transitioning from one video to another. Ignore zero values.
     if (!videoDimensions.isZero())
         [m_webVideoFullscreenInterfaceObjC setVideoDimensions:videoDimensions];
 }
 
-bool WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() const
+bool VideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() const
 {
     return hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture) && [m_webVideoFullscreenInterfaceObjC isPlaying];
 }
index 705d63b..767f012 100644 (file)
@@ -30,7 +30,7 @@
 #import <wtf/Vector.h>
 
 namespace WebCore {
-class WebPlaybackSessionInterfaceMac;
+class PlaybackSessionInterfaceMac;
 struct MediaSelectionOption;
 }
 
@@ -58,10 +58,10 @@ WEBCORE_EXPORT
     float _rate;
     BOOL _canTogglePlayback;
 
-    RefPtr<WebCore::WebPlaybackSessionInterfaceMac> _webPlaybackSessionInterfaceMac;
+    RefPtr<WebCore::PlaybackSessionInterfaceMac> _playbackSessionInterfaceMac;
 }
 
-@property (assign) WebCore::WebPlaybackSessionInterfaceMac* webPlaybackSessionInterfaceMac;
+@property (assign) WebCore::PlaybackSessionInterfaceMac* playbackSessionInterfaceMac;
 @property (readwrite) NSTimeInterval contentDuration;
 @property (nonatomic, retain, readwrite) AVValueTiming *timing;
 @property (nonatomic) NSTimeInterval seekToTime;
index 7b44a07..abbdb52 100644 (file)
@@ -29,8 +29,8 @@
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
 
 #import "MediaSelectionOption.h"
-#import "WebPlaybackSessionInterfaceMac.h"
-#import "WebPlaybackSessionModel.h"
+#import "PlaybackSessionInterfaceMac.h"
+#import "PlaybackSessionModel.h"
 #import <wtf/SoftLinking.h>
 #import <wtf/text/WTFString.h>
 
@@ -59,8 +59,8 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVFunctionBarMediaSelectionOption)
 
 - (void)dealloc
 {
-    if (_webPlaybackSessionInterfaceMac)
-        _webPlaybackSessionInterfaceMac->setPlayBackControlsManager(nullptr);
+    if (_playbackSessionInterfaceMac)
+        _playbackSessionInterfaceMac->setPlayBackControlsManager(nullptr);
     [super dealloc];
 }
 
@@ -93,7 +93,7 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVFunctionBarMediaSelectionOption)
 {
     UNUSED_PARAM(toleranceBefore);
     UNUSED_PARAM(toleranceAfter);
-    _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->seekToTime(time);
+    _playbackSessionInterfaceMac->playbackSessionModel()->seekToTime(time);
 }
 
 - (void)cancelThumbnailAndAudioAmplitudeSampleGeneration
@@ -125,12 +125,12 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVFunctionBarMediaSelectionOption)
 
 - (void)beginTouchBarScrubbing
 {
-    _webPlaybackSessionInterfaceMac->beginScrubbing();
+    _playbackSessionInterfaceMac->beginScrubbing();
 }
 
 - (void)endTouchBarScrubbing
 {
-    _webPlaybackSessionInterfaceMac->endScrubbing();
+    _playbackSessionInterfaceMac->endScrubbing();
 }
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
@@ -192,7 +192,7 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVFunctionBarMediaSelectionOption)
     if (audioMediaSelectionOption && _audioTouchBarMediaSelectionOptions)
         index = [_audioTouchBarMediaSelectionOptions indexOfObject:audioMediaSelectionOption];
 
-    _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->selectAudioMediaOption(index != NSNotFound ? index : UINT64_MAX);
+    _playbackSessionInterfaceMac->playbackSessionModel()->selectAudioMediaOption(index != NSNotFound ? index : UINT64_MAX);
 }
 
 - (NSArray<AVTouchBarMediaSelectionOption *> *)legibleTouchBarMediaSelectionOptions
@@ -222,7 +222,7 @@ SOFT_LINK_CLASS_OPTIONAL(AVKit, AVFunctionBarMediaSelectionOption)
     if (legibleMediaSelectionOption && _legibleTouchBarMediaSelectionOptions)
         index = [_legibleTouchBarMediaSelectionOptions indexOfObject:legibleMediaSelectionOption];
 
-    _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->selectLegibleMediaOption(index != NSNotFound ? index : UINT64_MAX);
+    _playbackSessionInterfaceMac->playbackSessionModel()->selectLegibleMediaOption(index != NSNotFound ? index : UINT64_MAX);
 }
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
@@ -292,47 +292,47 @@ static RetainPtr<NSMutableArray> mediaSelectionOptions(const Vector<MediaSelecti
     [self didChangeValueForKey:@"currentLegibleTouchBarMediaSelectionOption"];
 }
 
-- (WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac
+- (PlaybackSessionInterfaceMac*)playbackSessionInterfaceMac
 {
-    return _webPlaybackSessionInterfaceMac.get();
+    return _playbackSessionInterfaceMac.get();
 }
 
-- (void)setWebPlaybackSessionInterfaceMac:(WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac
+- (void)setPlaybackSessionInterfaceMac:(PlaybackSessionInterfaceMac*)playbackSessionInterfaceMac
 {
-    if (_webPlaybackSessionInterfaceMac == webPlaybackSessionInterfaceMac)
+    if (_playbackSessionInterfaceMac == playbackSessionInterfaceMac)
         return;
 
-    if (_webPlaybackSessionInterfaceMac)
-        _webPlaybackSessionInterfaceMac->setPlayBackControlsManager(nullptr);
+    if (_playbackSessionInterfaceMac)
+        _playbackSessionInterfaceMac->setPlayBackControlsManager(nullptr);
 
-    _webPlaybackSessionInterfaceMac = webPlaybackSessionInterfaceMac;
+    _playbackSessionInterfaceMac = playbackSessionInterfaceMac;
 
-    if (_webPlaybackSessionInterfaceMac)
-        _webPlaybackSessionInterfaceMac->setPlayBackControlsManager(self);
+    if (_playbackSessionInterfaceMac)
+        _playbackSessionInterfaceMac->setPlayBackControlsManager(self);
 }
 
 - (void)togglePlayback
 {
-    if (_webPlaybackSessionInterfaceMac && _webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
-        _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->togglePlayState();
+    if (_playbackSessionInterfaceMac && _playbackSessionInterfaceMac->playbackSessionModel())
+        _playbackSessionInterfaceMac->playbackSessionModel()->togglePlayState();
 }
 
 - (void)setPlaying:(BOOL)playing
 {
-    if (!_webPlaybackSessionInterfaceMac || !_webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
+    if (!_playbackSessionInterfaceMac || !_playbackSessionInterfaceMac->playbackSessionModel())
         return;
 
     BOOL isCurrentlyPlaying = self.playing;
     if (!isCurrentlyPlaying && playing)
-        _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->play();
+        _playbackSessionInterfaceMac->playbackSessionModel()->play();
     else if (isCurrentlyPlaying && !playing)
-        _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->pause();
+        _playbackSessionInterfaceMac->playbackSessionModel()->pause();
 }
 
 - (BOOL)isPlaying
 {
-    if (_webPlaybackSessionInterfaceMac && _webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
-        return _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->isPlaying();
+    if (_playbackSessionInterfaceMac && _playbackSessionInterfaceMac->playbackSessionModel())
+        return _playbackSessionInterfaceMac->playbackSessionModel()->isPlaying();
 
     return NO;
 }
@@ -340,8 +340,8 @@ static RetainPtr<NSMutableArray> mediaSelectionOptions(const Vector<MediaSelecti
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
 - (void)togglePictureInPicture
 {
-    if (_webPlaybackSessionInterfaceMac && _webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
-        _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->togglePictureInPicture();
+    if (_playbackSessionInterfaceMac && _playbackSessionInterfaceMac->playbackSessionModel())
+        _playbackSessionInterfaceMac->playbackSessionModel()->togglePictureInPicture();
 }
 #endif
 
index c116810..723f5b4 100644 (file)
@@ -1,3 +1,45 @@
+2017-07-28  Jeremy Jones  <jeremyj@apple.com>
+
+        Remove Web prefix from WebVideoFullscreen and WebPlaybackSession classes.
+        https://bugs.webkit.org/show_bug.cgi?id=174437
+
+        Reviewed by Darin Adler.
+
+        Remove redundant Web- prefix from classes in WebKit namespace.
+
+        * DerivedSources.make:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/Cocoa/PlaybackSessionManagerProxy.h: Renamed from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.h.
+        * UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in: Renamed from Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.messages.in.
+        * UIProcess/Cocoa/PlaybackSessionManagerProxy.mm: Added.
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.h: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h.
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.messages.in.
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm: Renamed from Source/WebKit/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm.
+        * UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm: Removed.
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::updateMediaTouchBar):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::m_weakPtrFactory):
+        (WebKit::WebPageProxy::reattachToWebProcess):
+        (WebKit::WebPageProxy::playbackSessionManager):
+        (WebKit::WebPageProxy::videoFullscreenManager):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::playbackSessionManager):
+        (WebKit::WebPage::videoFullscreenManager):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/cocoa/PlaybackSessionManager.h: Renamed from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.h.
+        * WebProcess/cocoa/PlaybackSessionManager.messages.in: Renamed from Source/WebKit/WebProcess/cocoa/WebPlaybackSessionManager.messages.in.
+        * WebProcess/cocoa/PlaybackSessionManager.mm: Added.
+        * WebProcess/cocoa/VideoFullscreenManager.h: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.h.
+        (WebKit::VideoFullscreenInterfaceContext::create):
+        * WebProcess/cocoa/VideoFullscreenManager.messages.in: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.messages.in.
+        * WebProcess/cocoa/VideoFullscreenManager.mm: Renamed from Source/WebKit/WebProcess/cocoa/WebVideoFullscreenManager.mm.
+        * WebProcess/cocoa/WebPlaybackSessionManager.mm: Removed.
+
 2017-07-27  Zan Dobersek  <zdobersek@igalia.com>
 
         [CMake] Re-add the StorageProcess executable target
index 816f60e..32d7e88 100644 (file)
@@ -154,8 +154,8 @@ MESSAGE_RECEIVERS = \
     WebPasteboardProxy \
     WebPaymentCoordinator \
     WebPaymentCoordinatorProxy \
-    WebPlaybackSessionManager \
-    WebPlaybackSessionManagerProxy \
+    PlaybackSessionManager \
+    PlaybackSessionManagerProxy \
     WebProcess \
     WebProcessConnection \
     WebProcessPool \
@@ -168,8 +168,8 @@ MESSAGE_RECEIVERS = \
     WebSocketStream \
     WebUserContentController \
     WebUserContentControllerProxy \
-    WebVideoFullscreenManager \
-    WebVideoFullscreenManagerProxy \
+    VideoFullscreenManager \
+    VideoFullscreenManagerProxy \
 #
 
 SCRIPTS = \
index 44811a0..a2c0ab3 100644 (file)
 #import "RemoteLayerTreeDrawingAreaProxy.h"
 #import "RemoteScrollingCoordinatorProxy.h"
 #import "UIKitSPI.h"
+#import "VideoFullscreenManagerProxy.h"
 #import "WKContentViewInteraction.h"
 #import "WKPDFView.h"
 #import "WKPasswordView.h"
 #import "WKScrollView.h"
 #import "WKWebViewContentProviderRegistry.h"
-#import "WebVideoFullscreenManagerProxy.h"
 #import "_WKWebViewPrintFormatter.h"
 #import <UIKit/UIApplication.h>
 #import <WebCore/CoreGraphicsSPI.h>
@@ -31,8 +31,8 @@
 #include <WebCore/GraphicsLayer.h>
 #include <WebCore/MediaSelectionOption.h>
 #include <WebCore/PlatformView.h>
+#include <WebCore/PlaybackSessionModel.h>
 #include <WebCore/TimeRanges.h>
-#include <WebCore/WebPlaybackSessionModel.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(IOS)
-#include <WebCore/WebPlaybackSessionInterfaceAVKit.h>
+#include <WebCore/PlaybackSessionInterfaceAVKit.h>
 #else
-#include <WebCore/WebPlaybackSessionInterfaceMac.h>
+#include <WebCore/PlaybackSessionInterfaceMac.h>
 #endif
 
 #if PLATFORM(IOS)
-typedef WebCore::WebPlaybackSessionInterfaceAVKit PlatformWebPlaybackSessionInterface;
+typedef WebCore::PlaybackSessionInterfaceAVKit PlatformPlaybackSessionInterface;
 #else
-typedef WebCore::WebPlaybackSessionInterfaceMac PlatformWebPlaybackSessionInterface;
+typedef WebCore::PlaybackSessionInterfaceMac PlatformPlaybackSessionInterface;
 #endif
 
 namespace WebKit {
 
 class WebPageProxy;
-class WebPlaybackSessionManagerProxy;
+class PlaybackSessionManagerProxy;
 
-class WebPlaybackSessionModelContext final: public RefCounted<WebPlaybackSessionModelContext>, public WebCore::WebPlaybackSessionModel  {
+class PlaybackSessionModelContext final: public RefCounted<PlaybackSessionModelContext>, public WebCore::PlaybackSessionModel  {
 public:
-    static Ref<WebPlaybackSessionModelContext> create(WebPlaybackSessionManagerProxy& manager, uint64_t contextId)
+    static Ref<PlaybackSessionModelContext> create(PlaybackSessionManagerProxy& manager, uint64_t contextId)
     {
-        return adoptRef(*new WebPlaybackSessionModelContext(manager, contextId));
+        return adoptRef(*new PlaybackSessionModelContext(manager, contextId));
     }
-    virtual ~WebPlaybackSessionModelContext() { }
+    virtual ~PlaybackSessionModelContext() { }
 
     void invalidate() { m_manager = nullptr; }
 
-    // WebPlaybackSessionModel
-    void addClient(WebCore::WebPlaybackSessionModelClient&) final;
-    void removeClient(WebCore::WebPlaybackSessionModelClient&)final;
+    // PlaybackSessionModel
+    void addClient(WebCore::PlaybackSessionModelClient&) final;
+    void removeClient(WebCore::PlaybackSessionModelClient&)final;
 
     void durationChanged(double);
     void currentTimeChanged(double);
@@ -81,20 +81,20 @@ public:
     void legibleMediaSelectionOptionsChanged(const Vector<WebCore::MediaSelectionOption>& options, uint64_t index);
     void audioMediaSelectionIndexChanged(uint64_t selectedIndex);
     void legibleMediaSelectionIndexChanged(uint64_t selectedIndex);
-    void externalPlaybackChanged(bool, WebPlaybackSessionModel::ExternalPlaybackTargetType, const String&);
+    void externalPlaybackChanged(bool, PlaybackSessionModel::ExternalPlaybackTargetType, const String&);
     void wirelessVideoPlaybackDisabledChanged(bool);
     void mutedChanged(bool);
 
 private:
-    friend class WebVideoFullscreenModelContext;
+    friend class VideoFullscreenModelContext;
 
-    WebPlaybackSessionModelContext(WebPlaybackSessionManagerProxy& manager, uint64_t contextId)
+    PlaybackSessionModelContext(PlaybackSessionManagerProxy& manager, uint64_t contextId)
         : m_manager(&manager)
         , m_contextId(contextId)
     {
     }
 
-    // WebPlaybackSessionModel
+    // PlaybackSessionModel
     void play() final;
     void pause() final;
     void togglePlayState() final;
@@ -127,14 +127,14 @@ private:
     Vector<WebCore::MediaSelectionOption> legibleMediaSelectionOptions() const final { return m_legibleMediaSelectionOptions; }
     uint64_t legibleMediaSelectedIndex() const final { return m_legibleMediaSelectedIndex; }
     bool externalPlaybackEnabled() const final { return m_externalPlaybackEnabled; }
-    WebPlaybackSessionModel::ExternalPlaybackTargetType externalPlaybackTargetType() const final { return m_externalPlaybackTargetType; }
+    PlaybackSessionModel::ExternalPlaybackTargetType externalPlaybackTargetType() const final { return m_externalPlaybackTargetType; }
     String externalPlaybackLocalizedDeviceName() const final { return m_externalPlaybackLocalizedDeviceName; }
     bool wirelessVideoPlaybackDisabled() const final { return m_wirelessVideoPlaybackDisabled; }
     bool isMuted() const final { return m_muted; }
 
-    WebPlaybackSessionManagerProxy* m_manager;
+    PlaybackSessionManagerProxy* m_manager;
     uint64_t m_contextId;
-    HashSet<WebCore::WebPlaybackSessionModelClient*> m_clients;
+    HashSet<WebCore::PlaybackSessionModelClient*> m_clients;
     double m_playbackStartedTime { 0 };
     bool m_playbackStartedTimeNeedsUpdate { false };
     double m_duration { 0 };
@@ -152,38 +152,38 @@ private:
     Vector<WebCore::MediaSelectionOption> m_legibleMediaSelectionOptions;
     uint64_t m_legibleMediaSelectedIndex { 0 };
     bool m_externalPlaybackEnabled { false };
-    WebPlaybackSessionModel::ExternalPlaybackTargetType m_externalPlaybackTargetType { WebPlaybackSessionModel::TargetTypeNone };
+    PlaybackSessionModel::ExternalPlaybackTargetType m_externalPlaybackTargetType { PlaybackSessionModel::TargetTypeNone };
     String m_externalPlaybackLocalizedDeviceName;
     bool m_wirelessVideoPlaybackDisabled { false };
     bool m_muted { false };
 };
 
-class WebPlaybackSessionManagerProxy : public RefCounted<WebPlaybackSessionManagerProxy>, private IPC::MessageReceiver {
+class PlaybackSessionManagerProxy : public RefCounted<PlaybackSessionManagerProxy>, private IPC::MessageReceiver {
 public:
-    static RefPtr<WebPlaybackSessionManagerProxy> create(WebPageProxy&);
-    virtual ~WebPlaybackSessionManagerProxy();
+    static RefPtr<PlaybackSessionManagerProxy> create(WebPageProxy&);
+    virtual ~PlaybackSessionManagerProxy();
 
     void invalidate();
 
-    PlatformWebPlaybackSessionInterface* controlsManagerInterface();
+    PlatformPlaybackSessionInterface* controlsManagerInterface();
     void requestControlledElementID();
 
 private:
-    friend class WebPlaybackSessionModelContext;
-    friend class WebVideoFullscreenManagerProxy;
+    friend class PlaybackSessionModelContext;
+    friend class VideoFullscreenManagerProxy;
 
-    explicit WebPlaybackSessionManagerProxy(WebPageProxy&);
+    explicit PlaybackSessionManagerProxy(WebPageProxy&);
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
 
-    typedef std::tuple<RefPtr<WebPlaybackSessionModelContext>, RefPtr<PlatformWebPlaybackSessionInterface>> ModelInterfaceTuple;
+    typedef std::tuple<RefPtr<PlaybackSessionModelContext>, RefPtr<PlatformPlaybackSessionInterface>> ModelInterfaceTuple;
     ModelInterfaceTuple createModelAndInterface(uint64_t contextId);
     ModelInterfaceTuple& ensureModelAndInterface(uint64_t contextId);
-    WebPlaybackSessionModelContext& ensureModel(uint64_t contextId);
-    PlatformWebPlaybackSessionInterface& ensureInterface(uint64_t contextId);
+    PlaybackSessionModelContext& ensureModel(uint64_t contextId);
+    PlatformPlaybackSessionInterface& ensureInterface(uint64_t contextId);
     void addClientForContext(uint64_t contextId);
     void removeClientForContext(uint64_t contextId);
 
-    // Messages from WebPlaybackSessionManager
+    // Messages from PlaybackSessionManager
     void setUpPlaybackControlsManagerWithID(uint64_t contextId);
     void clearPlaybackControlsManager();
     void resetMediaState(uint64_t contextId);
@@ -203,7 +203,7 @@ private:
     void handleControlledElementIDResponse(uint64_t, String) const;
     void mutedChanged(uint64_t contextId, bool muted);
 
-    // Messages to WebPlaybackSessionManager
+    // Messages to PlaybackSessionManager
     void play(uint64_t contextId);
     void pause(uint64_t contextId);
     void togglePlayState(uint64_t contextId);
@@ -21,7 +21,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-messages -> WebPlaybackSessionManagerProxy {
+messages -> PlaybackSessionManagerProxy {
     ResetMediaState(uint64_t contextId)
     CurrentTimeChanged(uint64_t contextId, double currentTime, double hostTime)
     BufferedTimeChanged(uint64_t contextId, double bufferedTime)
diff --git a/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm b/Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm
new file mode 100644 (file)
index 0000000..42c399e
--- /dev/null
@@ -0,0 +1,565 @@
+/*
+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "PlaybackSessionManagerProxy.h"
+
+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+
+#import "PlaybackSessionManagerMessages.h"
+#import "PlaybackSessionManagerProxyMessages.h"
+#import "WebPageProxy.h"
+#import "WebProcessProxy.h"
+#import <WebKitSystemInterface.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+#pragma mark - PlaybackSessionModelContext
+
+void PlaybackSessionModelContext::addClient(PlaybackSessionModelClient& client)
+{
+    ASSERT(!m_clients.contains(&client));
+    m_clients.add(&client);
+}
+
+void PlaybackSessionModelContext::removeClient(PlaybackSessionModelClient& client)
+{
+    ASSERT(m_clients.contains(&client));
+    m_clients.remove(&client);
+}
+
+void PlaybackSessionModelContext::play()
+{
+    if (m_manager)
+        m_manager->play(m_contextId);
+}
+
+void PlaybackSessionModelContext::pause()
+{
+    if (m_manager)
+        m_manager->pause(m_contextId);
+}
+
+void PlaybackSessionModelContext::togglePlayState()
+{
+    if (m_manager)
+        m_manager->togglePlayState(m_contextId);
+}
+
+void PlaybackSessionModelContext::beginScrubbing()
+{
+    if (m_manager)
+        m_manager->beginScrubbing(m_contextId);
+
+    m_isScrubbing = true;
+}
+
+void PlaybackSessionModelContext::endScrubbing()
+{
+    if (m_manager)
+        m_manager->endScrubbing(m_contextId);
+
+    m_isScrubbing = false;
+    m_playbackStartedTimeNeedsUpdate = isPlaying();
+}
+
+void PlaybackSessionModelContext::seekToTime(double time)
+{
+    if (m_manager)
+        m_manager->seekToTime(m_contextId, time);
+}
+
+void PlaybackSessionModelContext::fastSeek(double time)
+{
+    if (m_manager)
+        m_manager->fastSeek(m_contextId, time);
+}
+
+void PlaybackSessionModelContext::beginScanningForward()
+{
+    if (m_manager)
+        m_manager->beginScanningForward(m_contextId);
+}
+
+void PlaybackSessionModelContext::beginScanningBackward()
+{
+    if (m_manager)
+        m_manager->beginScanningBackward(m_contextId);
+}
+
+void PlaybackSessionModelContext::endScanning()
+{
+    if (m_manager)
+        m_manager->endScanning(m_contextId);
+}
+
+void PlaybackSessionModelContext::selectAudioMediaOption(uint64_t optionId)
+{
+    if (m_manager)
+        m_manager->selectAudioMediaOption(m_contextId, optionId);
+}
+
+void PlaybackSessionModelContext::selectLegibleMediaOption(uint64_t optionId)
+{
+    if (m_manager)
+        m_manager->selectLegibleMediaOption(m_contextId, optionId);
+}
+
+void PlaybackSessionModelContext::togglePictureInPicture()
+{
+    if (m_manager)
+        m_manager->togglePictureInPicture(m_contextId);
+}
+
+void PlaybackSessionModelContext::toggleMuted()
+{
+    if (m_manager)
+        m_manager->toggleMuted(m_contextId);
+}
+
+void PlaybackSessionModelContext::setMuted(bool muted)
+{
+    if (m_manager)
+        m_manager->setMuted(m_contextId, muted);
+}
+
+void PlaybackSessionModelContext::playbackStartedTimeChanged(double playbackStartedTime)
+{
+    m_playbackStartedTime = playbackStartedTime;
+    m_playbackStartedTimeNeedsUpdate = false;
+}
+
+void PlaybackSessionModelContext::durationChanged(double duration)
+{
+    m_duration = duration;
+    for (auto* client : m_clients)
+        client->durationChanged(duration);
+}
+
+void PlaybackSessionModelContext::currentTimeChanged(double currentTime)
+{
+    m_currentTime = currentTime;
+    auto anchorTime = [[NSProcessInfo processInfo] systemUptime];
+    if (m_playbackStartedTimeNeedsUpdate)
+        playbackStartedTimeChanged(currentTime);
+
+    for (auto* client : m_clients)
+        client->currentTimeChanged(currentTime, anchorTime);
+}
+
+void PlaybackSessionModelContext::bufferedTimeChanged(double bufferedTime)
+{
+    m_bufferedTime = bufferedTime;
+    for (auto* client : m_clients)
+        client->bufferedTimeChanged(bufferedTime);
+}
+
+void PlaybackSessionModelContext::rateChanged(bool isPlaying, float playbackRate)
+{
+    m_isPlaying = isPlaying;
+    m_playbackRate = playbackRate;
+    for (auto* client : m_clients)
+        client->rateChanged(isPlaying, playbackRate);
+}
+
+void PlaybackSessionModelContext::seekableRangesChanged(WebCore::TimeRanges& seekableRanges, double lastModifiedTime, double liveUpdateInterval)
+{
+    m_seekableRanges = seekableRanges;
+    m_seekableTimeRangesLastModifiedTime = lastModifiedTime;
+    m_liveUpdateInterval = liveUpdateInterval;
+    for (auto* client : m_clients)
+        client->seekableRangesChanged(seekableRanges, lastModifiedTime, liveUpdateInterval);
+}
+
+void PlaybackSessionModelContext::canPlayFastReverseChanged(bool canPlayFastReverse)
+{
+    m_canPlayFastReverse = canPlayFastReverse;
+    for (auto* client : m_clients)
+        client->canPlayFastReverseChanged(canPlayFastReverse);
+}
+
+void PlaybackSessionModelContext::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& audioMediaSelectionOptions, uint64_t audioMediaSelectedIndex)
+{
+    m_audioMediaSelectionOptions = audioMediaSelectionOptions;
+    m_audioMediaSelectedIndex = audioMediaSelectedIndex;
+    for (auto* client : m_clients)
+        client->audioMediaSelectionOptionsChanged(audioMediaSelectionOptions, audioMediaSelectedIndex);
+}
+
+void PlaybackSessionModelContext::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& legibleMediaSelectionOptions, uint64_t legibleMediaSelectedIndex)
+{
+    m_legibleMediaSelectionOptions = legibleMediaSelectionOptions;
+    m_legibleMediaSelectedIndex = legibleMediaSelectedIndex;
+
+    for (auto* client : m_clients)
+        client->legibleMediaSelectionOptionsChanged(legibleMediaSelectionOptions, legibleMediaSelectedIndex);
+}
+
+void PlaybackSessionModelContext::audioMediaSelectionIndexChanged(uint64_t selectedIndex)
+{
+    m_audioMediaSelectedIndex = selectedIndex;
+
+    for (auto* client : m_clients)
+        client->audioMediaSelectionIndexChanged(selectedIndex);
+}
+
+void PlaybackSessionModelContext::legibleMediaSelectionIndexChanged(uint64_t selectedIndex)
+{
+    m_legibleMediaSelectedIndex = selectedIndex;
+
+    for (auto* client : m_clients)
+        client->legibleMediaSelectionIndexChanged(selectedIndex);
+}
+
+void PlaybackSessionModelContext::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType type, const String& localizedName)
+{
+    m_externalPlaybackEnabled = enabled;
+    m_externalPlaybackTargetType = type;
+    m_externalPlaybackLocalizedDeviceName = localizedName;
+
+    for (auto* client : m_clients)
+        client->externalPlaybackChanged(enabled, type, localizedName);
+}
+
+void PlaybackSessionModelContext::wirelessVideoPlaybackDisabledChanged(bool wirelessVideoPlaybackDisabled)
+{
+    m_wirelessVideoPlaybackDisabled = wirelessVideoPlaybackDisabled;
+    for (auto* client : m_clients)
+        client->wirelessVideoPlaybackDisabledChanged(wirelessVideoPlaybackDisabled);
+}
+
+void PlaybackSessionModelContext::mutedChanged(bool muted)
+{
+    m_muted = muted;
+    for (auto* client : m_clients)
+        client->mutedChanged(muted);
+}
+
+#pragma mark - PlaybackSessionManagerProxy
+
+RefPtr<PlaybackSessionManagerProxy> PlaybackSessionManagerProxy::create(WebPageProxy& page)
+{
+    return adoptRef(new PlaybackSessionManagerProxy(page));
+}
+
+PlaybackSessionManagerProxy::PlaybackSessionManagerProxy(WebPageProxy& page)
+    : m_page(&page)
+{
+    m_page->process().addMessageReceiver(Messages::PlaybackSessionManagerProxy::messageReceiverName(), m_page->pageID(), *this);
+}
+
+PlaybackSessionManagerProxy::~PlaybackSessionManagerProxy()
+{
+    if (!m_page)
+        return;
+    invalidate();
+}
+
+void PlaybackSessionManagerProxy::invalidate()
+{
+    m_page->process().removeMessageReceiver(Messages::PlaybackSessionManagerProxy::messageReceiverName(), m_page->pageID());
+    m_page = nullptr;
+
+    for (auto& tuple : m_contextMap.values()) {
+        RefPtr<PlaybackSessionModelContext> model;
+        RefPtr<PlatformPlaybackSessionInterface> interface;
+        std::tie(model, interface) = tuple;
+
+        interface->invalidate();
+    }
+
+    m_contextMap.clear();
+    m_clientCounts.clear();
+}
+
+PlaybackSessionManagerProxy::ModelInterfaceTuple PlaybackSessionManagerProxy::createModelAndInterface(uint64_t contextId)
+{
+    Ref<PlaybackSessionModelContext> model = PlaybackSessionModelContext::create(*this, contextId);
+    Ref<PlatformPlaybackSessionInterface> interface = PlatformPlaybackSessionInterface::create(model);
+
+    return std::make_tuple(WTFMove(model), WTFMove(interface));
+}
+
+PlaybackSessionManagerProxy::ModelInterfaceTuple& PlaybackSessionManagerProxy::ensureModelAndInterface(uint64_t contextId)
+{
+    auto addResult = m_contextMap.add(contextId, ModelInterfaceTuple());
+    if (addResult.isNewEntry)
+        addResult.iterator->value = createModelAndInterface(contextId);
+    return addResult.iterator->value;
+}
+
+PlaybackSessionModelContext& PlaybackSessionManagerProxy::ensureModel(uint64_t contextId)
+{
+    return *std::get<0>(ensureModelAndInterface(contextId));
+}
+
+PlatformPlaybackSessionInterface& PlaybackSessionManagerProxy::ensureInterface(uint64_t contextId)
+{
+    return *std::get<1>(ensureModelAndInterface(contextId));
+}
+
+void PlaybackSessionManagerProxy::addClientForContext(uint64_t contextId)
+{
+    m_clientCounts.add(contextId);
+}
+
+void PlaybackSessionManagerProxy::removeClientForContext(uint64_t contextId)
+{
+    if (!m_clientCounts.remove(contextId))
+        return;
+
+    ensureInterface(contextId).invalidate();
+    m_contextMap.remove(contextId);
+}
+
+#pragma mark Messages from PlaybackSessionManager
+
+void PlaybackSessionManagerProxy::setUpPlaybackControlsManagerWithID(uint64_t contextId)
+{
+#if PLATFORM(MAC)
+    if (m_controlsManagerContextId == contextId)
+        return;
+
+    if (m_controlsManagerContextId)
+        removeClientForContext(m_controlsManagerContextId);
+
+    m_controlsManagerContextId = contextId;
+    ensureInterface(m_controlsManagerContextId).ensureControlsManager();
+    addClientForContext(m_controlsManagerContextId);
+
+    m_page->videoControlsManagerDidChange();
+#else
+    UNUSED_PARAM(contextId);
+#endif
+}
+
+void PlaybackSessionManagerProxy::clearPlaybackControlsManager()
+{
+#if PLATFORM(MAC)
+    if (!m_controlsManagerContextId)
+        return;
+
+    removeClientForContext(m_controlsManagerContextId);
+    m_controlsManagerContextId = 0;
+    m_page->videoControlsManagerDidChange();
+#endif
+}
+
+void PlaybackSessionManagerProxy::resetMediaState(uint64_t contextId)
+{
+    ensureInterface(contextId).resetMediaState();
+}
+
+void PlaybackSessionManagerProxy::currentTimeChanged(uint64_t contextId, double currentTime, double hostTime)
+{
+    ensureModel(contextId).currentTimeChanged(currentTime);
+}
+
+void PlaybackSessionManagerProxy::bufferedTimeChanged(uint64_t contextId, double bufferedTime)
+{
+    ensureModel(contextId).bufferedTimeChanged(bufferedTime);
+}
+
+void PlaybackSessionManagerProxy::seekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, double>> ranges, double lastModifiedTime, double liveUpdateInterval)
+{
+    Ref<TimeRanges> timeRanges = TimeRanges::create();
+    for (const auto& range : ranges) {
+        ASSERT(isfinite(range.first));
+        ASSERT(isfinite(range.second));
+        ASSERT(range.second >= range.first);
+        timeRanges->add(range.first, range.second);
+    }
+
+    ensureModel(contextId).seekableRangesChanged(timeRanges, lastModifiedTime, liveUpdateInterval);
+}
+
+void PlaybackSessionManagerProxy::canPlayFastReverseChanged(uint64_t contextId, bool value)
+{
+    ensureModel(contextId).canPlayFastReverseChanged(value);
+}
+
+void PlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex)
+{
+    ensureModel(contextId).audioMediaSelectionOptionsChanged(options, selectedIndex);
+}
+
+void PlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex)
+{
+    ensureModel(contextId).legibleMediaSelectionOptionsChanged(options, selectedIndex);
+}
+
+void PlaybackSessionManagerProxy::audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
+{
+    ensureModel(contextId).audioMediaSelectionIndexChanged(selectedIndex);
+}
+
+void PlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
+{
+    ensureModel(contextId).legibleMediaSelectionIndexChanged(selectedIndex);
+}
+
+void PlaybackSessionManagerProxy::externalPlaybackPropertiesChanged(uint64_t contextId, bool enabled, uint32_t targetType, String localizedDeviceName)
+{
+    PlaybackSessionModel::ExternalPlaybackTargetType type = static_cast<PlaybackSessionModel::ExternalPlaybackTargetType>(targetType);
+    ASSERT(type == PlaybackSessionModel::TargetTypeAirPlay || type == PlaybackSessionModel::TargetTypeTVOut || type == PlaybackSessionModel::TargetTypeNone);
+
+    ensureModel(contextId).externalPlaybackChanged(enabled, type, localizedDeviceName);
+}
+
+void PlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool disabled)
+{
+    ensureModel(contextId).wirelessVideoPlaybackDisabledChanged(disabled);
+}
+
+void PlaybackSessionManagerProxy::mutedChanged(uint64_t contextId, bool muted)
+{
+    ensureModel(contextId).mutedChanged(muted);
+}
+
+void PlaybackSessionManagerProxy::durationChanged(uint64_t contextId, double duration)
+{
+    ensureModel(contextId).durationChanged(duration);
+}
+
+void PlaybackSessionManagerProxy::playbackStartedTimeChanged(uint64_t contextId, double playbackStartedTime)
+{
+    ensureModel(contextId).playbackStartedTimeChanged(playbackStartedTime);
+}
+
+void PlaybackSessionManagerProxy::rateChanged(uint64_t contextId, bool isPlaying, double rate)
+{
+    ensureModel(contextId).rateChanged(isPlaying, rate);
+}
+
+
+void PlaybackSessionManagerProxy::handleControlledElementIDResponse(uint64_t contextId, String identifier) const
+{
+#if PLATFORM(MAC)
+    if (contextId == m_controlsManagerContextId)
+        m_page->handleControlledElementIDResponse(identifier);
+#else
+    UNUSED_PARAM(contextId);
+    UNUSED_PARAM(identifier);
+#endif
+}
+
+
+#pragma mark Messages to PlaybackSessionManager
+
+void PlaybackSessionManagerProxy::play(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::Play(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::pause(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::Pause(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::togglePlayState(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::TogglePlayState(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::beginScrubbing(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::BeginScrubbing(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::endScrubbing(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::EndScrubbing(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::seekToTime(uint64_t contextId, double time)
+{
+    m_page->send(Messages::PlaybackSessionManager::SeekToTime(contextId, time), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::fastSeek(uint64_t contextId, double time)
+{
+    m_page->send(Messages::PlaybackSessionManager::FastSeek(contextId, time), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::beginScanningForward(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::BeginScanningForward(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::beginScanningBackward(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::BeginScanningBackward(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::endScanning(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::EndScanning(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::selectAudioMediaOption(uint64_t contextId, uint64_t index)
+{
+    m_page->send(Messages::PlaybackSessionManager::SelectAudioMediaOption(contextId, index), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::selectLegibleMediaOption(uint64_t contextId, uint64_t index)
+{
+    m_page->send(Messages::PlaybackSessionManager::SelectLegibleMediaOption(contextId, index), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::togglePictureInPicture(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::TogglePictureInPicture(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::toggleMuted(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManager::ToggleMuted(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::setMuted(uint64_t contextId, bool muted)
+{
+    m_page->send(Messages::PlaybackSessionManager::SetMuted(contextId, muted), m_page->pageID());
+}
+
+void PlaybackSessionManagerProxy::requestControlledElementID()
+{
+    if (m_controlsManagerContextId)
+        m_page->send(Messages::PlaybackSessionManager::HandleControlledElementIDRequest(m_controlsManagerContextId), m_page->pageID());
+}
+
+PlatformPlaybackSessionInterface* PlaybackSessionManagerProxy::controlsManagerInterface()
+{
+    if (!m_controlsManagerContextId)
+        return nullptr;
+
+    auto& interface = ensureInterface(m_controlsManagerContextId);
+    return &interface;
+}
+
+} // namespace WebKit
+
+#endif // PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
 #include "MessageReceiver.h"
 #include <WebCore/GraphicsLayer.h>
 #include <WebCore/PlatformView.h>
-#include <WebCore/WebVideoFullscreenChangeObserver.h>
-#include <WebCore/WebVideoFullscreenModel.h>
+#include <WebCore/VideoFullscreenChangeObserver.h>
+#include <WebCore/VideoFullscreenModel.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(IOS)
-#include <WebCore/WebVideoFullscreenInterfaceAVKit.h>
+#include <WebCore/VideoFullscreenInterfaceAVKit.h>
 #else
-#include <WebCore/WebVideoFullscreenInterfaceMac.h>
+#include <WebCore/VideoFullscreenInterfaceMac.h>
 #endif
 
 #if PLATFORM(IOS)
-typedef WebCore::WebVideoFullscreenInterfaceAVKit PlatformWebVideoFullscreenInterface;
+typedef WebCore::VideoFullscreenInterfaceAVKit PlatformVideoFullscreenInterface;
 #else
-typedef WebCore::WebVideoFullscreenInterfaceMac PlatformWebVideoFullscreenInterface;
+typedef WebCore::VideoFullscreenInterfaceMac PlatformVideoFullscreenInterface;
 #endif
 
 namespace WebKit {
 
 class WebPageProxy;
-class WebPlaybackSessionManagerProxy;
-class WebPlaybackSessionModelContext;
-class WebVideoFullscreenManagerProxy;
-
-class WebVideoFullscreenModelContext final
-    : public RefCounted<WebVideoFullscreenModelContext>
-    , public WebCore::WebVideoFullscreenModel
-    , public WebCore::WebVideoFullscreenChangeObserver  {
+class PlaybackSessionManagerProxy;
+class PlaybackSessionModelContext;
+class VideoFullscreenManagerProxy;
+
+class VideoFullscreenModelContext final
+    : public RefCounted<VideoFullscreenModelContext>
+    , public WebCore::VideoFullscreenModel
+    , public WebCore::VideoFullscreenChangeObserver  {
 public:
-    static Ref<WebVideoFullscreenModelContext> create(WebVideoFullscreenManagerProxy& manager, WebPlaybackSessionModelContext& playbackSessionModel, uint64_t contextId)
+    static Ref<VideoFullscreenModelContext> create(VideoFullscreenManagerProxy& manager, PlaybackSessionModelContext& playbackSessionModel, uint64_t contextId)
     {
-        return adoptRef(*new WebVideoFullscreenModelContext(manager, playbackSessionModel, contextId));
+        return adoptRef(*new VideoFullscreenModelContext(manager, playbackSessionModel, contextId));
     }
-    virtual ~WebVideoFullscreenModelContext();
+    virtual ~VideoFullscreenModelContext();
 
     void invalidate() { m_manager = nullptr; }
 
@@ -73,11 +73,11 @@ public:
     void setLayerHostView(RetainPtr<PlatformView>&& layerHostView) { m_layerHostView = WTFMove(layerHostView); }
 
 private:
-    WebVideoFullscreenModelContext(WebVideoFullscreenManagerProxy&, WebPlaybackSessionModelContext&, uint64_t);
+    VideoFullscreenModelContext(VideoFullscreenManagerProxy&, PlaybackSessionModelContext&, uint64_t);
 
-    // WebVideoFullscreenModel
-    void addClient(WebCore::WebVideoFullscreenModelClient&) override;
-    void removeClient(WebCore::WebVideoFullscreenModelClient&) override;
+    // VideoFullscreenModel
+    void addClient(WebCore::VideoFullscreenModelClient&) override;
+    void removeClient(WebCore::VideoFullscreenModelClient&) override;
     void requestFullscreenMode(WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false) override;
     void setVideoLayerFrame(WebCore::FloatRect) override;
     void setVideoLayerGravity(VideoGravity) override;
@@ -86,26 +86,26 @@ private:
     bool hasVideo() const override { return m_hasVideo; }
     WebCore::FloatSize videoDimensions() const override { return m_videoDimensions; }
 
-    // WebVideoFullscreenChangeObserver
+    // VideoFullscreenChangeObserver
     void didSetupFullscreen() override;
     void didEnterFullscreen() override;
     void didExitFullscreen() override;
     void didCleanupFullscreen() override;
     void fullscreenMayReturnToInline() override;
 
-    WebVideoFullscreenManagerProxy* m_manager;
-    Ref<WebPlaybackSessionModelContext> m_playbackSessionModel;
+    VideoFullscreenManagerProxy* m_manager;
+    Ref<PlaybackSessionModelContext> m_playbackSessionModel;
     uint64_t m_contextId;
     RetainPtr<PlatformView *> m_layerHostView;
-    HashSet<WebCore::WebVideoFullscreenModelClient*> m_clients;
+    HashSet<WebCore::VideoFullscreenModelClient*> m_clients;
     WebCore::FloatSize m_videoDimensions;
     bool m_hasVideo { false };
 };
 
-class WebVideoFullscreenManagerProxy : public RefCounted<WebVideoFullscreenManagerProxy>, private IPC::MessageReceiver {
+class VideoFullscreenManagerProxy : public RefCounted<VideoFullscreenManagerProxy>, private IPC::MessageReceiver {
 public:
-    static RefPtr<WebVideoFullscreenManagerProxy> create(WebPageProxy&, WebPlaybackSessionManagerProxy&);
-    virtual ~WebVideoFullscreenManagerProxy();
+    static RefPtr<VideoFullscreenManagerProxy> create(WebPageProxy&, PlaybackSessionManagerProxy&);
+    virtual ~VideoFullscreenManagerProxy();
 
     void invalidate();
 
@@ -120,20 +120,20 @@ public:
 #endif
 
 private:
-    friend class WebVideoFullscreenModelContext;
+    friend class VideoFullscreenModelContext;
 
-    explicit WebVideoFullscreenManagerProxy(WebPageProxy&, WebPlaybackSessionManagerProxy&);
+    explicit VideoFullscreenManagerProxy(WebPageProxy&, PlaybackSessionManagerProxy&);
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
 
-    typedef std::tuple<RefPtr<WebVideoFullscreenModelContext>, RefPtr<PlatformWebVideoFullscreenInterface>> ModelInterfaceTuple;
+    typedef std::tuple<RefPtr<VideoFullscreenModelContext>, RefPtr<PlatformVideoFullscreenInterface>> ModelInterfaceTuple;
     ModelInterfaceTuple createModelAndInterface(uint64_t contextId);
     ModelInterfaceTuple& ensureModelAndInterface(uint64_t contextId);
-    WebVideoFullscreenModelContext& ensureModel(uint64_t contextId);
-    PlatformWebVideoFullscreenInterface& ensureInterface(uint64_t contextId);
+    VideoFullscreenModelContext& ensureModel(uint64_t contextId);
+    PlatformVideoFullscreenInterface& ensureInterface(uint64_t contextId);
     void addClientForContext(uint64_t contextId);
     void removeClientForContext(uint64_t contextId);
 
-    // Messages from WebVideoFullscreenManager
+    // Messages from VideoFullscreenManager
     void setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicture);
     void setHasVideo(uint64_t contextId, bool);
     void setVideoDimensions(uint64_t contextId, const WebCore::FloatSize&);
@@ -145,19 +145,19 @@ private:
     void exitFullscreenWithoutAnimationToMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
 #endif
 
-    // Messages to WebVideoFullscreenManager
+    // Messages to VideoFullscreenManager
     void requestFullscreenMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool finishedWithMedia = false);
     void didSetupFullscreen(uint64_t contextId);
     void didExitFullscreen(uint64_t contextId);
     void didEnterFullscreen(uint64_t contextId);
     void didCleanupFullscreen(uint64_t contextId);
     void setVideoLayerFrame(uint64_t contextId, WebCore::FloatRect);
-    void setVideoLayerGravity(uint64_t contextId, WebCore::WebVideoFullscreenModel::VideoGravity);
+    void setVideoLayerGravity(uint64_t contextId, WebCore::VideoFullscreenModel::VideoGravity);
     void fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
     void fullscreenMayReturnToInline(uint64_t contextId);
 
     WebPageProxy* m_page;
-    Ref<WebPlaybackSessionManagerProxy> m_playbackSessionManagerProxy;
+    Ref<PlaybackSessionManagerProxy> m_playbackSessionManagerProxy;
     HashMap<uint64_t, ModelInterfaceTuple> m_contextMap;
     uint64_t m_controlsManagerContextId { 0 };
     HashMap<uint64_t, int> m_clientCounts;
@@ -21,7 +21,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-messages -> WebVideoFullscreenManagerProxy {
+messages -> VideoFullscreenManagerProxy {
     SetHasVideo(uint64_t contextId, bool hasVideo)
     SetVideoDimensions(uint64_t contextId, WebCore::FloatSize videoDimensions)
     SetupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture)
  */
 
 #import "config.h"
-#import "WebVideoFullscreenManagerProxy.h"
+#import "VideoFullscreenManagerProxy.h"
 
 #if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
 
 #import "APIUIClient.h"
 #import "DrawingAreaProxy.h"
+#import "PlaybackSessionManagerProxy.h"
+#import "VideoFullscreenManagerMessages.h"
+#import "VideoFullscreenManagerProxyMessages.h"
 #import "WebPageProxy.h"
-#import "WebPlaybackSessionManagerProxy.h"
 #import "WebProcessProxy.h"
-#import "WebVideoFullscreenManagerMessages.h"
-#import "WebVideoFullscreenManagerProxyMessages.h"
 #import <QuartzCore/CoreAnimation.h>
 #import <WebCore/MachSendRight.h>
 #import <WebCore/MediaPlayerEnums.h>
@@ -84,149 +84,149 @@ namespace WebKit {
 
 #if PLATFORM(IOS) && !HAVE(AVKIT)
 
-RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
+RefPtr<VideoFullscreenManagerProxy> VideoFullscreenManagerProxy::create(WebPageProxy&)
 {
     return nullptr;
 }
 
-void WebVideoFullscreenManagerProxy::invalidate()
+void VideoFullscreenManagerProxy::invalidate()
 {
 }
 
-bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode) const
+bool VideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode) const
 {
     return false;
 }
 
-bool WebVideoFullscreenManagerProxy::mayAutomaticallyShowVideoPictureInPicture() const
+bool VideoFullscreenManagerProxy::mayAutomaticallyShowVideoPictureInPicture() const
 {
     return false;
 }
 
-void WebVideoFullscreenManagerProxy::requestHideAndExitFullscreen()
+void VideoFullscreenManagerProxy::requestHideAndExitFullscreen()
 {
 
 }
 
-void WebVideoFullscreenManagerProxy::applicationDidBecomeActive()
+void VideoFullscreenManagerProxy::applicationDidBecomeActive()
 {
 
 }
 #else
 
-#pragma mark - WebVideoFullscreenModelContext
+#pragma mark - VideoFullscreenModelContext
 
-WebVideoFullscreenModelContext::WebVideoFullscreenModelContext(WebVideoFullscreenManagerProxy& manager, WebPlaybackSessionModelContext& playbackSessionModel, uint64_t contextId)
+VideoFullscreenModelContext::VideoFullscreenModelContext(VideoFullscreenManagerProxy& manager, PlaybackSessionModelContext& playbackSessionModel, uint64_t contextId)
     : m_manager(&manager)
     , m_playbackSessionModel(playbackSessionModel)
     , m_contextId(contextId)
 {
 }
 
-WebVideoFullscreenModelContext::~WebVideoFullscreenModelContext()
+VideoFullscreenModelContext::~VideoFullscreenModelContext()
 {
 }
 
-void WebVideoFullscreenModelContext::addClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenModelContext::addClient(VideoFullscreenModelClient& client)
 {
     ASSERT(!m_clients.contains(&client));
     m_clients.add(&client);
 }
 
-void WebVideoFullscreenModelContext::removeClient(WebVideoFullscreenModelClient& client)
+void VideoFullscreenModelContext::removeClient(VideoFullscreenModelClient& client)
 {
     ASSERT(m_clients.contains(&client));
     m_clients.remove(&client);
 }
 
-void WebVideoFullscreenModelContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
+void VideoFullscreenModelContext::requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
 {
     if (m_manager)
         m_manager->requestFullscreenMode(m_contextId, mode, finishedWithMedia);
 }
 
-void WebVideoFullscreenModelContext::setVideoLayerFrame(WebCore::FloatRect frame)
+void VideoFullscreenModelContext::setVideoLayerFrame(WebCore::FloatRect frame)
 {
     if (m_manager)
         m_manager->setVideoLayerFrame(m_contextId, frame);
 }
 
-void WebVideoFullscreenModelContext::setVideoLayerGravity(WebCore::WebVideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenModelContext::setVideoLayerGravity(WebCore::VideoFullscreenModel::VideoGravity gravity)
 {
     if (m_manager)
         m_manager->setVideoLayerGravity(m_contextId, gravity);
 }
 
-void WebVideoFullscreenModelContext::fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenModelContext::fullscreenModeChanged(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     if (m_manager)
         m_manager->fullscreenModeChanged(m_contextId, mode);
 }
 
-bool WebVideoFullscreenModelContext::isVisible() const
+bool VideoFullscreenModelContext::isVisible() const
 {
     return m_manager ? m_manager->isVisible() : false;
 }
 
-void WebVideoFullscreenModelContext::didSetupFullscreen()
+void VideoFullscreenModelContext::didSetupFullscreen()
 {
     if (m_manager)
         m_manager->didSetupFullscreen(m_contextId);
 }
 
-void WebVideoFullscreenModelContext::didEnterFullscreen()
+void VideoFullscreenModelContext::didEnterFullscreen()
 {
     if (m_manager)
         m_manager->didEnterFullscreen(m_contextId);
 }
 
-void WebVideoFullscreenModelContext::didExitFullscreen()
+void VideoFullscreenModelContext::didExitFullscreen()
 {
     if (m_manager)
         m_manager->didExitFullscreen(m_contextId);
 }
 
-void WebVideoFullscreenModelContext::didCleanupFullscreen()
+void VideoFullscreenModelContext::didCleanupFullscreen()
 {
     if (m_manager)
         m_manager->didCleanupFullscreen(m_contextId);
 }
 
-void WebVideoFullscreenModelContext::fullscreenMayReturnToInline()
+void VideoFullscreenModelContext::fullscreenMayReturnToInline()
 {
     if (m_manager)
         m_manager->fullscreenMayReturnToInline(m_contextId);
 }
 
-#pragma mark - WebVideoFullscreenManagerProxy
+#pragma mark - VideoFullscreenManagerProxy
 
-RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy& page, WebPlaybackSessionManagerProxy& playbackSessionManagerProxy)
+RefPtr<VideoFullscreenManagerProxy> VideoFullscreenManagerProxy::create(WebPageProxy& page, PlaybackSessionManagerProxy& playbackSessionManagerProxy)
 {
-    return adoptRef(new WebVideoFullscreenManagerProxy(page, playbackSessionManagerProxy));
+    return adoptRef(new VideoFullscreenManagerProxy(page, playbackSessionManagerProxy));
 }
 
-WebVideoFullscreenManagerProxy::WebVideoFullscreenManagerProxy(WebPageProxy& page, WebPlaybackSessionManagerProxy& playbackSessionManagerProxy)
+VideoFullscreenManagerProxy::VideoFullscreenManagerProxy(WebPageProxy& page, PlaybackSessionManagerProxy& playbackSessionManagerProxy)
     : m_page(&page)
     , m_playbackSessionManagerProxy(playbackSessionManagerProxy)
 {
-    m_page->process().addMessageReceiver(Messages::WebVideoFullscreenManagerProxy::messageReceiverName(), m_page->pageID(), *this);
+    m_page->process().addMessageReceiver(Messages::VideoFullscreenManagerProxy::messageReceiverName(), m_page->pageID(), *this);
 }
 
-WebVideoFullscreenManagerProxy::~WebVideoFullscreenManagerProxy()
+VideoFullscreenManagerProxy::~VideoFullscreenManagerProxy()
 {
     if (!m_page)
         return;
     invalidate();
 }
 
-void WebVideoFullscreenManagerProxy::invalidate()
+void VideoFullscreenManagerProxy::invalidate()
 {
-    m_page->process().removeMessageReceiver(Messages::WebVideoFullscreenManagerProxy::messageReceiverName(), m_page->pageID());
+    m_page->process().removeMessageReceiver(Messages::VideoFullscreenManagerProxy::messageReceiverName(), m_page->pageID());
     m_page = nullptr;
 
     for (auto& tuple : m_contextMap.values()) {
-        RefPtr<WebVideoFullscreenModelContext> model;
-        RefPtr<PlatformWebVideoFullscreenInterface> interface;
+        RefPtr<VideoFullscreenModelContext> model;
+        RefPtr<PlatformVideoFullscreenInterface> interface;
         std::tie(model, interface) = tuple;
 
         interface->invalidate();
@@ -238,13 +238,13 @@ void WebVideoFullscreenManagerProxy::invalidate()
     m_clientCounts.clear();
 }
 
-void WebVideoFullscreenManagerProxy::requestHideAndExitFullscreen()
+void VideoFullscreenManagerProxy::requestHideAndExitFullscreen()
 {
     for (auto& tuple : m_contextMap.values())
         std::get<1>(tuple)->requestHideAndExitFullscreen();
 }
 
-bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const
+bool VideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscreenMode mode) const
 {
     for (auto& tuple : m_contextMap.values()) {
         if (std::get<1>(tuple)->hasMode(mode))
@@ -253,7 +253,7 @@ bool WebVideoFullscreenManagerProxy::hasMode(HTMLMediaElementEnums::VideoFullscr
     return false;
 }
 
-bool WebVideoFullscreenManagerProxy::mayAutomaticallyShowVideoPictureInPicture() const
+bool VideoFullscreenManagerProxy::mayAutomaticallyShowVideoPictureInPicture() const
 {
     for (auto& tuple : m_contextMap.values()) {
         if (std::get<1>(tuple)->mayAutomaticallyShowVideoPictureInPicture())
@@ -263,7 +263,7 @@ bool WebVideoFullscreenManagerProxy::mayAutomaticallyShowVideoPictureInPicture()
 }
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
-bool WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen() const
+bool VideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen() const
 {
     for (auto& tuple : m_contextMap.values()) {
         if (std::get<1>(tuple)->isPlayingVideoInEnhancedFullscreen())
@@ -274,27 +274,27 @@ bool WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen() const
 }
 #endif
 
-void WebVideoFullscreenManagerProxy::applicationDidBecomeActive()
+void VideoFullscreenManagerProxy::applicationDidBecomeActive()
 {
     for (auto& tuple : m_contextMap.values())
         std::get<1>(tuple)->applicationDidBecomeActive();
 }
 
-WebVideoFullscreenManagerProxy::ModelInterfaceTuple WebVideoFullscreenManagerProxy::createModelAndInterface(uint64_t contextId)
+VideoFullscreenManagerProxy::ModelInterfaceTuple VideoFullscreenManagerProxy::createModelAndInterface(uint64_t contextId)
 {
     auto& playbackSessionModel = m_playbackSessionManagerProxy->ensureModel(contextId);
-    Ref<WebVideoFullscreenModelContext> model = WebVideoFullscreenModelContext::create(*this, playbackSessionModel, contextId);
+    Ref<VideoFullscreenModelContext> model = VideoFullscreenModelContext::create(*this, playbackSessionModel, contextId);
     auto& playbackSessionInterface = m_playbackSessionManagerProxy->ensureInterface(contextId);
-    Ref<PlatformWebVideoFullscreenInterface> interface = PlatformWebVideoFullscreenInterface::create(playbackSessionInterface);
+    Ref<PlatformVideoFullscreenInterface> interface = PlatformVideoFullscreenInterface::create(playbackSessionInterface);
     m_playbackSessionManagerProxy->addClientForContext(contextId);
 
-    interface->setWebVideoFullscreenModel(&model.get());
-    interface->setWebVideoFullscreenChangeObserver(&model.get());
+    interface->setVideoFullscreenModel(&model.get());
+    interface->setVideoFullscreenChangeObserver(&model.get());
 
     return std::make_tuple(WTFMove(model), WTFMove(interface));
 }
 
-WebVideoFullscreenManagerProxy::ModelInterfaceTuple& WebVideoFullscreenManagerProxy::ensureModelAndInterface(uint64_t contextId)
+VideoFullscreenManagerProxy::ModelInterfaceTuple& VideoFullscreenManagerProxy::ensureModelAndInterface(uint64_t contextId)
 {
     auto addResult = m_contextMap.add(contextId, ModelInterfaceTuple());
     if (addResult.isNewEntry)
@@ -302,24 +302,24 @@ WebVideoFullscreenManagerProxy::ModelInterfaceTuple& WebVideoFullscreenManagerPr
     return addResult.iterator->value;
 }
 
-WebVideoFullscreenModelContext& WebVideoFullscreenManagerProxy::ensureModel(uint64_t contextId)
+VideoFullscreenModelContext& VideoFullscreenManagerProxy::ensureModel(uint64_t contextId)
 {
     return *std::get<0>(ensureModelAndInterface(contextId));
 }
 
-PlatformWebVideoFullscreenInterface& WebVideoFullscreenManagerProxy::ensureInterface(uint64_t contextId)
+PlatformVideoFullscreenInterface& VideoFullscreenManagerProxy::ensureInterface(uint64_t contextId)
 {
     return *std::get<1>(ensureModelAndInterface(contextId));
 }
 
-void WebVideoFullscreenManagerProxy::addClientForContext(uint64_t contextId)
+void VideoFullscreenManagerProxy::addClientForContext(uint64_t contextId)
 {
     auto addResult = m_clientCounts.add(contextId, 1);
     if (!addResult.isNewEntry)
         addResult.iterator->value++;
 }
 
-void WebVideoFullscreenManagerProxy::removeClientForContext(uint64_t contextId)
+void VideoFullscreenManagerProxy::removeClientForContext(uint64_t contextId)
 {
     ASSERT(m_clientCounts.contains(contextId));
 
@@ -337,13 +337,13 @@ void WebVideoFullscreenManagerProxy::removeClientForContext(uint64_t contextId)
     m_clientCounts.set(contextId, clientCount);
 }
 
-#pragma mark Messages from WebVideoFullscreenManager
+#pragma mark Messages from VideoFullscreenManager
 
-void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture)
+void VideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture)
 {
     ASSERT(videoLayerID);
-    RefPtr<WebVideoFullscreenModelContext> model;
-    RefPtr<PlatformWebVideoFullscreenInterface> interface;
+    RefPtr<VideoFullscreenModelContext> model;
+    RefPtr<PlatformVideoFullscreenInterface> interface;
 
     std::tie(model, interface) = ensureModelAndInterface(contextId);
     addClientForContext(contextId);
@@ -374,17 +374,17 @@ void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, u
     m_page->uiClient().hasVideoInPictureInPictureDidChange(m_page, videoFullscreenMode & MediaPlayerEnums::VideoFullscreenModePictureInPicture);
 }
 
-void WebVideoFullscreenManagerProxy::setHasVideo(uint64_t contextId, bool hasVideo)
+void VideoFullscreenManagerProxy::setHasVideo(uint64_t contextId, bool hasVideo)
 {
     ensureInterface(contextId).hasVideoChanged(hasVideo);
 }
 
-void WebVideoFullscreenManagerProxy::setVideoDimensions(uint64_t contextId, const FloatSize& videoDimensions)
+void VideoFullscreenManagerProxy::setVideoDimensions(uint64_t contextId, const FloatSize& videoDimensions)
 {
     ensureInterface(contextId).videoDimensionsChanged(videoDimensions);
 }
 
-void WebVideoFullscreenManagerProxy::enterFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::enterFullscreen(uint64_t contextId)
 {
     auto& interface = ensureInterface(contextId);
     interface.enterFullscreen();
@@ -401,7 +401,7 @@ void WebVideoFullscreenManagerProxy::enterFullscreen(uint64_t contextId)
     }
 }
 
-void WebVideoFullscreenManagerProxy::exitFullscreen(uint64_t contextId, WebCore::IntRect finalRect)
+void VideoFullscreenManagerProxy::exitFullscreen(uint64_t contextId, WebCore::IntRect finalRect)
 {
 #if PLATFORM(IOS)
     ensureInterface(contextId).exitFullscreen(finalRect);
@@ -413,18 +413,18 @@ void WebVideoFullscreenManagerProxy::exitFullscreen(uint64_t contextId, WebCore:
 }
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
-void WebVideoFullscreenManagerProxy::exitFullscreenWithoutAnimationToMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
+void VideoFullscreenManagerProxy::exitFullscreenWithoutAnimationToMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
 {
     ensureInterface(contextId).exitFullscreenWithoutAnimationToMode(targetMode);
 }
 #endif
 
-void WebVideoFullscreenManagerProxy::cleanupFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::cleanupFullscreen(uint64_t contextId)
 {
     ensureInterface(contextId).cleanupFullscreen();
 }
 
-void WebVideoFullscreenManagerProxy::preparedToReturnToInline(uint64_t contextId, bool visible, WebCore::IntRect inlineRect)
+void VideoFullscreenManagerProxy::preparedToReturnToInline(uint64_t contextId, bool visible, WebCore::IntRect inlineRect)
 {
     m_page->fullscreenMayReturnToInline();
 
@@ -437,47 +437,47 @@ void WebVideoFullscreenManagerProxy::preparedToReturnToInline(uint64_t contextId
 #endif
 }
 
-#pragma mark Messages to WebVideoFullscreenManager
+#pragma mark Messages to VideoFullscreenManager
 
-void WebVideoFullscreenManagerProxy::requestFullscreenMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
+void VideoFullscreenManagerProxy::requestFullscreenMode(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
 {
-    m_page->send(Messages::WebVideoFullscreenManager::RequestFullscreenMode(contextId, mode, finishedWithMedia), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::RequestFullscreenMode(contextId, mode, finishedWithMedia), m_page->pageID());
 }
 
-void WebVideoFullscreenManagerProxy::didSetupFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::didSetupFullscreen(uint64_t contextId)
 {
-    m_page->send(Messages::WebVideoFullscreenManager::DidSetupFullscreen(contextId), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::DidSetupFullscreen(contextId), m_page->pageID());
 }
 
-void WebVideoFullscreenManagerProxy::didExitFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::didExitFullscreen(uint64_t contextId)
 {
-    m_page->send(Messages::WebVideoFullscreenManager::DidExitFullscreen(contextId), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::DidExitFullscreen(contextId), m_page->pageID());
     m_page->didExitFullscreen();
 }
 
-void WebVideoFullscreenManagerProxy::didEnterFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::didEnterFullscreen(uint64_t contextId)
 {
-    m_page->send(Messages::WebVideoFullscreenManager::DidEnterFullscreen(contextId), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::DidEnterFullscreen(contextId), m_page->pageID());
     m_page->didEnterFullscreen();
 }
 
-void WebVideoFullscreenManagerProxy::didCleanupFullscreen(uint64_t contextId)
+void VideoFullscreenManagerProxy::didCleanupFullscreen(uint64_t contextId)
 {
-    RefPtr<WebVideoFullscreenModelContext> model;
-    RefPtr<PlatformWebVideoFullscreenInterface> interface;
+    RefPtr<VideoFullscreenModelContext> model;
+    RefPtr<PlatformVideoFullscreenInterface> interface;
 
     std::tie(model, interface) = ensureModelAndInterface(contextId);
 
     [CATransaction flush];
     [model->layerHostView() removeFromSuperview];
     model->setLayerHostView(nullptr);
-    m_page->send(Messages::WebVideoFullscreenManager::DidCleanupFullscreen(contextId), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::DidCleanupFullscreen(contextId), m_page->pageID());
 
     interface->setMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
     removeClientForContext(contextId);
 }
 
-void WebVideoFullscreenManagerProxy::setVideoLayerFrame(uint64_t contextId, WebCore::FloatRect frame)
+void VideoFullscreenManagerProxy::setVideoLayerFrame(uint64_t contextId, WebCore::FloatRect frame)
 {
     @autoreleasepool {
 #if PLATFORM(IOS)
@@ -489,30 +489,30 @@ void WebVideoFullscreenManagerProxy::setVideoLayerFrame(uint64_t contextId, WebC
         mach_port_name_t fencePort = fenceSendRight.leakSendRight();
 #endif
 
-        m_page->send(Messages::WebVideoFullscreenManager::SetVideoLayerFrameFenced(contextId, frame, IPC::Attachment(fencePort, MACH_MSG_TYPE_MOVE_SEND)), m_page->pageID());
+        m_page->send(Messages::VideoFullscreenManager::SetVideoLayerFrameFenced(contextId, frame, IPC::Attachment(fencePort, MACH_MSG_TYPE_MOVE_SEND)), m_page->pageID());
     }
 }
 
-void WebVideoFullscreenManagerProxy::setVideoLayerGravity(uint64_t contextId, WebCore::WebVideoFullscreenModel::VideoGravity gravity)
+void VideoFullscreenManagerProxy::setVideoLayerGravity(uint64_t contextId, WebCore::VideoFullscreenModel::VideoGravity gravity)
 {
-    m_page->send(Messages::WebVideoFullscreenManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity), m_page->pageID());
 }
 
-void WebVideoFullscreenManagerProxy::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
+void VideoFullscreenManagerProxy::fullscreenModeChanged(uint64_t contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
     m_page->uiClient().hasVideoInPictureInPictureDidChange(m_page, mode & MediaPlayerEnums::VideoFullscreenModePictureInPicture);
-    m_page->send(Messages::WebVideoFullscreenManager::FullscreenModeChanged(contextId, mode), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::FullscreenModeChanged(contextId, mode), m_page->pageID());
 }
 
-bool WebVideoFullscreenManagerProxy::isVisible() const
+bool VideoFullscreenManagerProxy::isVisible() const
 {
     return m_page->isViewVisible() && m_page->isInWindow();
 }
 
-void WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline(uint64_t contextId)
+void VideoFullscreenManagerProxy::fullscreenMayReturnToInline(uint64_t contextId)
 {
     bool isViewVisible = m_page->isViewVisible();
-    m_page->send(Messages::WebVideoFullscreenManager::FullscreenMayReturnToInline(contextId, isViewVisible), m_page->pageID());
+    m_page->send(Messages::VideoFullscreenManager::FullscreenMayReturnToInline(contextId, isViewVisible), m_page->pageID());
 }
 
 #endif
diff --git a/Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm b/Source/WebKit/UIProcess/Cocoa/WebPlaybackSessionManagerProxy.mm
deleted file mode 100644 (file)
index df9d33f..0000000
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "WebPlaybackSessionManagerProxy.h"
-
-#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-
-#import "WebPageProxy.h"
-#import "WebPlaybackSessionManagerMessages.h"
-#import "WebPlaybackSessionManagerProxyMessages.h"
-#import "WebProcessProxy.h"
-#import <WebKitSystemInterface.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-#pragma mark - WebPlaybackSessionModelContext
-
-void WebPlaybackSessionModelContext::addClient(WebPlaybackSessionModelClient& client)
-{
-    ASSERT(!m_clients.contains(&client));
-    m_clients.add(&client);
-}
-
-void WebPlaybackSessionModelContext::removeClient(WebPlaybackSessionModelClient& client)
-{
-    ASSERT(m_clients.contains(&client));
-    m_clients.remove(&client);
-}
-
-void WebPlaybackSessionModelContext::play()
-{
-    if (m_manager)
-        m_manager->play(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::pause()
-{
-    if (m_manager)
-        m_manager->pause(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::togglePlayState()
-{
-    if (m_manager)
-        m_manager->togglePlayState(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::beginScrubbing()
-{
-    if (m_manager)
-        m_manager->beginScrubbing(m_contextId);
-
-    m_isScrubbing = true;
-}
-
-void WebPlaybackSessionModelContext::endScrubbing()
-{
-    if (m_manager)
-        m_manager->endScrubbing(m_contextId);
-
-    m_isScrubbing = false;
-    m_playbackStartedTimeNeedsUpdate = isPlaying();
-}
-
-void WebPlaybackSessionModelContext::seekToTime(double time)
-{
-    if (m_manager)
-        m_manager->seekToTime(m_contextId, time);
-}
-
-void WebPlaybackSessionModelContext::fastSeek(double time)
-{
-    if (m_manager)
-        m_manager->fastSeek(m_contextId, time);
-}
-
-void WebPlaybackSessionModelContext::beginScanningForward()
-{
-    if (m_manager)
-        m_manager->beginScanningForward(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::beginScanningBackward()
-{
-    if (m_manager)
-        m_manager->beginScanningBackward(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::endScanning()
-{
-    if (m_manager)
-        m_manager->endScanning(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::selectAudioMediaOption(uint64_t optionId)
-{
-    if (m_manager)
-        m_manager->selectAudioMediaOption(m_contextId, optionId);
-}
-
-void WebPlaybackSessionModelContext::selectLegibleMediaOption(uint64_t optionId)
-{
-    if (m_manager)
-        m_manager->selectLegibleMediaOption(m_contextId, optionId);
-}
-
-void WebPlaybackSessionModelContext::togglePictureInPicture()
-{
-    if (m_manager)
-        m_manager->togglePictureInPicture(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::toggleMuted()
-{
-    if (m_manager)
-        m_manager->toggleMuted(m_contextId);
-}
-
-void WebPlaybackSessionModelContext::setMuted(bool muted)
-{
-    if (m_manager)
-        m_manager->setMuted(m_contextId, muted);
-}
-
-void WebPlaybackSessionModelContext::playbackStartedTimeChanged(double playbackStartedTime)
-{
-    m_playbackStartedTime = playbackStartedTime;
-    m_playbackStartedTimeNeedsUpdate = false;
-}
-
-void WebPlaybackSessionModelContext::durationChanged(double duration)
-{
-    m_duration = duration;
-    for (auto* client : m_clients)
-        client->durationChanged(duration);
-}
-
-void WebPlaybackSessionModelContext::currentTimeChanged(double currentTime)
-{
-    m_currentTime = currentTime;
-    auto anchorTime = [[NSProcessInfo processInfo] systemUptime];
-    if (m_playbackStartedTimeNeedsUpdate)
-        playbackStartedTimeChanged(currentTime);
-
-    for (auto* client : m_clients)
-        client->currentTimeChanged(currentTime, anchorTime);
-}
-
-void WebPlaybackSessionModelContext::bufferedTimeChanged(double bufferedTime)
-{
-    m_bufferedTime = bufferedTime;
-    for (auto* client : m_clients)
-        client->bufferedTimeChanged(bufferedTime);
-}
-
-void WebPlaybackSessionModelContext::rateChanged(bool isPlaying, float playbackRate)
-{
-    m_isPlaying = isPlaying;
-    m_playbackRate = playbackRate;
-    for (auto* client : m_clients)
-        client->rateChanged(isPlaying, playbackRate);
-}
-
-void WebPlaybackSessionModelContext::seekableRangesChanged(WebCore::TimeRanges& seekableRanges, double lastModifiedTime, double liveUpdateInterval)
-{
-    m_seekableRanges = seekableRanges;
-    m_seekableTimeRangesLastModifiedTime = lastModifiedTime;
-    m_liveUpdateInterval = liveUpdateInterval;
-    for (auto* client : m_clients)
-        client->seekableRangesChanged(seekableRanges, lastModifiedTime, liveUpdateInterval);
-}
-
-void WebPlaybackSessionModelContext::canPlayFastReverseChanged(bool canPlayFastReverse)
-{
-    m_canPlayFastReverse = canPlayFastReverse;
-    for (auto* client : m_clients)
-        client->canPlayFastReverseChanged(canPlayFastReverse);
-}
-
-void WebPlaybackSessionModelContext::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& audioMediaSelectionOptions, uint64_t audioMediaSelectedIndex)
-{
-    m_audioMediaSelectionOptions = audioMediaSelectionOptions;
-    m_audioMediaSelectedIndex = audioMediaSelectedIndex;
-    for (auto* client : m_clients)
-        client->audioMediaSelectionOptionsChanged(audioMediaSelectionOptions, audioMediaSelectedIndex);
-}
-
-void WebPlaybackSessionModelContext::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& legibleMediaSelectionOptions, uint64_t legibleMediaSelectedIndex)
-{
-    m_legibleMediaSelectionOptions = legibleMediaSelectionOptions;
-    m_legibleMediaSelectedIndex = legibleMediaSelectedIndex;
-
-    for (auto* client : m_clients)
-        client->legibleMediaSelectionOptionsChanged(legibleMediaSelectionOptions, legibleMediaSelectedIndex);
-}
-
-void WebPlaybackSessionModelContext::audioMediaSelectionIndexChanged(uint64_t selectedIndex)
-{
-    m_audioMediaSelectedIndex = selectedIndex;
-
-    for (auto* client : m_clients)
-        client->audioMediaSelectionIndexChanged(selectedIndex);
-}
-
-void WebPlaybackSessionModelContext::legibleMediaSelectionIndexChanged(uint64_t selectedIndex)
-{
-    m_legibleMediaSelectedIndex = selectedIndex;
-
-    for (auto* client : m_clients)
-        client->legibleMediaSelectionIndexChanged(selectedIndex);
-}
-
-void WebPlaybackSessionModelContext::externalPlaybackChanged(bool enabled, WebPlaybackSessionModel::ExternalPlaybackTargetType type, const String& localizedName)
-{
-    m_externalPlaybackEnabled = enabled;
-    m_externalPlaybackTargetType = type;
-    m_externalPlaybackLocalizedDeviceName = localizedName;
-
-    for (auto* client : m_clients)
-        client->externalPlaybackChanged(enabled, type, localizedName);
-}
-
-void WebPlaybackSessionModelContext::wirelessVideoPlaybackDisabledChanged(bool wirelessVideoPlaybackDisabled)
-{
-    m_wirelessVideoPlaybackDisabled = wirelessVideoPlaybackDisabled;
-    for (auto* client : m_clients)
-        client->wirelessVideoPlaybackDisabledChanged(wirelessVideoPlaybackDisabled);
-}
-
-void WebPlaybackSessionModelContext::mutedChanged(bool muted)
-{
-    m_muted = muted;
-    for (auto* client : m_clients)
-        client->mutedChanged(muted);
-}
-
-#pragma mark - WebPlaybackSessionManagerProxy
-
-RefPtr<WebPlaybackSessionManagerProxy> WebPlaybackSessionManagerProxy::create(WebPageProxy& page)
-{
-    return adoptRef(new WebPlaybackSessionManagerProxy(page));
-}
-
-WebPlaybackSessionManagerProxy::WebPlaybackSessionManagerProxy(WebPageProxy& page)
-    : m_page(&page)
-{
-    m_page->process().addMessageReceiver(Messages::WebPlaybackSessionManagerProxy::messageReceiverName(), m_page->pageID(), *this);
-}
-
-WebPlaybackSessionManagerProxy::~WebPlaybackSessionManagerProxy()
-{
-    if (!m_page)
-        return;
-    invalidate();
-}
-
-void WebPlaybackSessionManagerProxy::invalidate()
-{
-    m_page->process().removeMessageReceiver(Messages::WebPlaybackSessionManagerProxy::messageReceiverName(), m_page->pageID());
-    m_page = nullptr;
-
-    for (auto& tuple : m_contextMap.values()) {
-        RefPtr<WebPlaybackSessionModelContext> model;
-        RefPtr<PlatformWebPlaybackSessionInterface> interface;
-        std::tie(model, interface) = tuple;
-
-        interface->invalidate();
-    }
-
-    m_contextMap.clear();
-    m_clientCounts.clear();
-}
-
-WebPlaybackSessionManagerProxy::ModelInterfaceTuple WebPlaybackSessionManagerProxy::createModelAndInterface(uint64_t contextId)
-{
-    Ref<WebPlaybackSessionModelContext> model = WebPlaybackSessionModelContext::create(*this, contextId);
-    Ref<PlatformWebPlaybackSessionInterface> interface = PlatformWebPlaybackSessionInterface::create(model);
-
-    return std::make_tuple(WTFMove(model), WTFMove(interface));
-}
-
-WebPlaybackSessionManagerProxy::ModelInterfaceTuple& WebPlaybackSessionManagerProxy::ensureModelAndInterface(uint64_t contextId)
-{
-    auto addResult = m_contextMap.add(contextId, ModelInterfaceTuple());
-    if (addResult.isNewEntry)
-        addResult.iterator->value = createModelAndInterface(contextId);
-    return addResult.iterator->value;
-}
-
-WebPlaybackSessionModelContext& WebPlaybackSessionManagerProxy::ensureModel(uint64_t contextId)
-{
-    return *std::get<0>(ensureModelAndInterface(contextId));
-}
-
-PlatformWebPlaybackSessionInterface& WebPlaybackSessionManagerProxy::ensureInterface(uint64_t contextId)
-{
-    return *std::get<1>(ensureModelAndInterface(contextId));
-}
-
-void WebPlaybackSessionManagerProxy::addClientForContext(uint64_t contextId)
-{
-    m_clientCounts.add(contextId);
-}
-
-void WebPlaybackSessionManagerProxy::removeClientForContext(uint64_t contextId)
-{
-    if (!m_clientCounts.remove(contextId))
-        return;
-
-    ensureInterface(contextId).invalidate();
-    m_contextMap.remove(contextId);
-}
-
-#pragma mark Messages from WebPlaybackSessionManager
-
-void WebPlaybackSessionManagerProxy::setUpPlaybackControlsManagerWithID(uint64_t contextId)
-{
-#if PLATFORM(MAC)
-    if (m_controlsManagerContextId == contextId)
-        return;
-
-    if (m_controlsManagerContextId)
-        removeClientForContext(m_controlsManagerContextId);
-
-    m_controlsManagerContextId = contextId;
-    ensureInterface(m_controlsManagerContextId).ensureControlsManager();
-    addClientForContext(m_controlsManagerContextId);
-
-    m_page->videoControlsManagerDidChange();
-#else
-    UNUSED_PARAM(contextId);
-#endif
-}
-
-void WebPlaybackSessionManagerProxy::clearPlaybackControlsManager()
-{
-#if PLATFORM(MAC)
-    if (!m_controlsManagerContextId)
-        return;
-
-    removeClientForContext(m_controlsManagerContextId);
-    m_controlsManagerContextId = 0;
-    m_page->videoControlsManagerDidChange();
-#endif
-}
-
-void WebPlaybackSessionManagerProxy::resetMediaState(uint64_t contextId)
-{
-    ensureInterface(contextId).resetMediaState();
-}
-
-void WebPlaybackSessionManagerProxy::currentTimeChanged(uint64_t contextId, double currentTime, double hostTime)
-{
-    ensureModel(contextId).currentTimeChanged(currentTime);
-}
-
-void WebPlaybackSessionManagerProxy::bufferedTimeChanged(uint64_t contextId, double bufferedTime)
-{
-    ensureModel(contextId).bufferedTimeChanged(bufferedTime);
-}
-
-void WebPlaybackSessionManagerProxy::seekableRangesVectorChanged(uint64_t contextId, Vector<std::pair<double, double>> ranges, double lastModifiedTime, double liveUpdateInterval)
-{
-    Ref<TimeRanges> timeRanges = TimeRanges::create();
-    for (const auto& range : ranges) {
-        ASSERT(isfinite(range.first));
-        ASSERT(isfinite(range.second));
-        ASSERT(range.second >= range.first);
-        timeRanges->add(range.first, range.second);
-    }
-
-    ensureModel(contextId).seekableRangesChanged(timeRanges, lastModifiedTime, liveUpdateInterval);
-}
-
-void WebPlaybackSessionManagerProxy::canPlayFastReverseChanged(uint64_t contextId, bool value)
-{
-    ensureModel(contextId).canPlayFastReverseChanged(value);
-}
-
-void WebPlaybackSessionManagerProxy::audioMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex)
-{
-    ensureModel(contextId).audioMediaSelectionOptionsChanged(options, selectedIndex);
-}
-
-void WebPlaybackSessionManagerProxy::legibleMediaSelectionOptionsChanged(uint64_t contextId, Vector<MediaSelectionOption> options, uint64_t selectedIndex)
-{
-    ensureModel(contextId).legibleMediaSelectionOptionsChanged(options, selectedIndex);
-}
-
-void WebPlaybackSessionManagerProxy::audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
-{
-    ensureModel(contextId).audioMediaSelectionIndexChanged(selectedIndex);
-}
-
-void WebPlaybackSessionManagerProxy::legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
-{
-    ensureModel(contextId).legibleMediaSelectionIndexChanged(selectedIndex);
-}
-
-void WebPlaybackSessionManagerProxy::externalPlaybackPropertiesChanged(uint64_t contextId, bool enabled, uint32_t targetType, String localizedDeviceName)
-{
-    WebPlaybackSessionModel::ExternalPlaybackTargetType type = static_cast<WebPlaybackSessionModel::ExternalPlaybackTargetType>(targetType);
-    ASSERT(type == WebPlaybackSessionModel::TargetTypeAirPlay || type == WebPlaybackSessionModel::TargetTypeTVOut || type == WebPlaybackSessionModel::TargetTypeNone);
-
-    ensureModel(contextId).externalPlaybackChanged(enabled, type, localizedDeviceName);
-}
-
-void WebPlaybackSessionManagerProxy::wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool disabled)
-{
-    ensureModel(contextId).wirelessVideoPlaybackDisabledChanged(disabled);
-}
-
-void WebPlaybackSessionManagerProxy::mutedChanged(uint64_t contextId, bool muted)
-{
-    ensureModel(contextId).mutedChanged(muted);
-}
-
-void WebPlaybackSessionManagerProxy::durationChanged(uint64_t contextId, double duration)
-{
-    ensureModel(contextId).durationChanged(duration);
-}
-
-void WebPlaybackSessionManagerProxy::playbackStartedTimeChanged(uint64_t contextId, double playbackStartedTime)
-{
-    ensureModel(contextId).playbackStartedTimeChanged(playbackStartedTime);
-}
-
-void WebPlaybackSessionManagerProxy::rateChanged(uint64_t contextId, bool isPlaying, double rate)
-{
-    ensureModel(contextId).rateChanged(isPlaying, rate);
-}
-
-
-void WebPlaybackSessionManagerProxy::handleControlledElementIDResponse(uint64_t contextId, String identifier) const
-{
-#if PLATFORM(MAC)
-    if (contextId == m_controlsManagerContextId)
-        m_page->handleControlledElementIDResponse(identifier);
-#else
-    UNUSED_PARAM(contextId);
-    UNUSED_PARAM(identifier);
-#endif
-}
-
-
-#pragma mark Messages to WebPlaybackSessionManager
-
-void WebPlaybackSessionManagerProxy::play(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::Play(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::pause(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::Pause(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::togglePlayState(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::TogglePlayState(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::beginScrubbing(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::BeginScrubbing(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::endScrubbing(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::EndScrubbing(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::seekToTime(uint64_t contextId, double time)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::SeekToTime(contextId, time), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::fastSeek(uint64_t contextId, double time)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::FastSeek(contextId, time), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::beginScanningForward(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::BeginScanningForward(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::beginScanningBackward(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::BeginScanningBackward(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::endScanning(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::EndScanning(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::selectAudioMediaOption(uint64_t contextId, uint64_t index)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::SelectAudioMediaOption(contextId, index), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::selectLegibleMediaOption(uint64_t contextId, uint64_t index)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::SelectLegibleMediaOption(contextId, index), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::togglePictureInPicture(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::TogglePictureInPicture(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::toggleMuted(uint64_t contextId)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::ToggleMuted(contextId), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::setMuted(uint64_t contextId, bool muted)
-{
-    m_page->send(Messages::WebPlaybackSessionManager::SetMuted(contextId, muted), m_page->pageID());
-}
-
-void WebPlaybackSessionManagerProxy::requestControlledElementID()
-{
-    if (m_controlsManagerContextId)
-        m_page->send(Messages::WebPlaybackSessionManager::HandleControlledElementIDRequest(m_controlsManagerContextId), m_page->pageID());
-}
-
-PlatformWebPlaybackSessionInterface* WebPlaybackSessionManagerProxy::controlsManagerInterface()
-{
-    if (!m_controlsManagerContextId)
-        return nullptr;
-
-    auto& interface = ensureInterface(m_controlsManagerContextId);
-    return &interface;
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
index 7f1e985..9aede70 100644 (file)
@@ -41,6 +41,7 @@
 #import "PageClient.h"
 #import "PageClientImpl.h"
 #import "PasteboardTypes.h"
+#import "PlaybackSessionManagerProxy.h"
 #import "RemoteLayerTreeDrawingAreaProxy.h"
 #import "RemoteObjectRegistry.h"
 #import "RemoteObjectRegistryMessages.h"
@@ -62,7 +63,6 @@
 #import "WebEventFactory.h"
 #import "WebInspectorProxy.h"
 #import "WebPageProxy.h"
-#import "WebPlaybackSessionManagerProxy.h"
 #import "WebProcessPool.h"
 #import "WebProcessProxy.h"
 #import "_WKRemoteObjectRegistryInternal.h"
@@ -1170,8 +1170,8 @@ void WebViewImpl::updateMediaTouchBar()
         [m_playbackControlsManager setCanTogglePictureInPicture:YES];
     }
 
-    if (PlatformWebPlaybackSessionInterface* interface = m_page->playbackSessionManager()->controlsManagerInterface())
-        [m_playbackControlsManager setWebPlaybackSessionInterfaceMac:interface];
+    if (PlatformPlaybackSessionInterface* interface = m_page->playbackSessionManager()->controlsManagerInterface())
+        [m_playbackControlsManager setPlaybackSessionInterfaceMac:interface];
 
     [m_mediaTouchBarProvider setPlaybackControlsController:m_playbackControlsManager.get()];
     [m_mediaPlaybackControlsView setPlaybackControlsController:m_playbackControlsManager.get()];
index 33152fe..8b06edc 100644 (file)
 #if PLATFORM(COCOA)
 #include "RemoteLayerTreeDrawingAreaProxy.h"
 #include "RemoteLayerTreeScrollingPerformanceData.h"
+#include "VideoFullscreenManagerProxy.h"
+#include "VideoFullscreenManagerProxyMessages.h"
 #include "ViewSnapshotStore.h"
-#include "WebVideoFullscreenManagerProxy.h"
-#include "WebVideoFullscreenManagerProxyMessages.h"
 #include <WebCore/MachSendRight.h>
 #include <WebCore/RunLoopObserver.h>
 #include <WebCore/TextIndicatorWindow.h>
 #endif
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#include "WebPlaybackSessionManagerProxy.h"
+#include "PlaybackSessionManagerProxy.h"
 #endif
 
 #if ENABLE(MEDIA_STREAM)
@@ -394,8 +394,8 @@ WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uin
     m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
 #endif
 #if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    m_playbackSessionManager = WebPlaybackSessionManagerProxy::create(*this);
-    m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
+    m_playbackSessionManager = PlaybackSessionManagerProxy::create(*this);
+    m_videoFullscreenManager = VideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
 #endif
 
 #if ENABLE(APPLE_PAY)
@@ -636,8 +636,8 @@ void WebPageProxy::reattachToWebProcess()
     m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_pageClient.fullScreenManagerProxyClient());
 #endif
 #if PLATFORM(IOS) && HAVE(AVKIT) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    m_playbackSessionManager = WebPlaybackSessionManagerProxy::create(*this);
-    m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
+    m_playbackSessionManager = PlaybackSessionManagerProxy::create(*this);
+    m_videoFullscreenManager = VideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
 #endif
 
 #if ENABLE(APPLE_PAY)
@@ -4325,12 +4325,12 @@ void WebPageProxy::setFullscreenClient(std::unique_ptr<API::FullscreenClient>&&
 #endif
     
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-WebPlaybackSessionManagerProxy* WebPageProxy::playbackSessionManager()
+PlaybackSessionManagerProxy* WebPageProxy::playbackSessionManager()
 {
     return m_playbackSessionManager.get();
 }
 
-WebVideoFullscreenManagerProxy* WebPageProxy::videoFullscreenManager()
+VideoFullscreenManagerProxy* WebPageProxy::videoFullscreenManager()
 {
     return m_videoFullscreenManager.get();
 }
index bde8c26..3619e43 100644 (file)
@@ -201,9 +201,9 @@ class WebBackForwardListItem;
 class WebContextMenuProxy;
 class WebEditCommandProxy;
 class WebFullScreenManagerProxy;
-class WebPlaybackSessionManagerProxy;
+class PlaybackSessionManagerProxy;
 class WebNavigationState;
-class WebVideoFullscreenManagerProxy;
+class VideoFullscreenManagerProxy;
 class WebKeyboardEvent;
 class WebURLSchemeHandler;
 class WebMouseEvent;
@@ -343,8 +343,8 @@ public:
     void setFullscreenClient(std::unique_ptr<API::FullscreenClient>&&);
 #endif
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    WebPlaybackSessionManagerProxy* playbackSessionManager();
-    WebVideoFullscreenManagerProxy* videoFullscreenManager();
+    PlaybackSessionManagerProxy* playbackSessionManager();
+    VideoFullscreenManagerProxy* videoFullscreenManager();
 #endif
 
 #if PLATFORM(IOS)
@@ -1680,8 +1680,8 @@ private:
 #endif
 
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    RefPtr<WebPlaybackSessionManagerProxy> m_playbackSessionManager;
-    RefPtr<WebVideoFullscreenManagerProxy> m_videoFullscreenManager;
+    RefPtr<PlaybackSessionManagerProxy> m_playbackSessionManager;
+    RefPtr<VideoFullscreenManagerProxy> m_videoFullscreenManager;
 #endif
 
 #if PLATFORM(IOS)
index c43c765..3312dca 100644 (file)
 #import "RemoteLayerTreeTransaction.h"
 #import "UIKitSPI.h"
 #import "UserData.h"
+#import "VideoFullscreenManagerProxy.h"
 #import "ViewUpdateDispatcherMessages.h"
 #import "WKBrowsingContextControllerInternal.h"
 #import "WebPageMessages.h"
 #import "WebProcessProxy.h"
-#import "WebVideoFullscreenManagerProxy.h"
 #import <WebCore/FrameView.h>
 #import <WebCore/NotImplemented.h>
 #import <WebCore/PlatformScreen.h>
index 77d9e17..7375f1c 100644 (file)
                37FC19471850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37FC194818510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm */; };
                37FC194B18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FC194918510D6A008CFA47 /* WKNSURLAuthenticationChallenge.h */; };
-               3F418EF91887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF51887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp */; };
-               3F418EFB1887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF71887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp */; };
+               3F418EF91887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF51887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp */; };
+               3F418EFB1887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF71887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp */; };
                3F87B9BD158940120090FF62 /* WebColorChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F87B9BA15893F630090FF62 /* WebColorChooser.cpp */; };
                3F87B9BE158940190090FF62 /* WebColorChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F87B9BB15893F630090FF62 /* WebColorChooser.h */; };
                3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F87B9BF158940D80090FF62 /* WebColorPicker.h */; };
                5272D4C91E735F0900EB4290 /* WKProtectionSpaceNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5272D4CA1E735F0900EB4290 /* WKProtectionSpaceNS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5272D4C81E735F0900EB4290 /* WKProtectionSpaceNS.mm */; };
                528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               52D5A1B01C57495A00DE34A3 /* WebVideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1AA1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.h */; };
-               52D5A1B11C57496200DE34A3 /* WebVideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1AC1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.mm */; };
-               52D5A1B71C574A0200DE34A3 /* WebVideoFullscreenManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */; };
+               52D5A1B01C57495A00DE34A3 /* VideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */; };
+               52D5A1B11C57496200DE34A3 /* VideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1AC1C57494E00DE34A3 /* VideoFullscreenManagerProxy.mm */; };
+               52D5A1B71C574A0200DE34A3 /* VideoFullscreenManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */; };
                5302583B1DCBBD2200DA89C2 /* NetworkCaptureResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */; };
                5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */; };
                5302583D1DCBBD2200DA89C2 /* NetworkCaptureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */; };
                CD78E1171DB7DC0A0014A2DE /* APIFullscreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD78E1161DB7DC0A0014A2DE /* APIFullscreenClient.h */; };
                CD78E1191DB7E5AD0014A2DE /* _WKFullscreenDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD78E1181DB7E5AD0014A2DE /* _WKFullscreenDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */; };
-               CDA29A1A1CBDBF4100901CCF /* WebPlaybackSessionManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A181CBDBF4100901CCF /* WebPlaybackSessionManager.mm */; };
-               CDA29A1B1CBDBF4100901CCF /* WebPlaybackSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A191CBDBF4100901CCF /* WebPlaybackSessionManager.h */; };
-               CDA29A201CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A1E1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.h */; };
-               CDA29A211CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A1F1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.mm */; };
-               CDA29A281CBEB67A00901CCF /* WebPlaybackSessionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A241CBEB67A00901CCF /* WebPlaybackSessionManagerMessageReceiver.cpp */; };
-               CDA29A291CBEB67A00901CCF /* WebPlaybackSessionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A251CBEB67A00901CCF /* WebPlaybackSessionManagerMessages.h */; };
-               CDA29A2A1CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A261CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessageReceiver.cpp */; };
-               CDA29A2B1CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A271CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessages.h */; };
+               CDA29A1A1CBDBF4100901CCF /* PlaybackSessionManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A181CBDBF4100901CCF /* PlaybackSessionManager.mm */; };
+               CDA29A1B1CBDBF4100901CCF /* PlaybackSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A191CBDBF4100901CCF /* PlaybackSessionManager.h */; };
+               CDA29A201CBEB5FB00901CCF /* PlaybackSessionManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A1E1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.h */; };
+               CDA29A211CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A1F1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm */; };
+               CDA29A281CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A241CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp */; };
+               CDA29A291CBEB67A00901CCF /* PlaybackSessionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A251CBEB67A00901CCF /* PlaybackSessionManagerMessages.h */; };
+               CDA29A2A1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A261CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp */; };
+               CDA29A2B1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A271CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h */; };
                CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
                CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; };
                CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */; };
                37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextLoadDelegatePrivate.h; sourceTree = "<group>"; };
                37FC194818510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLAuthenticationChallenge.mm; sourceTree = "<group>"; };
                37FC194918510D6A008CFA47 /* WKNSURLAuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLAuthenticationChallenge.h; sourceTree = "<group>"; };
-               3F418EF51887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVideoFullscreenManagerMessageReceiver.cpp; sourceTree = "<group>"; };
-               3F418EF61887BD97002795FD /* WebVideoFullscreenManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenManagerMessages.h; sourceTree = "<group>"; };
-               3F418EF71887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVideoFullscreenManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
-               3F418EF81887BD97002795FD /* WebVideoFullscreenManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenManagerProxyMessages.h; sourceTree = "<group>"; };
+               3F418EF51887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoFullscreenManagerMessageReceiver.cpp; sourceTree = "<group>"; };
+               3F418EF61887BD97002795FD /* VideoFullscreenManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenManagerMessages.h; sourceTree = "<group>"; };
+               3F418EF71887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoFullscreenManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
+               3F418EF81887BD97002795FD /* VideoFullscreenManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenManagerProxyMessages.h; sourceTree = "<group>"; };
                3F87B9BA15893F630090FF62 /* WebColorChooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorChooser.cpp; sourceTree = "<group>"; };
                3F87B9BB15893F630090FF62 /* WebColorChooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorChooser.h; sourceTree = "<group>"; };
                3F87B9BF158940D80090FF62 /* WebColorPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorPicker.h; sourceTree = "<group>"; };
                5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
                5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKProtectionSpaceNS.h; path = mac/WKProtectionSpaceNS.h; sourceTree = "<group>"; };
                5272D4C81E735F0900EB4290 /* WKProtectionSpaceNS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKProtectionSpaceNS.mm; path = mac/WKProtectionSpaceNS.mm; sourceTree = "<group>"; };
-               52D5A1AA1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenManagerProxy.h; sourceTree = "<group>"; };
-               52D5A1AB1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebVideoFullscreenManagerProxy.messages.in; sourceTree = "<group>"; };
-               52D5A1AC1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenManagerProxy.mm; sourceTree = "<group>"; };
-               52D5A1B21C5749F200DE34A3 /* WebVideoFullscreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVideoFullscreenManager.h; sourceTree = "<group>"; };
-               52D5A1B31C5749F200DE34A3 /* WebVideoFullscreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebVideoFullscreenManager.messages.in; sourceTree = "<group>"; };
-               52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenManager.mm; sourceTree = "<group>"; };
+               52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenManagerProxy.h; sourceTree = "<group>"; };
+               52D5A1AB1C57494E00DE34A3 /* VideoFullscreenManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoFullscreenManagerProxy.messages.in; sourceTree = "<group>"; };
+               52D5A1AC1C57494E00DE34A3 /* VideoFullscreenManagerProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenManagerProxy.mm; sourceTree = "<group>"; };
+               52D5A1B21C5749F200DE34A3 /* VideoFullscreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFullscreenManager.h; sourceTree = "<group>"; };
+               52D5A1B31C5749F200DE34A3 /* VideoFullscreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoFullscreenManager.messages.in; sourceTree = "<group>"; };
+               52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoFullscreenManager.mm; sourceTree = "<group>"; };
                5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkCaptureResource.cpp; path = NetworkProcess/capture/NetworkCaptureResource.cpp; sourceTree = "<group>"; };
                5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkCaptureResource.h; path = NetworkProcess/capture/NetworkCaptureResource.h; sourceTree = "<group>"; };
                530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkCaptureEvent.cpp; path = NetworkProcess/capture/NetworkCaptureEvent.cpp; sourceTree = "<group>"; };
                CD78E1161DB7DC0A0014A2DE /* APIFullscreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFullscreenClient.h; sourceTree = "<group>"; };
                CD78E1181DB7E5AD0014A2DE /* _WKFullscreenDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFullscreenDelegate.h; sourceTree = "<group>"; };
                CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackBoardServicesSPI.h; sourceTree = "<group>"; };
-               CDA29A181CBDBF4100901CCF /* WebPlaybackSessionManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlaybackSessionManager.mm; sourceTree = "<group>"; };
-               CDA29A191CBDBF4100901CCF /* WebPlaybackSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionManager.h; sourceTree = "<group>"; };
-               CDA29A1C1CBDBF5B00901CCF /* WebPlaybackSessionManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPlaybackSessionManager.messages.in; sourceTree = "<group>"; };
-               CDA29A1E1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionManagerProxy.h; sourceTree = "<group>"; };
-               CDA29A1F1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPlaybackSessionManagerProxy.mm; sourceTree = "<group>"; };
-               CDA29A221CBEB61A00901CCF /* WebPlaybackSessionManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPlaybackSessionManagerProxy.messages.in; sourceTree = "<group>"; };
-               CDA29A241CBEB67A00901CCF /* WebPlaybackSessionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlaybackSessionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
-               CDA29A251CBEB67A00901CCF /* WebPlaybackSessionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionManagerMessages.h; sourceTree = "<group>"; };
-               CDA29A261CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPlaybackSessionManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
-               CDA29A271CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPlaybackSessionManagerProxyMessages.h; sourceTree = "<group>"; };
+               CDA29A181CBDBF4100901CCF /* PlaybackSessionManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionManager.mm; sourceTree = "<group>"; };
+               CDA29A191CBDBF4100901CCF /* PlaybackSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionManager.h; sourceTree = "<group>"; };
+               CDA29A1C1CBDBF5B00901CCF /* PlaybackSessionManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PlaybackSessionManager.messages.in; sourceTree = "<group>"; };
+               CDA29A1E1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionManagerProxy.h; sourceTree = "<group>"; };
+               CDA29A1F1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlaybackSessionManagerProxy.mm; sourceTree = "<group>"; };
+               CDA29A221CBEB61A00901CCF /* PlaybackSessionManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PlaybackSessionManagerProxy.messages.in; sourceTree = "<group>"; };
+               CDA29A241CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlaybackSessionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
+               CDA29A251CBEB67A00901CCF /* PlaybackSessionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionManagerMessages.h; sourceTree = "<group>"; };
+               CDA29A261CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlaybackSessionManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
+               CDA29A271CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaybackSessionManagerProxyMessages.h; sourceTree = "<group>"; };
                CDC382F717211506008A2FC3 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = /System/Library/Frameworks/CFNetwork.framework; sourceTree = "<absolute>"; };
                CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageShimLibrary.cpp; sourceTree = "<group>"; };
                CDC3830617211799008A2FC3 /* WebProcessShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = WebProcessShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                                2D1B5D5A18586599006C6596 /* ViewGestureController.messages.in */,
                                1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
                                7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */,
-                               CDA29A1E1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.h */,
-                               CDA29A221CBEB61A00901CCF /* WebPlaybackSessionManagerProxy.messages.in */,
-                               CDA29A1F1CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.mm */,
+                               CDA29A1E1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.h */,
+                               CDA29A221CBEB61A00901CCF /* PlaybackSessionManagerProxy.messages.in */,
+                               CDA29A1F1CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm */,
                                7CE4D2151A49148400C7F152 /* WebProcessPoolCocoa.mm */,
                                1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */,
                                7AAD175E1EA6AF37003B0894 /* WebResourceLoadStatisticsStoreCocoa.mm */,
                                51D124311E6DE521002B2820 /* WebURLSchemeHandlerCocoa.h */,
                                51D124321E6DE521002B2820 /* WebURLSchemeHandlerCocoa.mm */,
-                               52D5A1AA1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.h */,
-                               52D5A1AB1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.messages.in */,
-                               52D5A1AC1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.mm */,
+                               52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */,
+                               52D5A1AB1C57494E00DE34A3 /* VideoFullscreenManagerProxy.messages.in */,
+                               52D5A1AC1C57494E00DE34A3 /* VideoFullscreenManagerProxy.mm */,
                                2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */,
                                2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */,
                                1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */,
                                CD491B051E70D05F00009066 /* UserMediaCaptureManager.cpp */,
                                CD491B061E70D05F00009066 /* UserMediaCaptureManager.h */,
                                CD491B0A1E732D1200009066 /* UserMediaCaptureManager.messages.in */,
-                               CDA29A191CBDBF4100901CCF /* WebPlaybackSessionManager.h */,
-                               CDA29A1C1CBDBF5B00901CCF /* WebPlaybackSessionManager.messages.in */,
-                               CDA29A181CBDBF4100901CCF /* WebPlaybackSessionManager.mm */,
+                               CDA29A191CBDBF4100901CCF /* PlaybackSessionManager.h */,
+                               CDA29A1C1CBDBF5B00901CCF /* PlaybackSessionManager.messages.in */,
+                               CDA29A181CBDBF4100901CCF /* PlaybackSessionManager.mm */,
                                ECA680D71E690DF800731D20 /* WebProcessCocoa.h */,
                                7C6E70F918B2D4A000F24E2E /* WebProcessCocoa.mm */,
-                               52D5A1B21C5749F200DE34A3 /* WebVideoFullscreenManager.h */,
-                               52D5A1B31C5749F200DE34A3 /* WebVideoFullscreenManager.messages.in */,
-                               52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */,
+                               52D5A1B21C5749F200DE34A3 /* VideoFullscreenManager.h */,
+                               52D5A1B31C5749F200DE34A3 /* VideoFullscreenManager.messages.in */,
+                               52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */,
                        );
                        path = cocoa;
                        sourceTree = "<group>";
                                1AB1F7931D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h */,
                                1AB1F7941D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp */,
                                1AB1F7951D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h */,
-                               CDA29A241CBEB67A00901CCF /* WebPlaybackSessionManagerMessageReceiver.cpp */,
-                               CDA29A251CBEB67A00901CCF /* WebPlaybackSessionManagerMessages.h */,
-                               CDA29A261CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessageReceiver.cpp */,
-                               CDA29A271CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessages.h */,
+                               CDA29A241CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp */,
+                               CDA29A251CBEB67A00901CCF /* PlaybackSessionManagerMessages.h */,
+                               CDA29A261CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp */,
+                               CDA29A271CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h */,
                                1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */,
                                1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */,
                                BC3066BC125A442100E71278 /* WebProcessMessageReceiver.cpp */,
                                1AAF08B619269E6D00B6390C /* WebUserContentControllerMessages.h */,
                                7C361D76192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp */,
                                7C361D77192803BD0036A59D /* WebUserContentControllerProxyMessages.h */,
-                               3F418EF51887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp */,
-                               3F418EF61887BD97002795FD /* WebVideoFullscreenManagerMessages.h */,
-                               3F418EF71887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp */,
-                               3F418EF81887BD97002795FD /* WebVideoFullscreenManagerProxyMessages.h */,
+                               3F418EF51887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp */,
+                               3F418EF61887BD97002795FD /* VideoFullscreenManagerMessages.h */,
+                               3F418EF71887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp */,
+                               3F418EF81887BD97002795FD /* VideoFullscreenManagerProxyMessages.h */,
                        );
                        name = "Derived Sources";
                        path = DerivedSources/WebKit2;
                                1AB1F7991D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h in Headers */,
                                0F850FE71ED7C39F00FB77A7 /* WebPerformanceLoggingClient.h in Headers */,
                                1A3E736111CC2659007BD539 /* WebPlatformStrategies.h in Headers */,
-                               CDA29A1B1CBDBF4100901CCF /* WebPlaybackSessionManager.h in Headers */,
-                               CDA29A291CBEB67A00901CCF /* WebPlaybackSessionManagerMessages.h in Headers */,
-                               CDA29A201CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.h in Headers */,
-                               CDA29A2B1CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessages.h in Headers */,
+                               CDA29A1B1CBDBF4100901CCF /* PlaybackSessionManager.h in Headers */,
+                               CDA29A291CBEB67A00901CCF /* PlaybackSessionManagerMessages.h in Headers */,
+                               CDA29A201CBEB5FB00901CCF /* PlaybackSessionManagerProxy.h in Headers */,
+                               CDA29A2B1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h in Headers */,
                                31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
                                BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
                                D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
                                7C361D79192803BD0036A59D /* WebUserContentControllerProxyMessages.h in Headers */,
                                15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */,
                                83EE575C1DB7D61100C74C50 /* WebValidationMessageClient.h in Headers */,
-                               52D5A1B01C57495A00DE34A3 /* WebVideoFullscreenManagerProxy.h in Headers */,
+                               52D5A1B01C57495A00DE34A3 /* VideoFullscreenManagerProxy.h in Headers */,
                                2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */,
                                29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */,
                                29232DF418B29D6800D0596F /* WKAccessibilityWebPageObjectMac.h in Headers */,
                                1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
                                C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */,
                                2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
-                               CDA29A1A1CBDBF4100901CCF /* WebPlaybackSessionManager.mm in Sources */,
-                               CDA29A281CBEB67A00901CCF /* WebPlaybackSessionManagerMessageReceiver.cpp in Sources */,
-                               CDA29A211CBEB5FB00901CCF /* WebPlaybackSessionManagerProxy.mm in Sources */,
-                               CDA29A2A1CBEB67A00901CCF /* WebPlaybackSessionManagerProxyMessageReceiver.cpp in Sources */,
+                               CDA29A1A1CBDBF4100901CCF /* PlaybackSessionManager.mm in Sources */,
+                               CDA29A281CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp in Sources */,
+                               CDA29A211CBEB5FB00901CCF /* PlaybackSessionManagerProxy.mm in Sources */,
+                               CDA29A2A1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp in Sources */,
                                31D5929E166E060000E6BF02 /* WebPlugInClient.cpp in Sources */,
                                1A08FEE41D593E2A008BA8CB /* WebPluginInfoProvider.cpp in Sources */,
                                BC5744EF12638FB3006F0F12 /* WebPopupItem.cpp in Sources */,
                                7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */,
                                15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */,
                                83EE575B1DB7D61100C74C50 /* WebValidationMessageClient.cpp in Sources */,
-                               52D5A1B71C574A0200DE34A3 /* WebVideoFullscreenManager.mm in Sources */,
-                               3F418EF91887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp in Sources */,
-                               52D5A1B11C57496200DE34A3 /* WebVideoFullscreenManagerProxy.mm in Sources */,
-                               3F418EFB1887BD97002795FD /* WebVideoFullscreenManagerProxyMessageReceiver.cpp in Sources */,
+                               52D5A1B71C574A0200DE34A3 /* VideoFullscreenManager.mm in Sources */,
+                               3F418EF91887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp in Sources */,
+                               52D5A1B11C57496200DE34A3 /* VideoFullscreenManagerProxy.mm in Sources */,
+                               3F418EFB1887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp in Sources */,
                                2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */,
                                C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
                                868160D0187645570021E79D /* WindowServerConnection.mm in Sources */,
index 4d22aff..fee0d28 100644 (file)
@@ -78,8 +78,8 @@
 #include <WebCore/Settings.h>
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-#include "WebPlaybackSessionManager.h"
-#include "WebVideoFullscreenManager.h"
+#include "PlaybackSessionManager.h"
+#include "VideoFullscreenManager.h"
 #endif
 
 #if ENABLE(ASYNC_SCROLLING)
index b2025b8..1c7a8fe 100644 (file)
 
 #if PLATFORM(COCOA)
 #include "PDFPlugin.h"
+#include "PlaybackSessionManager.h"
 #include "RemoteLayerTreeTransaction.h"
+#include "VideoFullscreenManager.h"
 #include "WKStringCF.h"
-#include "WebPlaybackSessionManager.h"
-#include "WebVideoFullscreenManager.h"
 #include <WebCore/LegacyWebArchive.h>
 #endif
 
@@ -3471,17 +3471,17 @@ RemoteWebInspectorUI* WebPage::remoteInspectorUI()
 }
 
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-WebPlaybackSessionManager& WebPage::playbackSessionManager()
+PlaybackSessionManager& WebPage::playbackSessionManager()
 {
     if (!m_playbackSessionManager)
-        m_playbackSessionManager = WebPlaybackSessionManager::create(*this);
+        m_playbackSessionManager = PlaybackSessionManager::create(*this);
     return *m_playbackSessionManager;
 }
 
-WebVideoFullscreenManager& WebPage::videoFullscreenManager()
+VideoFullscreenManager& WebPage::videoFullscreenManager()
 {
     if (!m_videoFullscreenManager)
-        m_videoFullscreenManager = WebVideoFullscreenManager::create(*this, playbackSessionManager());
+        m_videoFullscreenManager = VideoFullscreenManager::create(*this, playbackSessionManager());
     return *m_videoFullscreenManager;
 }
 #endif
index 3e59196..ad1bec4 100644 (file)
@@ -186,11 +186,11 @@ class WebNotificationClient;
 class WebOpenPanelResultListener;
 class WebPageGroupProxy;
 class WebPageOverlay;
-class WebPlaybackSessionManager;
+class PlaybackSessionManager;
 class WebPopupMenu;
 class WebUndoStep;
 class WebUserContentController;
-class WebVideoFullscreenManager;
+class VideoFullscreenManager;
 class WebWheelEvent;
 enum FindOptions : uint16_t;
 struct AssistedNodeInformation;
@@ -266,8 +266,8 @@ public:
     bool isInspectorPage() { return !!m_inspectorUI || !!m_remoteInspectorUI; }
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    WebPlaybackSessionManager& playbackSessionManager();
-    WebVideoFullscreenManager& videoFullscreenManager();
+    PlaybackSessionManager& playbackSessionManager();
+    VideoFullscreenManager& videoFullscreenManager();
 #endif
 #if PLATFORM(IOS)
     void setAllowsMediaDocumentInlinePlayback(bool);
@@ -1400,8 +1400,8 @@ private:
     RefPtr<RemoteWebInspectorUI> m_remoteInspectorUI;
 
 #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-    RefPtr<WebPlaybackSessionManager> m_playbackSessionManager;
-    RefPtr<WebVideoFullscreenManager> m_videoFullscreenManager;
+    RefPtr<PlaybackSessionManager> m_playbackSessionManager;
+    RefPtr<VideoFullscreenManager> m_videoFullscreenManager;
 #endif
 #if PLATFORM(IOS)
     bool m_allowsMediaDocumentInlinePlayback { false };
@@ -31,8 +31,8 @@
 #include <WebCore/EventListener.h>
 #include <WebCore/HTMLMediaElementEnums.h>
 #include <WebCore/PlatformCALayer.h>
-#include <WebCore/WebPlaybackSessionInterface.h>
-#include <WebCore/WebPlaybackSessionModelMediaElement.h>
+#include <WebCore/PlaybackSessionInterface.h>
+#include <WebCore/PlaybackSessionModelMediaElement.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
@@ -52,28 +52,28 @@ class Node;
 namespace WebKit {
 
 class WebPage;
-class WebPlaybackSessionManager;
+class PlaybackSessionManager;
 
-class WebPlaybackSessionInterfaceContext final
-    : public RefCounted<WebPlaybackSessionInterfaceContext>
-    , public WebCore::WebPlaybackSessionInterface
-    , public WebCore::WebPlaybackSessionModelClient {
+class PlaybackSessionInterfaceContext final
+    : public RefCounted<PlaybackSessionInterfaceContext>
+    , public WebCore::PlaybackSessionInterface
+    , public WebCore::PlaybackSessionModelClient {
 public:
-    static Ref<WebPlaybackSessionInterfaceContext> create(WebPlaybackSessionManager& manager, uint64_t contextId)
+    static Ref<PlaybackSessionInterfaceContext> create(PlaybackSessionManager& manager, uint64_t contextId)
     {
-        return adoptRef(*new WebPlaybackSessionInterfaceContext(manager, contextId));
+        return adoptRef(*new PlaybackSessionInterfaceContext(manager, contextId));
     }
-    virtual ~WebPlaybackSessionInterfaceContext();
+    virtual ~PlaybackSessionInterfaceContext();
 
     void invalidate() { m_manager = nullptr; }
 
 private:
-    friend class WebVideoFullscreenInterfaceContext;
+    friend class VideoFullscreenInterfaceContext;
 
-    // WebPlaybackSessionInterface
+    // PlaybackSessionInterface
     void resetMediaState() final;
 
-    // WebPlaybackModelClient
+    // PlaybackSessionModelClient
     void durationChanged(double) final;
     void currentTimeChanged(double currentTime, double anchorTime) final;
     void bufferedTimeChanged(double) final;
@@ -85,20 +85,20 @@ private:
     void legibleMediaSelectionOptionsChanged(const Vector<WebCore::MediaSelectionOption>& options, uint64_t selectedIndex) final;
     void audioMediaSelectionIndexChanged(uint64_t) final;
     void legibleMediaSelectionIndexChanged(uint64_t) final;
-    void externalPlaybackChanged(bool enabled, WebCore::WebPlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) final;
+    void externalPlaybackChanged(bool enabled, WebCore::PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) final;
     void wirelessVideoPlaybackDisabledChanged(bool) final;
     void mutedChanged(bool) final;
 
-    WebPlaybackSessionInterfaceContext(WebPlaybackSessionManager&, uint64_t contextId);
+    PlaybackSessionInterfaceContext(PlaybackSessionManager&, uint64_t contextId);
 
-    WebPlaybackSessionManager* m_manager;
+    PlaybackSessionManager* m_manager;
     uint64_t m_contextId;
 };
 
-class WebPlaybackSessionManager : public RefCounted<WebPlaybackSessionManager>, private IPC::MessageReceiver {
+class PlaybackSessionManager : public RefCounted<PlaybackSessionManager>, private IPC::MessageReceiver {
 public:
-    static Ref<WebPlaybackSessionManager> create(WebPage&);
-    virtual ~WebPlaybackSessionManager();
+    static Ref<PlaybackSessionManager> create(WebPage&);
+    virtual ~PlaybackSessionManager();
 
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
 
@@ -107,21 +107,21 @@ public:
     uint64_t contextIdForMediaElement(WebCore::HTMLMediaElement&);
 
 protected:
-    friend class WebPlaybackSessionInterfaceContext;
-    friend class WebVideoFullscreenManager;
+    friend class PlaybackSessionInterfaceContext;
+    friend class VideoFullscreenManager;
 
-    explicit WebPlaybackSessionManager(WebPage&);
+    explicit PlaybackSessionManager(WebPage&);
 
-    typedef std::tuple<RefPtr<WebCore::WebPlaybackSessionModelMediaElement>, RefPtr<WebPlaybackSessionInterfaceContext>> ModelInterfaceTuple;
+    typedef std::tuple<RefPtr<WebCore::PlaybackSessionModelMediaElement>, RefPtr<PlaybackSessionInterfaceContext>> ModelInterfaceTuple;
     ModelInterfaceTuple createModelAndInterface(uint64_t contextId);
     ModelInterfaceTuple& ensureModelAndInterface(uint64_t contextId);
-    WebCore::WebPlaybackSessionModelMediaElement& ensureModel(uint64_t contextId);
-    WebPlaybackSessionInterfaceContext& ensureInterface(uint64_t contextId);
+    WebCore::PlaybackSessionModelMediaElement& ensureModel(uint64_t contextId);
+    PlaybackSessionInterfaceContext& ensureInterface(uint64_t contextId);
     void removeContext(uint64_t contextId);
     void addClientForContext(uint64_t contextId);
     void removeClientForContext(uint64_t contextId);
 
-    // Interface to WebPlaybackSessionInterfaceContext
+    // Interface to PlaybackSessionInterfaceContext
     void resetMediaState(uint64_t contextId);
     void durationChanged(uint64_t contextId, double);
     void currentTimeChanged(uint64_t contextId, double currentTime, double anchorTime);
@@ -134,11 +134,11 @@ protected:
     void legibleMediaSelectionOptionsChanged(uint64_t contextId, const Vector<WebCore::MediaSelectionOption>& options, uint64_t selectedIndex);
     void audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex);
     void legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex);
-    void externalPlaybackChanged(uint64_t contextId, bool enabled, WebCore::WebPlaybackSessionModel::ExternalPlaybackTargetType, String localizedDeviceName);
+    void externalPlaybackChanged(uint64_t contextId, bool enabled, WebCore::PlaybackSessionModel::ExternalPlaybackTargetType, String localizedDeviceName);
     void wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool);
     void mutedChanged(uint64_t contextId, bool);
 
-    // Messages from WebPlaybackSessionManagerProxy
+    // Messages from PlaybackSessionManagerProxy
     void play(uint64_t contextId);
     void pause(uint64_t contextId);
     void togglePlayState(uint64_t contextId);
@@ -22,7 +22,7 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
-messages -> WebPlaybackSessionManager {
+messages -> PlaybackSessionManager {
     Play(uint64_t contextId)
     Pause(uint64_t contextId)
     TogglePlayState(uint64_t contextId)
diff --git a/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm b/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm
new file mode 100644 (file)
index 0000000..9141e38
--- /dev/null
@@ -0,0 +1,473 @@
+/*
+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "PlaybackSessionManager.h"
+
+#if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+
+#import "Attachment.h"
+#import "PlaybackSessionManagerMessages.h"
+#import "PlaybackSessionManagerProxyMessages.h"
+#import "WebCoreArgumentCoders.h"
+#import "WebPage.h"
+#import "WebProcess.h"
+#import <WebCore/Color.h>
+#import <WebCore/Event.h>
+#import <WebCore/EventNames.h>
+#import <WebCore/HTMLMediaElement.h>
+#import <WebCore/Settings.h>
+#import <WebCore/TimeRanges.h>
+#import <WebCore/UserGestureIndicator.h>
+#import <mach/mach_port.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+static uint64_t nextContextId()
+{
+    static uint64_t contextId = 0;
+    return ++contextId;
+}
+
+#pragma mark - PlaybackSessionInterfaceContext
+
+PlaybackSessionInterfaceContext::PlaybackSessionInterfaceContext(PlaybackSessionManager& manager, uint64_t contextId)
+    : m_manager(&manager)
+    , m_contextId(contextId)
+{
+}
+
+PlaybackSessionInterfaceContext::~PlaybackSessionInterfaceContext()
+{
+}
+
+void PlaybackSessionInterfaceContext::resetMediaState()
+{
+    if (m_manager)
+        m_manager->resetMediaState(m_contextId);
+}
+
+void PlaybackSessionInterfaceContext::durationChanged(double duration)
+{
+    if (m_manager)
+        m_manager->durationChanged(m_contextId, duration);
+}
+
+void PlaybackSessionInterfaceContext::currentTimeChanged(double currentTime, double anchorTime)
+{
+    if (m_manager)
+        m_manager->currentTimeChanged(m_contextId, currentTime, anchorTime);
+}
+
+void PlaybackSessionInterfaceContext::bufferedTimeChanged(double bufferedTime)
+{
+    if (m_manager)
+        m_manager->bufferedTimeChanged(m_contextId, bufferedTime);
+}
+
+void PlaybackSessionInterfaceContext::rateChanged(bool isPlaying, float playbackRate)
+{
+    if (m_manager)
+        m_manager->rateChanged(m_contextId, isPlaying, playbackRate);
+}
+
+void PlaybackSessionInterfaceContext::playbackStartedTimeChanged(double playbackStartedTime)
+{
+    if (m_manager)
+        m_manager->playbackStartedTimeChanged(m_contextId, playbackStartedTime);
+}
+
+void PlaybackSessionInterfaceContext::seekableRangesChanged(const WebCore::TimeRanges& ranges, double lastModifiedTime, double liveUpdateInterval)
+{
+    if (m_manager)
+        m_manager->seekableRangesChanged(m_contextId, ranges, lastModifiedTime, liveUpdateInterval);
+}
+
+void PlaybackSessionInterfaceContext::canPlayFastReverseChanged(bool value)
+{
+    if (m_manager)
+        m_manager->canPlayFastReverseChanged(m_contextId, value);
+}
+
+void PlaybackSessionInterfaceContext::audioMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+{
+    if (m_manager)
+        m_manager->audioMediaSelectionOptionsChanged(m_contextId, options, selectedIndex);
+}
+
+void PlaybackSessionInterfaceContext::legibleMediaSelectionOptionsChanged(const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+{
+    if (m_manager)
+        m_manager->legibleMediaSelectionOptionsChanged(m_contextId, options, selectedIndex);
+}
+
+void PlaybackSessionInterfaceContext::audioMediaSelectionIndexChanged(uint64_t selectedIndex)
+{
+    if (m_manager)
+        m_manager->audioMediaSelectionIndexChanged(m_contextId, selectedIndex);
+}
+
+void PlaybackSessionInterfaceContext::legibleMediaSelectionIndexChanged(uint64_t selectedIndex)
+{
+    if (m_manager)
+        m_manager->legibleMediaSelectionIndexChanged(m_contextId, selectedIndex);
+}
+
+void PlaybackSessionInterfaceContext::externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType type, const String& localizedDeviceName)
+{
+    if (m_manager)
+        m_manager->externalPlaybackChanged(m_contextId, enabled, type, localizedDeviceName);
+}
+
+void PlaybackSessionInterfaceContext::wirelessVideoPlaybackDisabledChanged(bool disabled)
+{
+    if (m_manager)
+        m_manager->wirelessVideoPlaybackDisabledChanged(m_contextId, disabled);
+}
+
+void PlaybackSessionInterfaceContext::mutedChanged(bool muted)
+{
+    if (m_manager)
+        m_manager->mutedChanged(m_contextId, muted);
+}
+
+#pragma mark - PlaybackSessionManager
+
+Ref<PlaybackSessionManager> PlaybackSessionManager::create(WebPage& page)
+{
+    return adoptRef(*new PlaybackSessionManager(page));
+}
+
+PlaybackSessionManager::PlaybackSessionManager(WebPage& page)
+    : m_page(&page)
+{
+    WebProcess::singleton().addMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), page.pageID(), *this);
+}
+
+PlaybackSessionManager::~PlaybackSessionManager()
+{
+    for (auto& tuple : m_contextMap.values()) {
+        RefPtr<PlaybackSessionModelMediaElement> model;
+        RefPtr<PlaybackSessionInterfaceContext> interface;
+        std::tie(model, interface) = tuple;
+        model->removeClient(*interface);
+        model->setMediaElement(nullptr);
+
+        interface->invalidate();
+    }
+
+    m_contextMap.clear();
+    m_mediaElements.clear();
+    m_clientCounts.clear();
+
+    WebProcess::singleton().removeMessageReceiver(Messages::PlaybackSessionManager::messageReceiverName(), m_page->pageID());
+}
+
+PlaybackSessionManager::ModelInterfaceTuple PlaybackSessionManager::createModelAndInterface(uint64_t contextId)
+{
+    RefPtr<PlaybackSessionModelMediaElement> model = PlaybackSessionModelMediaElement::create();
+    RefPtr<PlaybackSessionInterfaceContext> interface = PlaybackSessionInterfaceContext::create(*this, contextId);
+    model->addClient(*interface);
+
+    return std::make_tuple(WTFMove(model), WTFMove(interface));
+}
+
+PlaybackSessionManager::ModelInterfaceTuple& PlaybackSessionManager::ensureModelAndInterface(uint64_t contextId)
+{
+    auto addResult = m_contextMap.add(contextId, ModelInterfaceTuple());
+    if (addResult.isNewEntry)
+        addResult.iterator->value = createModelAndInterface(contextId);
+    return addResult.iterator->value;
+}
+
+WebCore::PlaybackSessionModelMediaElement& PlaybackSessionManager::ensureModel(uint64_t contextId)
+{
+    return *std::get<0>(ensureModelAndInterface(contextId));
+}
+
+PlaybackSessionInterfaceContext& PlaybackSessionManager::ensureInterface(uint64_t contextId)
+{
+    return *std::get<1>(ensureModelAndInterface(contextId));
+}
+
+void PlaybackSessionManager::removeContext(uint64_t contextId)
+{
+    RefPtr<PlaybackSessionModelMediaElement> model;
+    RefPtr<PlaybackSessionInterfaceContext> interface;
+    std::tie(model, interface) = ensureModelAndInterface(contextId);
+
+    RefPtr<HTMLMediaElement> mediaElement = model->mediaElement();
+    model->setMediaElement(nullptr);
+    model->removeClient(*interface);
+    interface->invalidate();
+    m_mediaElements.remove(mediaElement.get());
+    m_contextMap.remove(contextId);
+}
+
+void PlaybackSessionManager::addClientForContext(uint64_t contextId)
+{
+    m_clientCounts.add(contextId);
+}
+
+void PlaybackSessionManager::removeClientForContext(uint64_t contextId)
+{
+    ASSERT(m_clientCounts.contains(contextId));
+    if (m_clientCounts.remove(contextId))
+        removeContext(contextId);
+}
+
+void PlaybackSessionManager::setUpPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
+{
+#if PLATFORM(MAC)
+    auto foundIterator = m_mediaElements.find(&mediaElement);
+    if (foundIterator != m_mediaElements.end()) {
+        uint64_t contextId = foundIterator->value;
+        if (m_controlsManagerContextId == contextId)
+            return;
+
+        if (m_controlsManagerContextId)
+            removeClientForContext(m_controlsManagerContextId);
+        m_controlsManagerContextId = contextId;
+    } else {
+        auto addResult = m_mediaElements.ensure(&mediaElement, [&] { return nextContextId(); });
+        auto contextId = addResult.iterator->value;
+        if (m_controlsManagerContextId)
+            removeClientForContext(m_controlsManagerContextId);
+        m_controlsManagerContextId = contextId;
+        ensureModel(contextId).setMediaElement(&mediaElement);
+    }
+
+    addClientForContext(m_controlsManagerContextId);
+    m_page->send(Messages::PlaybackSessionManagerProxy::SetUpPlaybackControlsManagerWithID(m_controlsManagerContextId), m_page->pageID());
+#endif
+}
+
+void PlaybackSessionManager::clearPlaybackControlsManager()
+{
+#if PLATFORM(MAC)
+    if (!m_controlsManagerContextId)
+        return;
+
+    removeClientForContext(m_controlsManagerContextId);
+    m_controlsManagerContextId = 0;
+    m_page->send(Messages::PlaybackSessionManagerProxy::ClearPlaybackControlsManager(), m_page->pageID());
+#endif
+}
+
+uint64_t PlaybackSessionManager::contextIdForMediaElement(WebCore::HTMLMediaElement& mediaElement)
+{
+    auto addResult = m_mediaElements.ensure(&mediaElement, [&] { return nextContextId(); });
+    uint64_t contextId = addResult.iterator->value;
+    ensureModel(contextId).setMediaElement(&mediaElement);
+    return contextId;
+}
+
+#pragma mark Interface to PlaybackSessionInterfaceContext:
+
+void PlaybackSessionManager::resetMediaState(uint64_t contextId)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::ResetMediaState(contextId), m_page->pageID());
+}
+
+void PlaybackSessionManager::durationChanged(uint64_t contextId, double duration)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::DurationChanged(contextId, duration), m_page->pageID());
+}
+
+void PlaybackSessionManager::currentTimeChanged(uint64_t contextId, double currentTime, double anchorTime)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::CurrentTimeChanged(contextId, currentTime, anchorTime), m_page->pageID());
+}
+
+void PlaybackSessionManager::bufferedTimeChanged(uint64_t contextId, double bufferedTime)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::BufferedTimeChanged(contextId, bufferedTime), m_page->pageID());
+}
+
+void PlaybackSessionManager::playbackStartedTimeChanged(uint64_t contextId, double playbackStartedTime)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::PlaybackStartedTimeChanged(contextId, playbackStartedTime), m_page->pageID());
+}
+
+void PlaybackSessionManager::rateChanged(uint64_t contextId, bool isPlaying, float playbackRate)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::RateChanged(contextId, isPlaying, playbackRate), m_page->pageID());
+}
+
+void PlaybackSessionManager::seekableRangesChanged(uint64_t contextId, const WebCore::TimeRanges& timeRanges, double lastModifiedTime, double liveUpdateInterval)
+{
+    Vector<std::pair<double, double>> rangesVector;
+    for (unsigned i = 0; i < timeRanges.length(); i++) {
+        double start = timeRanges.ranges().start(i).toDouble();
+        double end = timeRanges.ranges().end(i).toDouble();
+        rangesVector.append({ start, end });
+    }
+    m_page->send(Messages::PlaybackSessionManagerProxy::SeekableRangesVectorChanged(contextId, WTFMove(rangesVector), lastModifiedTime, liveUpdateInterval), m_page->pageID());
+}
+
+void PlaybackSessionManager::canPlayFastReverseChanged(uint64_t contextId, bool value)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::CanPlayFastReverseChanged(contextId, value), m_page->pageID());
+}
+
+void PlaybackSessionManager::audioMediaSelectionOptionsChanged(uint64_t contextId, const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::AudioMediaSelectionOptionsChanged(contextId, options, selectedIndex), m_page->pageID());
+}
+
+void PlaybackSessionManager::legibleMediaSelectionOptionsChanged(uint64_t contextId, const Vector<MediaSelectionOption>& options, uint64_t selectedIndex)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::LegibleMediaSelectionOptionsChanged(contextId, options, selectedIndex), m_page->pageID());
+}
+
+void PlaybackSessionManager::externalPlaybackChanged(uint64_t contextId, bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType targetType, String localizedDeviceName)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::ExternalPlaybackPropertiesChanged(contextId, enabled, static_cast<uint32_t>(targetType), localizedDeviceName), m_page->pageID());
+}
+
+void PlaybackSessionManager::audioMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::AudioMediaSelectionIndexChanged(contextId, selectedIndex), m_page->pageID());
+}
+
+void PlaybackSessionManager::legibleMediaSelectionIndexChanged(uint64_t contextId, uint64_t selectedIndex)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::LegibleMediaSelectionIndexChanged(contextId, selectedIndex), m_page->pageID());
+}
+
+void PlaybackSessionManager::wirelessVideoPlaybackDisabledChanged(uint64_t contextId, bool disabled)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::WirelessVideoPlaybackDisabledChanged(contextId, disabled));
+}
+
+void PlaybackSessionManager::mutedChanged(uint64_t contextId, bool muted)
+{
+    m_page->send(Messages::PlaybackSessionManagerProxy::MutedChanged(contextId, muted));
+}
+
+#pragma mark Messages from PlaybackSessionManagerProxy:
+
+void PlaybackSessionManager::play(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).play();
+}
+
+void PlaybackSessionManager::pause(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).pause();
+}
+
+void PlaybackSessionManager::togglePlayState(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).togglePlayState();
+}
+
+void PlaybackSessionManager::beginScrubbing(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).beginScrubbing();
+}
+
+void PlaybackSessionManager::endScrubbing(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).endScrubbing();
+}
+
+void PlaybackSessionManager::seekToTime(uint64_t contextId, double time)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).seekToTime(time);
+}
+
+void PlaybackSessionManager::fastSeek(uint64_t contextId, double time)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).fastSeek(time);
+}
+
+void PlaybackSessionManager::beginScanningForward(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).beginScanningForward();
+}
+
+void PlaybackSessionManager::beginScanningBackward(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).beginScanningBackward();
+}
+
+void PlaybackSessionManager::endScanning(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).endScanning();
+}
+
+void PlaybackSessionManager::selectAudioMediaOption(uint64_t contextId, uint64_t index)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).selectAudioMediaOption(index);
+}
+
+void PlaybackSessionManager::selectLegibleMediaOption(uint64_t contextId, uint64_t index)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).selectLegibleMediaOption(index);
+}
+
+void PlaybackSessionManager::handleControlledElementIDRequest(uint64_t contextId)
+{
+    auto element = ensureModel(contextId).mediaElement();
+    if (element)
+        m_page->send(Messages::PlaybackSessionManagerProxy::HandleControlledElementIDResponse(contextId, element->getIdAttribute()));
+}
+
+void PlaybackSessionManager::togglePictureInPicture(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).togglePictureInPicture();
+}
+
+void PlaybackSessionManager::toggleMuted(uint64_t contextId)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).toggleMuted();
+}
+
+void PlaybackSessionManager::setMuted(uint64_t contextId, bool muted)
+{
+    UserGestureIndicator indicator(ProcessingUserGesture);
+    ensureModel(contextId).setMuted(muted);
+}
+
+} // namespace WebKit
+
+#endif // PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))