Changeset 187917 in webkit

Timestamp:

Aug 4, 2015 4:55:09 PM (9 years ago)

Author:

mrajca@apple.com

Message:

Media Session: add a focus manager that WebKit clients can use to access the focused media element
​https://bugs.webkit.org/show_bug.cgi?id=147629

Reviewed by Tim Horton.

• Shared/API/APIObject.h: Added a new type for the focus manager.
• Shared/API/c/WKBase.h: Added a new type for the focus manager.
• UIProcess/API/C/WKAPICast.h: Added a new type for the focus manager.
• UIProcess/API/C/WKContext.cpp: The "global" focus manager is accessed via WKContext.

(WKContextGetMediaSessionFocusManager):

• UIProcess/API/C/WKContext.h:
• UIProcess/API/C/WKMediaSessionFocusManager.cpp: Added C wrapper for WebMediaSessionFocusManager.

(WKMediaSessionFocusManagerGetTypeID):
(WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused):

• UIProcess/API/C/WKMediaSessionFocusManager.h: Added C wrapper for WebMediaSessionFocusManager.
• UIProcess/WebMediaSessionFocusManager.cpp: Added to keep track of the focused media element in the UI process and let clients query this state.

(WebKit::WebMediaSessionFocusManager::supplementName):
(WebKit::WebMediaSessionFocusManager::create):
(WebKit::WebMediaSessionFocusManager::WebMediaSessionFocusManager):
(WebKit::WebMediaSessionFocusManager::refWebContextSupplement):
(WebKit::WebMediaSessionFocusManager::derefWebContextSupplement):
(WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Check if the media element on the focused page is paused.
(WebKit::WebMediaSessionFocusManager::setFocusedMediaElement): Keep track of the focused page / media element pair.
(WebKit::WebMediaSessionFocusManager::clearFocusedMediaElement): Reset the focused page / media element pair.

• UIProcess/WebMediaSessionFocusManager.h: Added.
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::isMediaElementPaused): Updated to take a UnsignedCallback.
(WebKit::WebPageProxy::focusedContentMediaElementDidChange): Store the focused media element in the focus manager.

• UIProcess/WebPageProxy.h:
• UIProcess/WebProcessPool.cpp: Added WebMediaSessionFocusManager as a supplement.
• UIProcess/WebProcessPool.h: WebMediaSessionFocusManager is a supplement, so include its header.
• WebKit2.xcodeproj/project.pbxproj: Added new sources and ran sort-xcode-project.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/APIObject.h (modified) (1 diff)
• Shared/API/c/WKBase.h (modified) (1 diff)
• UIProcess/API/C/WKAPICast.h (modified) (2 diffs)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/C/WKContext.h (modified) (1 diff)
• UIProcess/API/C/WKMediaSessionFocusManager.cpp (added)
• UIProcess/API/C/WKMediaSessionFocusManager.h (added)
• UIProcess/WebMediaSessionFocusManager.cpp (added)
• UIProcess/WebMediaSessionFocusManager.h (added)
• UIProcess/WebPageProxy.cpp (modified) (4 diffs)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.h (modified) (1 diff)
• WebKit2.xcodeproj/project.pbxproj (modified) (64 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-08-04  Matt Rajca  <mrajca@apple.com>
+
+        Media Session: add a focus manager that WebKit clients can use to access the focused media element
+        https://bugs.webkit.org/show_bug.cgi?id=147629
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/APIObject.h: Added a new type for the focus manager.
+        * Shared/API/c/WKBase.h: Added a new type for the focus manager.
+        * UIProcess/API/C/WKAPICast.h: Added a new type for the focus manager.
+        * UIProcess/API/C/WKContext.cpp: The "global" focus manager is accessed via WKContext.
+        (WKContextGetMediaSessionFocusManager):
+        * UIProcess/API/C/WKContext.h:
+        * UIProcess/API/C/WKMediaSessionFocusManager.cpp: Added C wrapper for WebMediaSessionFocusManager.
+        (WKMediaSessionFocusManagerGetTypeID):
+        (WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused):
+        * UIProcess/API/C/WKMediaSessionFocusManager.h: Added C wrapper for WebMediaSessionFocusManager.
+        * UIProcess/WebMediaSessionFocusManager.cpp: Added to keep track of the focused media element in the UI process and let clients query this state.
+        (WebKit::WebMediaSessionFocusManager::supplementName):
+        (WebKit::WebMediaSessionFocusManager::create):
+        (WebKit::WebMediaSessionFocusManager::WebMediaSessionFocusManager):
+        (WebKit::WebMediaSessionFocusManager::refWebContextSupplement):
+        (WebKit::WebMediaSessionFocusManager::derefWebContextSupplement):
+        (WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Check if the media element on the focused page is paused.
+        (WebKit::WebMediaSessionFocusManager::setFocusedMediaElement): Keep track of the focused page / media element pair.
+        (WebKit::WebMediaSessionFocusManager::clearFocusedMediaElement): Reset the focused page / media element pair.
+        * UIProcess/WebMediaSessionFocusManager.h: Added.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::isMediaElementPaused): Updated to take a UnsignedCallback.
+        (WebKit::WebPageProxy::focusedContentMediaElementDidChange): Store the focused media element in the focus manager.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessPool.cpp: Added WebMediaSessionFocusManager as a supplement.
+        * UIProcess/WebProcessPool.h: WebMediaSessionFocusManager is a supplement, so include its header.
+        * WebKit2.xcodeproj/project.pbxproj: Added new sources and ran sort-xcode-project.
+
 2015-08-04  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/API/APIObject.h

@@ -151 +151 @@
 
 #if ENABLE(MEDIA_SESSION)
+        MediaSessionFocusManager,
         MediaSessionMetadata,
 #endif

trunk/Source/WebKit2/Shared/API/c/WKBase.h

@@ -113 +113 @@
 typedef const struct OpaqueWKKeyValueStorageManager* WKKeyValueStorageManagerRef;
 typedef const struct OpaqueWKMediaCacheManager* WKMediaCacheManagerRef;
+typedef const struct OpaqueWKMediaSessionFocusManager* WKMediaSessionFocusManagerRef;
 typedef const struct OpaqueWKMediaSessionMetadata* WKMediaSessionMetadataRef;
 typedef const struct OpaqueWKNavigationAction* WKNavigationActionRef;

trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -93 +93 @@
 class WebInspectorProxy;
 class WebMediaCacheManagerProxy;
+class WebMediaSessionFocusManager;
 class WebMediaSessionMetadata;
 class WebNotification;
@@ -137 +138 @@
 WK_ADD_API_MAPPING(WKInspectorRef, WebInspectorProxy)
 WK_ADD_API_MAPPING(WKMediaCacheManagerRef, WebMediaCacheManagerProxy)
+WK_ADD_API_MAPPING(WKMediaSessionFocusManagerRef, WebMediaSessionFocusManager)
 WK_ADD_API_MAPPING(WKMediaSessionMetadataRef, WebMediaSessionMetadata)
 WK_ADD_API_MAPPING(WKNavigationActionRef, API::NavigationAction)

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -455 +455 @@
 }
 
+WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context)
+{
+#if ENABLE(MEDIA_SESSION)
+    return toAPI(toImpl(context)->supplement<WebMediaSessionFocusManager>());
+#else
+    UNUSED_PARAM(context);
+    return nullptr;
+#endif
+}
+
 WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef contextRef)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKContext.h

@@ -142 +142 @@
 WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
 WK_EXPORT WKMediaCacheManagerRef WKContextGetMediaCacheManager(WKContextRef context);
+WK_EXPORT WKMediaSessionFocusManagerRef WKContextGetMediaSessionFocusManager(WKContextRef context);
 WK_EXPORT WKNotificationManagerRef WKContextGetNotificationManager(WKContextRef context);
 WK_EXPORT WKPluginSiteDataManagerRef WKContextGetPluginSiteDataManager(WKContextRef context);

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -108 +108 @@
 #include <WebCore/FocusDirection.h>
 #include <WebCore/MIMETypeRegistry.h>
-#include <WebCore/NotImplemented.h>
 #include <WebCore/RenderEmbeddedObject.h>
 #include <WebCore/SerializedCryptoKeyWrap.h>
@@ -162 +161 @@
 
 #if ENABLE(MEDIA_SESSION)
+#include "WebMediaSessionFocusManager.h"
 #include "WebMediaSessionMetadata.h"
 #include <WebCore/MediaSessionMetadata.h>
@@ -3884 +3884 @@
 }
 
-void WebPageProxy::isMediaElementPaused(uint64_t elementID, uint64_t callbackID)
-{
-    if (!isValid())
-        return;
+void WebPageProxy::isMediaElementPaused(uint64_t elementID, RefPtr<UnsignedCallback> callback)
+{
+    if (!isValid()) {
+        callback->invalidate();
+        return;
+    }
+
+    uint64_t callbackID = callback->callbackID();
+    m_callbacks.put(callback);
 
     m_process->send(Messages::WebPage::IsMediaElementPaused(elementID, callbackID), m_pageID);
@@ -5974 +5979 @@
 void WebPageProxy::focusedContentMediaElementDidChange(uint64_t elementID)
 {
-    notImplemented();
+    WebMediaSessionFocusManager* focusManager = process().processPool().supplement<WebMediaSessionFocusManager>();
+    ASSERT(focusManager);
+    focusManager->setFocusedMediaElement(*this, elementID);
 }
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -944 +944 @@
     bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
     void handleMediaEvent(WebCore::MediaEventType);
-    void isMediaElementPaused(uint64_t, uint64_t);
+    void isMediaElementPaused(uint64_t, RefPtr<UnsignedCallback>);
 #endif
 

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -193 +193 @@
     addSupplement<WebBatteryManagerProxy>();
 #endif
+#if ENABLE(MEDIA_SESSION)
+    addSupplement<WebMediaSessionFocusManager>();
+#endif
 
     processPools().append(this);

trunk/Source/WebKit2/UIProcess/WebProcessPool.h

@@ -64 +64 @@
 #endif
 
+#if ENABLE(MEDIA_SESSION)
+#include "WebMediaSessionFocusManager.h"
+#endif
+
 #if PLATFORM(COCOA)
 OBJC_CLASS NSMutableDictionary;

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -1660 +1660 @@
                 C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */; };
                 C5FA1ED418E1062200B3F402 /* WKAirPlayRoutePicker.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */; };
+                C98C48A51B6FD4C300145103 /* WebMediaSessionFocusManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */; };
+                C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */; };
+                C98C48A91B6FD5B500145103 /* WKMediaSessionFocusManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */; };
+                C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 C9CD43971B4B001900239E33 /* WebMediaSessionMetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */; };
                 C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */; };
@@ -3884 +3888 @@
                 C5FA1ED118E1062200B3F402 /* WKAirPlayRoutePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKAirPlayRoutePicker.h; path = ios/forms/WKAirPlayRoutePicker.h; sourceTree = "<group>"; };
                 C5FA1ED218E1062200B3F402 /* WKAirPlayRoutePicker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKAirPlayRoutePicker.mm; path = ios/forms/WKAirPlayRoutePicker.mm; sourceTree = "<group>"; };
+                C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
+                C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionFocusManager.h; sourceTree = "<group>"; };
+                C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKMediaSessionFocusManager.cpp; sourceTree = "<group>"; };
+                C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMediaSessionFocusManager.h; sourceTree = "<group>"; };
                 C9CD43931B4B000E00239E33 /* WebMediaSessionMetadata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMediaSessionMetadata.cpp; sourceTree = "<group>"; };
                 C9CD43941B4B000E00239E33 /* WebMediaSessionMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebMediaSessionMetadata.h; sourceTree = "<group>"; };
@@ -5113 +5121 @@
                         children = (
                                 C54256AE18BEC16100DE4179 /* forms */,
+                                A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */,
+                                A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */,
                                 1AD4C1911B39F33200ABC28E /* ApplicationStateTracker.h */,
                                 1AD4C1901B39F33200ABC28E /* ApplicationStateTracker.mm */,
-                                A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */,
-                                A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */,
                                 0F0C365D18C110A500F607D7 /* LayerRepresentation.mm */,
                                 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */,
@@ -5381 +5389 @@
                                 1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */,
                                 1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */,
+                                1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */,
                                 1AA654D01B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h */,
-                                1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */,
                                 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */,
                                 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */,
@@ -6169 +6177 @@
                                 33D3A3B81339606200709BE4 /* WebMediaCacheManagerProxy.h */,
                                 33D3A3B91339606200709BE4 /* WebMediaCacheManagerProxy.messages.in */,
+                                C98C48A31B6FD4C300145103 /* WebMediaSessionFocusManager.cpp */,
+                                C98C48A41B6FD4C300145103 /* WebMediaSessionFocusManager.h */,
                                 7CCCC8F81A5F50FD008FB0DA /* WebNavigationState.cpp */,
                                 7CCCC8F91A5F50FD008FB0DA /* WebNavigationState.h */,
@@ -6313 +6323 @@
                                 33D3A3B31339600B00709BE4 /* WKMediaCacheManager.cpp */,
                                 33D3A3B41339600B00709BE4 /* WKMediaCacheManager.h */,
+                                C98C48A71B6FD5B500145103 /* WKMediaSessionFocusManager.cpp */,
+                                C98C48A81B6FD5B500145103 /* WKMediaSessionFocusManager.h */,
                                 C9CD43991B4B024200239E33 /* WKMediaSessionMetadata.cpp */,
                                 C9CD439A1B4B024200239E33 /* WKMediaSessionMetadata.h */,
@@ -7426 +7438 @@
                                 E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */,
                                 E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */,
+                                E4697CCC1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp */,
                                 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */,
-                                E4697CCC1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp */,
                                 E42E060B1AA7440D00B11699 /* NetworkCacheIOChannel.h */,
                                 E42E060D1AA750E500B11699 /* NetworkCacheIOChannelCocoa.mm */,
@@ -7501 +7513 @@
                                 2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */,
                                 A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */,
+                                9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */,
                                 1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */,
                                 7C89D2D71A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h in Headers */,
@@ -7523 +7536 @@
                                 1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */,
                                 1AFB4C6E1ADF0C7800B33339 /* _WKWebsiteDataRecord.h in Headers */,
-                                75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */,
-                                75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */,
+                                1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */,
+                                1A4A93B71AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h in Headers */,
                                 A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */,
                                 A7D792D81767CCA300881CBE /* ActivityAssertion.h in Headers */,
@@ -7552 +7565 @@
                                 BC33DD681238464600360F3F /* APINumber.h in Headers */,
                                 7C89D2981A6753B2003A5FDE /* APIPageConfiguration.h in Headers */,
-                                E4E864931B16750700C82F40 /* VersionChecks.h in Headers */,
                                 1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */,
-                                3754D5451B3A29FD003A4C7F /* NSInvocationSPI.h in Headers */,
                                 1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */,
                                 7CE4D2201A4914CA00C7F152 /* APIProcessPoolConfiguration.h in Headers */,
@@ -7569 +7580 @@
                                 7C89D2941A67122F003A5FDE /* APIUserScript.h in Headers */,
                                 C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */,
-                                1A4A93B71AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h in Headers */,
                                 C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */,
                                 1A4832C81A9BC13C008B4DFE /* APIWebsiteDataRecord.h in Headers */,
                                 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
+                                1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */,
                                 1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */,
                                 1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */,
@@ -7580 +7591 @@
                                 BC032DA810F437D10058C15A /* ArgumentEncoder.h in Headers */,
                                 BC032DA910F437D10058C15A /* Arguments.h in Headers */,
+                                CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */,
                                 C59C4A5918B81174007BDCB6 /* AssistedNodeInformation.h in Headers */,
                                 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
@@ -7591 +7603 @@
                                 7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */,
                                 CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */,
-                                CE1A0BD21A48E6C60054EF74 /* AssertionServicesSPI.h in Headers */,
                                 E164A2F2191AF14E0010737D /* BlobDataFileReferenceWithSandboxExtension.h in Headers */,
                                 E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
@@ -7599 +7610 @@
                                 1A2D956F12848564001EB962 /* ChildProcess.h in Headers */,
                                 BC82837A16B36A4F00A278FE /* ChildProcessEntryPoint.h in Headers */,
+                                51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */,
                                 E1513C67166EABB200149FCB /* ChildProcessProxy.h in Headers */,
                                 290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */,
@@ -7624 +7636 @@
                                 BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */,
                                 518E8F0816B2093700E91429 /* Download.h in Headers */,
-                                15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */,
                                 518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */,
                                 A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
@@ -7649 +7660 @@
                                 BC17753F118BABF0007D9E9A /* GenericCallback.h in Headers */,
                                 BC06F42F12DBB9B6002D78DE /* GeolocationPermissionRequestManager.h in Headers */,
-                                51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */,
                                 BC06F44A12DBD1F5002D78DE /* GeolocationPermissionRequestManagerProxy.h in Headers */,
                                 BC06F43A12DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h in Headers */,
@@ -7655 +7665 @@
                                 2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */,
                                 C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */,
+                                1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */,
                                 37F90DE31376560E0051CF68 /* HTTPCookieAcceptPolicy.h in Headers */,
                                 5175095A1897249700408FAC /* IDBIdentifier.h in Headers */,
@@ -7751 +7762 @@
                                 1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
                                 1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */,
+                                3754D5451B3A29FD003A4C7F /* NSInvocationSPI.h in Headers */,
                                 BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */,
                                 BCCF672D12C7EDF7008F9C35 /* OriginAndDatabases.h in Headers */,
@@ -7776 +7788 @@
                                 1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */,
                                 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */,
-                                9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */,
                                 1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */,
                                 1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */,
@@ -7785 +7796 @@
                                 1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
                                 1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */,
-                                51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */,
                                 1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */,
                                 1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */,
@@ -7800 +7810 @@
                                 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */,
                                 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
-                                51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */,
                                 2D7F13101A702FBA009A6FBD /* ProcessType.h in Headers */,
                                 A118A9EF1907AD6F00F7C92B /* QuickLookDocumentData.h in Headers */,
@@ -7813 +7822 @@
                                 2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */,
                                 0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */,
-                                1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */,
                                 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
                                 E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */,
@@ -7824 +7832 @@
                                 0F59479D187B3B6000437857 /* RemoteScrollingTree.h in Headers */,
                                 1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */,
+                                2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */,
                                 BC2D021712AC41CB00E732A3 /* SameDocumentNavigationType.h in Headers */,
                                 1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */,
@@ -7840 +7849 @@
                                 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
                                 753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
-                                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
                                 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
                                 51217461164C20E30037A5C1 /* ShareableResource.h in Headers */,
@@ -7874 +7882 @@
                                 4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */,
                                 4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */,
+                                E4E864931B16750700C82F40 /* VersionChecks.h in Headers */,
                                 2D125C5E1857EA05003BA3CB /* ViewGestureController.h in Headers */,
                                 2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */,
@@ -7968 +7977 @@
                                 1C891D6619B124FF00BA79DD /* WebInspectorUI.h in Headers */,
                                 1CBBE4A119B66C53006B7D81 /* WebInspectorUIMessages.h in Headers */,
-                                1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */,
                                 2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */,
                                 1A6280C51919949F006AD9F9 /* WebKit.h in Headers */,
@@ -7980 +7988 @@
                                 33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
                                 CD003A5319D49B5D005ABCE0 /* WebMediaKeyStorageManager.h in Headers */,
+                                C98C48A61B6FD4C300145103 /* WebMediaSessionFocusManager.h in Headers */,
                                 C9CD43981B4B001D00239E33 /* WebMediaSessionMetadata.h in Headers */,
                                 2D3EF4431917646300034184 /* WebMemoryPressureHandlerIOS.h in Headers */,
@@ -8006 +8015 @@
                                 BCBD3915125BB1A800D2C29F /* WebPageProxyMessages.h in Headers */,
                                 512127C41908239A00DAF35C /* WebPasteboardOverrides.h in Headers */,
-                                1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */,
                                 7C4694D11A51E36800AD5845 /* WebPasteboardProxy.h in Headers */,
                                 7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */,
@@ -8023 +8031 @@
                                 1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */,
                                 BC306824125A6B9400E71278 /* WebProcessCreationParameters.h in Headers */,
-                                2DB9C4AC1B3251BD0070F27F /* SafariServicesSPI.h in Headers */,
-                                933DF82E1B3BC09000AEA9E3 /* WKImagePreviewViewController.h in Headers */,
                                 1AFA4B901A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h in Headers */,
                                 1AFA4B8C1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h in Headers */,
@@ -8054 +8060 @@
                                 1AAF08A2192681D100B6390C /* WebUserContentControllerProxy.h in Headers */,
                                 7C361D79192803BD0036A59D /* WebUserContentControllerProxyMessages.h in Headers */,
+                                15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */,
                                 3F889D15188778C900FEADAF /* WebVideoFullscreenManagerProxy.h in Headers */,
                                 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */,
@@ -8074 +8081 @@
                                 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */,
                                 BC646C1B11DD399F006455B0 /* WKBackForwardListRef.h in Headers */,
-                                2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
                                 BCDDB317124EBD130048D13C /* WKBase.h in Headers */,
                                 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */,
@@ -8101 +8107 @@
                                 65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */,
                                 BC7043CC12F75EE0006472B9 /* WKBundleNavigationAction.h in Headers */,
+                                51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */,
                                 BC4BEFE1120A1A4C00FBA0C7 /* WKBundleNodeHandle.h in Headers */,
                                 BC57450C1263B155006F0F12 /* WKBundleNodeHandlePrivate.h in Headers */,
@@ -8120 +8127 @@
                                 BCF049E711FE20F600F86A58 /* WKBundlePrivate.h in Headers */,
                                 BC60C5791240A546008C5E29 /* WKBundleRangeHandle.h in Headers */,
-                                51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */,
                                 BC5D24C716CD73C5007D5461 /* WKBundleRangeHandlePrivate.h in Headers */,
                                 BC14DF9F120B635F00826C0C /* WKBundleScriptWorld.h in Headers */,
@@ -8189 +8195 @@
                                 BCCF6AC312C91F34008F9C35 /* WKImage.h in Headers */,
                                 BCCF6ACA12C91F59008F9C35 /* WKImageCG.h in Headers */,
+                                933DF82E1B3BC09000AEA9E3 /* WKImagePreviewViewController.h in Headers */,
                                 9321D5861A38EE3C008052BE /* WKImmediateActionController.h in Headers */,
                                 9321D58A1A38F196008052BE /* WKImmediateActionTypes.h in Headers */,
@@ -8198 +8205 @@
                                 2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
                                 33D3A3B61339600B00709BE4 /* WKMediaCacheManager.h in Headers */,
+                                C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
                                 C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
                                 BC4075FE124FF0270068F20A /* WKMutableArray.h in Headers */,
@@ -8289 +8297 @@
                                 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */,
                                 0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */,
+                                51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */,
+                                51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */,
+                                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
                                 BC407604124FF0270068F20A /* WKSerializedScriptValue.h in Headers */,
                                 F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */,
@@ -8324 +8335 @@
                                 BC8699B5116AADAA002A925B /* WKView.h in Headers */,
                                 BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */,
+                                2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
                                 BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
                                 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */,
@@ -8349 +8361 @@
                                 1A4832CC1A9BC465008B4DFE /* WKWebsiteDataRecord.h in Headers */,
                                 1A4832CE1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h in Headers */,
+                                1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */,
+                                75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */,
+                                75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */,
                                 1A57109F1ABA0027002FABBE /* WKWebsiteDataStoreRef.h in Headers */,
                                 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */,
@@ -8359 +8374 @@
                                 26F9A83B18A3468100AEB88A /* WKWebViewPrivate.h in Headers */,
                                 1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */,
-                                1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */,
                                 1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */,
                                 BCBECDE816B6416800047A1A /* XPCServiceEntryPoint.h in Headers */,
@@ -9334 +9348 @@
                                 7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */,
                                 1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */,
-                                75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */,
+                                1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,
                                 A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */,
                                 A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
@@ -9353 +9367 @@
                                 1AC1336E18565D2B00F3EC05 /* APIPageHandle.cpp in Sources */,
                                 7CE4D21F1A4914CA00C7F152 /* APIProcessPoolConfiguration.cpp in Sources */,
+                                FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */,
                                 75A8D2E2187DEC1E00C39C9E /* APISession.cpp in Sources */,
                                 1AFDE6611954E9B100C48FFA /* APISessionState.cpp in Sources */,
@@ -9366 +9381 @@
                                 1A3635A91A3144A300ED6197 /* APIWebsiteDataStore.cpp in Sources */,
                                 1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
+                                1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,
                                 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */,
                                 1AAF0C4B12B16334008E49E2 /* ArgumentCodersCF.cpp in Sources */,
@@ -9388 +9404 @@
                                 A7E93CED1925331100A1DC48 /* ChildProcessIOS.mm in Sources */,
                                 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */,
+                                51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */,
                                 E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
                                 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
@@ -9446 +9463 @@
                                 BC06F43B12DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp in Sources */,
                                 2DA049B7180CCD0A00AAFA9E /* GraphicsLayerCARemote.cpp in Sources */,
+                                1AC75A1E1B33695E0056745B /* HangDetectionDisablerMac.mm in Sources */,
                                 518353DA1885BF8C00D9FE44 /* IDBSerialization.cpp in Sources */,
                                 51E351CA180F2CCC00E53BE9 /* IDBUtilities.cpp in Sources */,
@@ -9465 +9483 @@
                                 CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */,
                                 BCA8C6A811E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp in Sources */,
-                                51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
                                 BC8147AA12F64CDA007B2C32 /* InjectedBundlePagePolicyClient.cpp in Sources */,
                                 659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources */,
@@ -9506 +9523 @@
                                 1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */,
                                 1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */,
-                                51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */,
                                 1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */,
                                 1A4A9C9A12B821CD008FE984 /* NetscapePluginModuleMac.mm in Sources */,
@@ -9514 +9530 @@
                                 E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */,
                                 E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */,
+                                E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */,
                                 E42E06141AA75B7000B11699 /* NetworkCacheDataCocoa.mm in Sources */,
                                 E489D28D1A0A2DB80078C06A /* NetworkCacheDecoder.cpp in Sources */,
                                 E489D28F1A0A2DB80078C06A /* NetworkCacheEncoder.cpp in Sources */,
+                                E413F59F1AC1AF9D00345360 /* NetworkCacheEntry.cpp in Sources */,
                                 E4697CCD1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp in Sources */,
-                                E413F59F1AC1AF9D00345360 /* NetworkCacheEntry.cpp in Sources */,
                                 E42E060F1AA7523400B11699 /* NetworkCacheIOChannelCocoa.mm in Sources */,
                                 E4436ECD1A0D040B00EAD204 /* NetworkCacheKey.cpp in Sources */,
@@ -9564 +9581 @@
                                 1AC7537B183A9FDB0072CB15 /* PageLoadState.cpp in Sources */,
                                 C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */,
-                                933DF8301B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm in Sources */,
                                 E19582D6153CC05400B60875 /* PDFKitImports.mm in Sources */,
                                 2D870D1016234FFE000A3F20 /* PDFPlugin.mm in Sources */,
@@ -9583 +9599 @@
                                 1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */,
                                 7C3F8C90173AF52D007B7F39 /* PluginInformation.cpp in Sources */,
-                                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
                                 7C135AAC173B0CFF00586AE2 /* PluginInformationMac.mm in Sources */,
                                 1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
                                 1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */,
                                 1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */,
-                                1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,
                                 1A0EC907124C0AB8007EF4A5 /* PluginProcessConnection.cpp in Sources */,
                                 1A0EC910124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp in Sources */,
@@ -9674 +9688 @@
                                 1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */,
                                 2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */,
-                                FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */,
                                 1AA417EF12C00D87002BE67B /* TextCheckerMac.mm in Sources */,
                                 1AAF263814687C39004A1E8A /* TiledCoreAnimationDrawingArea.mm in Sources */,
@@ -9684 +9697 @@
                                 1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */,
                                 1AC1336718565B5700F3EC05 /* UserData.cpp in Sources */,
+                                15739BBC1B42040300D258C1 /* UserMediaPermissionRequestManager.cpp in Sources */,
                                 4A3CC18A19B063E700D14AEF /* UserMediaPermissionRequestManagerProxy.cpp in Sources */,
                                 4A3CC18C19B0641500D14AEF /* UserMediaPermissionRequestProxy.cpp in Sources */,
+                                E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */,
                                 2DF9593B18A42412009785A1 /* ViewGestureControllerIOS.mm in Sources */,
                                 2D125C5F1857EA05003BA3CB /* ViewGestureControllerMac.mm in Sources */,
@@ -9758 +9773 @@
                                 C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
                                 BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
-                                15739BBC1B42040300D258C1 /* UserMediaPermissionRequestManager.cpp in Sources */,
                                 BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
                                 1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */,
@@ -9785 +9799 @@
                                 511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
                                 51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */,
-                                2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
                                 51D02F64132EC5B900BEAA96 /* WebIconDatabaseMessageReceiver.cpp in Sources */,
                                 511B24A6132E095700065A0C /* WebIconDatabaseProxy.cpp in Sources */,
@@ -9801 +9814 @@
                                 1C891D6519B124FF00BA79DD /* WebInspectorUI.cpp in Sources */,
                                 1CA8B954127C891500576C2B /* WebInspectorUIMac.mm in Sources */,
-                                E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */,
                                 1CBBE4A019B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp in Sources */,
                                 2DA944A11884E4F000ED86DB /* WebIOSEventFactory.mm in Sources */,
@@ -9812 +9824 @@
                                 33D3A3CA1339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp in Sources */,
                                 CD003A5219D49B5D005ABCE0 /* WebMediaKeyStorageManager.cpp in Sources */,
+                                C98C48A51B6FD4C300145103 /* WebMediaSessionFocusManager.cpp in Sources */,
                                 C9CD43971B4B001900239E33 /* WebMediaSessionMetadata.cpp in Sources */,
                                 2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */,
@@ -9832 +9845 @@
                                 BC7B6207129A0A6700D174A4 /* WebPageGroup.cpp in Sources */,
                                 BC7B625312A43C9600D174A4 /* WebPageGroupData.cpp in Sources */,
-                                1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,
                                 BC7B621612A4219A00D174A4 /* WebPageGroupProxy.cpp in Sources */,
                                 29D55DF1161BF9F10031A2E3 /* WebPageGroupProxyMessageReceiver.cpp in Sources */,
@@ -9902 +9914 @@
                                 1AAF08A1192681D100B6390C /* WebUserContentControllerProxy.cpp in Sources */,
                                 7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */,
+                                15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */,
                                 3F889D171887859300FEADAF /* WebVideoFullscreenManager.mm in Sources */,
                                 3F418EF91887BD97002795FD /* WebVideoFullscreenManagerMessageReceiver.cpp in Sources */,
@@ -9993 +10006 @@
                                 BCCF6AC212C91F34008F9C35 /* WKImage.cpp in Sources */,
                                 BCCF6AC912C91F59008F9C35 /* WKImageCG.cpp in Sources */,
+                                933DF8301B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm in Sources */,
                                 9321D5881A38EE74008052BE /* WKImmediateActionController.mm in Sources */,
                                 1C8E293A12761E5B00BC7BD0 /* WKInspector.cpp in Sources */,
@@ -9999 +10013 @@
                                 51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */,
                                 33D3A3B51339600B00709BE4 /* WKMediaCacheManager.cpp in Sources */,
+                                C98C48A91B6FD5B500145103 /* WKMediaSessionFocusManager.cpp in Sources */,
                                 C9CD439E1B4B025300239E33 /* WKMediaSessionMetadata.cpp in Sources */,
                                 BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
@@ -10005 +10020 @@
                                 1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */,
                                 2D3A65DA1A7C3A1F00CAC637 /* WKNavigationActionRef.cpp in Sources */,
-                                15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */,
                                 370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
                                 BCF69FAA1176D1CB00471A52 /* WKNavigationDataRef.cpp in Sources */,
@@ -10050 +10064 @@
                                 37608822150414F700FC82C7 /* WKRenderObject.cpp in Sources */,
                                 3336763A130C99DC006C9DE2 /* WKResourceCacheManager.cpp in Sources */,
-                                1AC75A1E1B33695E0056745B /* HangDetectionDisablerMac.mm in Sources */,
                                 1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
                                 0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */,
+                                51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
+                                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */,
                                 BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
                                 75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */,
@@ -10078 +10093 @@
                                 BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
                                 2DA944951884E3B500ED86DB /* WKViewIOS.mm in Sources */,
+                                2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */,
                                 C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */,
                                 C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */,
@@ -10089 +10105 @@
                                 1F7506B01859162C00EC0FF7 /* WKWebProcessPlugInScriptWorld.mm in Sources */,
                                 1A4832CB1A9BC465008B4DFE /* WKWebsiteDataRecord.mm in Sources */,
+                                75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */,
                                 1A57109E1ABA0027002FABBE /* WKWebsiteDataStoreRef.cpp in Sources */,
                                 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */,
@@ -10095 +10112 @@
                                 1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
                                 BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,
-                                E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;