[webkit-changes] [235098] trunk/Source

mcatanzaro Mon, 20 Aug 2018 16:02:44 -0700

Title: [235098] trunk/Source

Revision: 235098
Author: [email protected]
Date: 2018-08-20 15:59:23 -0700 (Mon, 20 Aug 2018)

Log Message

[CMake] Sync unified build with Cocoa ports
https://bugs.webkit.org/show_bug.cgi?id=188732

Reviewed by Tim Horton.

Source/WebCore:

For iOS, disambiguate between ::WebEvent declared in PlatformKeyboardEvent.h and
WebCore::WebEvent declared in WebEvent.h. It's expected that we'll have to deal with random
issues like this when modifying unrelated source files in higher-level projects, since any
change to the sources list changes which files get bundled together, and headers from
lower-level projects that were not included before may now be included together.

* platform/PlatformKeyboardEvent.h:
(WebCore::PlatformKeyboardEvent::event const):

Source/WebKit:

Sync unified build with Cocoa ports. This enables unified build for WebKit/Platform and
WebKit/Shared.

Lots of files need to be moved around since the existing Sources.txt was not copied from
CMakeLists.txt. This replaces the Sources.txt with the sources list from CMakeList.txt.
Files that are not built for Cocoa are moved to SourcesGTK.txt, SourcesWPE.txt, and
PlatformWin.cmake. Files that are built only on Cocoa are moved to SourcesCocoa.txt. There's
plenty of room to determine if many of these files really need to be platform-specific in
the future, but let's not change that now.

Unfortunately, several files under Shared and PluginProcess need to be un-unified to be
usable for GTK's WebKitPluginProcess2. I've never managed to understand why, but it won't
link otherwise. Fortunately, this only affects a few files (listed in
PluginProcessGTK2_SOURCES), only a couple dozen of which are cross-platform.

* CMakeLists.txt:
* PlatformWin.cmake:
* Sources.txt:
* SourcesCocoa.txt:
* SourcesGTK.txt:
* SourcesWPE.txt:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/PlatformKeyboardEvent.h
trunk/Source/WebKit/CMakeLists.txt
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/PlatformGTK.cmake
trunk/Source/WebKit/PlatformWin.cmake
trunk/Source/WebKit/Sources.txt
trunk/Source/WebKit/SourcesCocoa.txt
trunk/Source/WebKit/SourcesGTK.txt
trunk/Source/WebKit/SourcesWPE.txt
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

Diff

Modified: trunk/Source/WebCore/ChangeLog (235097 => 235098)


--- trunk/Source/WebCore/ChangeLog	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebCore/ChangeLog	2018-08-20 22:59:23 UTC (rev 235098)
@@ -1,3 +1,19 @@
+2018-08-20  Michael Catanzaro  <[email protected]>
+
+        [CMake] Sync unified build with Cocoa ports
+        https://bugs.webkit.org/show_bug.cgi?id=188732
+
+        Reviewed by Tim Horton.
+
+        For iOS, disambiguate between ::WebEvent declared in PlatformKeyboardEvent.h and
+        WebCore::WebEvent declared in WebEvent.h. It's expected that we'll have to deal with random
+        issues like this when modifying unrelated source files in higher-level projects, since any
+        change to the sources list changes which files get bundled together, and headers from
+        lower-level projects that were not included before may now be included together.
+
+        * platform/PlatformKeyboardEvent.h:
+        (WebCore::PlatformKeyboardEvent::event const):
+
 2018-08-20  David Kilzer  <[email protected]>
 
         REGRESSION (r223192): Remove invalid `path` for Modules/geolocation/ios folder

Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (235097 => 235098)


--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h	2018-08-20 22:59:23 UTC (rev 235098)
@@ -142,7 +142,7 @@
 #if !PLATFORM(IOS)
         NSEvent* macEvent() const { return m_macEvent.get(); }
 #else
-        WebEvent *event() const { return m_Event.get(); }
+        ::WebEvent *event() const { return m_Event.get(); }
 #endif
 #endif
 
@@ -199,7 +199,7 @@
 #if !PLATFORM(IOS)
         RetainPtr<NSEvent> m_macEvent;
 #else
-        RetainPtr<WebEvent> m_Event;
+        RetainPtr<::WebEvent> m_Event;
 #endif
 #endif
 #if PLATFORM(GTK)

Modified: trunk/Source/WebKit/CMakeLists.txt (235097 => 235098)


--- trunk/Source/WebKit/CMakeLists.txt	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/CMakeLists.txt	2018-08-20 22:59:23 UTC (rev 235098)
@@ -97,531 +97,8 @@
     ${ICU_INCLUDE_DIRS}
 )
 
-set(WebKit_SOURCES
-    NetworkProcess/NetworkActivityTracker.cpp
-    NetworkProcess/NetworkCORSPreflightChecker.cpp
-    NetworkProcess/NetworkConnectionToWebProcess.cpp
-    NetworkProcess/NetworkContentRuleListManager.cpp
-    NetworkProcess/NetworkDataTask.cpp
-    NetworkProcess/NetworkDataTaskBlob.cpp
-    NetworkProcess/NetworkLoad.cpp
-    NetworkProcess/NetworkLoadChecker.cpp
-    NetworkProcess/NetworkProcess.cpp
-    NetworkProcess/NetworkProcessCreationParameters.cpp
-    NetworkProcess/NetworkProcessPlatformStrategies.cpp
-    NetworkProcess/NetworkResourceLoadParameters.cpp
-    NetworkProcess/NetworkResourceLoader.cpp
-    NetworkProcess/NetworkSession.cpp
-    NetworkProcess/NetworkSocketStream.cpp
-    NetworkProcess/PingLoad.cpp
-    NetworkProcess/PreconnectTask.cpp
-
-    NetworkProcess/Cookies/WebCookieManager.cpp
-
-    NetworkProcess/Downloads/Download.cpp
-    NetworkProcess/Downloads/DownloadManager.cpp
-    NetworkProcess/Downloads/PendingDownload.cpp
-
-    NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
-
-    NetworkProcess/cache/CacheStorageEngine.cpp
-    NetworkProcess/cache/CacheStorageEngineCache.cpp
-    NetworkProcess/cache/CacheStorageEngineCaches.cpp
-    NetworkProcess/cache/CacheStorageEngineConnection.cpp
-    NetworkProcess/cache/NetworkCache.cpp
-    NetworkProcess/cache/NetworkCacheBlobStorage.cpp
-    NetworkProcess/cache/NetworkCacheCoders.cpp
-    NetworkProcess/cache/NetworkCacheData.cpp
-    NetworkProcess/cache/NetworkCacheEntry.cpp
-    NetworkProcess/cache/NetworkCacheFileSystem.cpp
-    NetworkProcess/cache/NetworkCacheKey.cpp
-    NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
-    NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
-    NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
-    NetworkProcess/cache/NetworkCacheStatistics.cpp
-    NetworkProcess/cache/NetworkCacheStorage.cpp
-
-    NetworkProcess/capture/NetworkCaptureEvent.cpp
-    NetworkProcess/capture/NetworkCaptureManager.cpp
-    NetworkProcess/capture/NetworkCaptureRecorder.cpp
-    NetworkProcess/capture/NetworkCaptureReplayer.cpp
-    NetworkProcess/capture/NetworkCaptureResource.cpp
-    NetworkProcess/capture/NetworkDataTaskReplay.cpp
-
-    NetworkProcess/webrtc/NetworkMDNSRegister.cpp
-
-    Platform/Logging.cpp
-    Platform/Module.cpp
-
-    Platform/IPC/ArgumentCoders.cpp
-    Platform/IPC/Attachment.cpp
-    Platform/IPC/Connection.cpp
-    Platform/IPC/DataReference.cpp
-    Platform/IPC/Decoder.cpp
-    Platform/IPC/Encoder.cpp
-    Platform/IPC/MessageReceiverMap.cpp
-    Platform/IPC/MessageSender.cpp
-    Platform/IPC/StringReference.cpp
-
-    PluginProcess/PluginControllerProxy.cpp
-    PluginProcess/PluginCreationParameters.cpp
-    PluginProcess/PluginProcess.cpp
-    PluginProcess/WebProcessConnection.cpp
-
-    Shared/ActivityAssertion.cpp
-    Shared/AsyncRequest.cpp
-    Shared/BlobDataFileReferenceWithSandboxExtension.cpp
-    Shared/CacheModel.cpp
-    Shared/ChildProcess.cpp
-    Shared/ContextMenuContextData.cpp
-    Shared/EditorState.cpp
-    Shared/FontInfo.cpp
-    Shared/FrameInfoData.cpp
-    Shared/LayerTreeContext.cpp
-    Shared/LoadParameters.cpp
-    Shared/NavigationActionData.cpp
-    Shared/PlatformPopupMenuData.cpp
-    Shared/PrintInfo.cpp
-    Shared/RTCNetwork.cpp
-    Shared/RTCPacketOptions.cpp
-    Shared/SessionState.cpp
-    Shared/SessionTracker.cpp
-    Shared/ShareableBitmap.cpp
-    Shared/ShareableResource.cpp
-    Shared/SharedStringHashStore.cpp
-    Shared/SharedStringHashTableReadOnly.cpp
-    Shared/SharedStringHashTable.cpp
-    Shared/StatisticsData.cpp
-    Shared/TouchBarMenuData.cpp
-    Shared/TouchBarMenuItemData.cpp
-    Shared/URLSchemeTaskParameters.cpp
-    Shared/UpdateInfo.cpp
-    Shared/UserData.cpp
-    Shared/WebBackForwardListItem.cpp
-    Shared/WebCompiledContentRuleList.cpp
-    Shared/WebCompiledContentRuleListData.cpp
-    Shared/WebConnection.cpp
-    Shared/WebConnectionClient.cpp
-    Shared/WebContextMenuItem.cpp
-    Shared/WebContextMenuItemData.cpp
-    Shared/WebCoreArgumentCoders.cpp
-    Shared/WebErrors.cpp
-    Shared/WebEvent.cpp
-    Shared/WebEventConversion.cpp
-    Shared/WebGeolocationPosition.cpp
-    Shared/WebHitTestResultData.cpp
-    Shared/WebImage.cpp
-    Shared/WebKeyboardEvent.cpp
-    Shared/WebKit2Initialize.cpp
-    Shared/WebMediaSessionMetadata.cpp
-    Shared/WebMemorySampler.cpp
-    Shared/WebMouseEvent.cpp
-    Shared/WebPageCreationParameters.cpp
-    Shared/WebPageGroupData.cpp
-    Shared/WebPlatformTouchPoint.cpp
-    Shared/WebPopupItem.cpp
-    Shared/WebPreferencesDefaultValues.cpp
-    Shared/WebPreferencesStore.cpp
-    Shared/WebProcessCreationParameters.cpp
-    Shared/WebRenderLayer.cpp
-    Shared/WebRenderObject.cpp
-    Shared/WebTouchEvent.cpp
-    Shared/WebUserContentControllerDataTypes.cpp
-    Shared/WebWheelEvent.cpp
-    Shared/WebsiteDataStoreParameters.cpp
-    Shared/WebsitePoliciesData.cpp
-
-    Shared/API/APIArray.cpp
-    Shared/API/APIData.cpp
-    Shared/API/APIDictionary.cpp
-    Shared/API/APIError.cpp
-    Shared/API/APIFrameHandle.cpp
-    Shared/API/APIGeometry.cpp
-    Shared/API/APIObject.cpp
-    Shared/API/APIPageGroupHandle.cpp
-    Shared/API/APIPageHandle.cpp
-    Shared/API/APIURLRequest.cpp
-    Shared/API/APIURLResponse.cpp
-
-    Shared/API/c/WKArray.cpp
-    Shared/API/c/WKCertificateInfo.cpp
-    Shared/API/c/WKConnectionRef.cpp
-    Shared/API/c/WKContextMenuItem.cpp
-    Shared/API/c/WKData.cpp
-    Shared/API/c/WKDeprecatedFunctions.cpp
-    Shared/API/c/WKDictionary.cpp
-    Shared/API/c/WKErrorRef.cpp
-    Shared/API/c/WKGeometry.cpp
-    Shared/API/c/WKImage.cpp
-    Shared/API/c/WKMutableArray.cpp
-    Shared/API/c/WKMutableDictionary.cpp
-    Shared/API/c/WKNumber.cpp
-    Shared/API/c/WKPluginInformation.cpp
-    Shared/API/c/WKRenderLayer.cpp
-    Shared/API/c/WKRenderObject.cpp
-    Shared/API/c/WKSecurityOriginRef.cpp
-    Shared/API/c/WKSerializedScriptValue.cpp
-    Shared/API/c/WKString.cpp
-    Shared/API/c/WKType.cpp
-    Shared/API/c/WKURL.cpp
-    Shared/API/c/WKURLRequest.cpp
-    Shared/API/c/WKURLResponse.cpp
-    Shared/API/c/WKUserContentURLPattern.cpp
-
-    Shared/Authentication/AuthenticationManager.cpp
-
-    Shared/Databases/IndexedDB/IDBUtilities.cpp
-    Shared/Databases/IndexedDB/WebIDBResult.cpp
-
-    Shared/Gamepad/GamepadData.cpp
-
-    Shared/Plugins/NPIdentifierData.cpp
-    Shared/Plugins/NPObjectMessageReceiver.cpp
-    Shared/Plugins/NPObjectProxy.cpp
-    Shared/Plugins/NPRemoteObjectMap.cpp
-    Shared/Plugins/NPVariantData.cpp
-    Shared/Plugins/PluginProcessCreationParameters.cpp
-
-    Shared/Plugins/Netscape/NetscapePluginModule.cpp
-    Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
-    Shared/Plugins/Netscape/PluginInformation.cpp
-
-    Shared/Storage/StorageProcessCreationParameters.cpp
-
-    Shared/WebsiteData/WebsiteData.cpp
-
-    StorageProcess/StorageProcess.cpp
-    StorageProcess/StorageToWebProcessConnection.cpp
-
-    StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp
-
-    StorageProcess/ServiceWorker/WebSWOriginStore.cpp
-    StorageProcess/ServiceWorker/WebSWServerConnection.cpp
-    StorageProcess/ServiceWorker/WebSWServerToContextConnection.cpp
-
-    UIProcess/BackgroundProcessResponsivenessTimer.cpp
-    UIProcess/ChildProcessProxy.cpp
-    UIProcess/DrawingAreaProxy.cpp
-    UIProcess/FrameLoadState.cpp
-    UIProcess/GeolocationPermissionRequestManagerProxy.cpp
-    UIProcess/GeolocationPermissionRequestProxy.cpp
-    UIProcess/PageLoadState.cpp
-    UIProcess/ProcessAssertion.cpp
-    UIProcess/ProcessThrottler.cpp
-    UIProcess/RemoteWebInspectorProxy.cpp
-    UIProcess/ResourceLoadStatisticsMemoryStore.cpp
-    UIProcess/ResourceLoadStatisticsPersistentStorage.cpp
-    UIProcess/ResponsivenessTimer.cpp
-    UIProcess/ServiceWorkerProcessProxy.cpp
-    UIProcess/StatisticsRequest.cpp
-    UIProcess/SuspendedPageProxy.cpp
-    UIProcess/SystemPreviewController.cpp
-    UIProcess/TextCheckerCompletion.cpp
-    UIProcess/UIMessagePortChannelProvider.cpp
-    UIProcess/UserMediaPermissionCheckProxy.cpp
-    UIProcess/UserMediaPermissionRequestManagerProxy.cpp
-    UIProcess/UserMediaPermissionRequestProxy.cpp
-    UIProcess/UserMediaProcessManager.cpp
-    UIProcess/VisitedLinkStore.cpp
-    UIProcess/WebBackForwardList.cpp
-    UIProcess/WebColorPicker.cpp
-    UIProcess/WebConnectionToWebProcess.cpp
-    UIProcess/WebContextClient.cpp
-    UIProcess/WebContextConnectionClient.cpp
-    UIProcess/WebContextInjectedBundleClient.cpp
-    UIProcess/WebContextMenuListenerProxy.cpp
-    UIProcess/WebContextMenuProxy.cpp
-    UIProcess/WebCookieManagerProxy.cpp
-    UIProcess/WebCookieManagerProxyClient.cpp
-    UIProcess/WebEditCommandProxy.cpp
-    UIProcess/WebFormClient.cpp
-    UIProcess/WebFormSubmissionListenerProxy.cpp
-    UIProcess/WebFramePolicyListenerProxy.cpp
-    UIProcess/WebFrameProxy.cpp
-    UIProcess/WebFullScreenManagerProxy.cpp
-    UIProcess/WebGeolocationManagerProxy.cpp
-    UIProcess/WebGeolocationProvider.cpp
-    UIProcess/WebGrammarDetail.cpp
-    UIProcess/WebInspectorProxy.cpp
-    UIProcess/WebInspectorUtilities.cpp
-    UIProcess/WebNavigationState.cpp
-    UIProcess/WebOpenPanelResultListenerProxy.cpp
-    UIProcess/WebPageDiagnosticLoggingClient.cpp
-    UIProcess/WebPageGroup.cpp
-    UIProcess/WebPageInjectedBundleClient.cpp
-    UIProcess/WebPageProxy.cpp
-    UIProcess/WebPasteboardProxy.cpp
-    UIProcess/WebPreferences.cpp
-    UIProcess/WebProcessLifetimeObserver.cpp
-    UIProcess/WebProcessLifetimeTracker.cpp
-    UIProcess/WebProcessPool.cpp
-    UIProcess/WebProcessProxy.cpp
-    UIProcess/WebURLSchemeHandler.cpp
-    UIProcess/WebURLSchemeTask.cpp
-    UIProcess/WebViewportAttributes.cpp
-
-    UIProcess/API/APIContentRuleList.cpp
-    UIProcess/API/APIContentRuleListStore.cpp
-    UIProcess/API/APIExperimentalFeature.cpp
-    UIProcess/API/APIFrameInfo.cpp
-    UIProcess/API/APIHTTPCookieStore.cpp
-    UIProcess/API/APIHitTestResult.cpp
-    UIProcess/API/APINavigation.cpp
-    UIProcess/API/APINavigationData.cpp
-    UIProcess/API/APIPageConfiguration.cpp
-    UIProcess/API/APIProcessPoolConfiguration.cpp
-    UIProcess/API/APIOpenPanelParameters.cpp
-    UIProcess/API/APISessionState.cpp
-    UIProcess/API/APIURLSchemeTask.cpp
-    UIProcess/API/APIUserContentWorld.cpp
-    UIProcess/API/APIUserScript.cpp
-    UIProcess/API/APIUserStyleSheet.cpp
-    UIProcess/API/APIWebsiteDataStore.cpp
-    UIProcess/API/APIWebsitePolicies.cpp
-    UIProcess/API/APIWindowFeatures.cpp
-
-    UIProcess/API/C/WKApplicationCacheManager.cpp
-    UIProcess/API/C/WKAuthenticationChallenge.cpp
-    UIProcess/API/C/WKAuthenticationDecisionListener.cpp
-    UIProcess/API/C/WKBackForwardListItemRef.cpp
-    UIProcess/API/C/WKBackForwardListRef.cpp
-    UIProcess/API/C/WKContext.cpp
-    UIProcess/API/C/WKContextConfigurationRef.cpp
-    UIProcess/API/C/WKCookieManager.cpp
-    UIProcess/API/C/WKCredential.cpp
-    UIProcess/API/C/WKDownload.cpp
-    UIProcess/API/C/WKFormSubmissionListener.cpp
-    UIProcess/API/C/WKFrame.cpp
-    UIProcess/API/C/WKFrameHandleRef.cpp
-    UIProcess/API/C/WKFrameInfoRef.cpp
-    UIProcess/API/C/WKFramePolicyListener.cpp
-    UIProcess/API/C/WKGeolocationManager.cpp
-    UIProcess/API/C/WKGeolocationPermissionRequest.cpp
-    UIProcess/API/C/WKGeolocationPosition.cpp
-    UIProcess/API/C/WKHitTestResult.cpp
-    UIProcess/API/C/WKIconDatabase.cpp
-    UIProcess/API/C/WKInspector.cpp
-    UIProcess/API/C/WKKeyValueStorageManager.cpp
-    UIProcess/API/C/WKMediaSessionMetadata.cpp
-    UIProcess/API/C/WKMockMediaDevice.cpp
-    UIProcess/API/C/WKNavigationActionRef.cpp
-    UIProcess/API/C/WKNavigationDataRef.cpp
-    UIProcess/API/C/WKNavigationRef.cpp
-    UIProcess/API/C/WKNavigationResponseRef.cpp
-    UIProcess/API/C/WKNotification.cpp
-    UIProcess/API/C/WKNotificationManager.cpp
-    UIProcess/API/C/WKNotificationPermissionRequest.cpp
-    UIProcess/API/C/WKOpenPanelParametersRef.cpp
-    UIProcess/API/C/WKOpenPanelResultListener.cpp
-    UIProcess/API/C/WKPage.cpp
-    UIProcess/API/C/WKPageConfigurationRef.cpp
-    UIProcess/API/C/WKPageGroup.cpp
-    UIProcess/API/C/WKPreferences.cpp
-    UIProcess/API/C/WKProtectionSpace.cpp
-    UIProcess/API/C/WKResourceCacheManager.cpp
-    UIProcess/API/C/WKSessionStateRef.cpp
-    UIProcess/API/C/WKTextChecker.cpp
-    UIProcess/API/C/WKUserContentControllerRef.cpp
-    UIProcess/API/C/WKUserMediaPermissionCheck.cpp
-    UIProcess/API/C/WKUserMediaPermissionRequest.cpp
-    UIProcess/API/C/WKViewportAttributes.cpp
-    UIProcess/API/C/WKWebsiteDataStoreRef.cpp
-    UIProcess/API/C/WKWebsitePolicies.cpp
-    UIProcess/API/C/WKWindowFeaturesRef.cpp
-
-    UIProcess/Authentication/AuthenticationChallengeProxy.cpp
-    UIProcess/Authentication/AuthenticationDecisionListener.cpp
-    UIProcess/Authentication/WebCredential.cpp
-    UIProcess/Authentication/WebProtectionSpace.cpp
-
-    UIProcess/Automation/SimulatedInputDispatcher.cpp
-    UIProcess/Automation/WebAutomationSession.cpp
-
-    UIProcess/Downloads/DownloadProxy.cpp
-    UIProcess/Downloads/DownloadProxyMap.cpp
-
-    UIProcess/Gamepad/UIGamepad.cpp
-    UIProcess/Gamepad/UIGamepadProvider.cpp
-
-    UIProcess/Launcher/ProcessLauncher.cpp
-
-    UIProcess/Network/NetworkProcessProxy.cpp
-
-    UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp
-    UIProcess/Notifications/WebNotification.cpp
-    UIProcess/Notifications/WebNotificationManagerProxy.cpp
-    UIProcess/Notifications/WebNotificationProvider.cpp
-
-    UIProcess/Plugins/PlugInAutoStartProvider.cpp
-    UIProcess/Plugins/PluginInfoStore.cpp
-    UIProcess/Plugins/PluginProcessManager.cpp
-    UIProcess/Plugins/PluginProcessProxy.cpp
-
-    UIProcess/Storage/StorageProcessProxy.cpp
-
-    UIProcess/UserContent/WebScriptMessageHandler.cpp
-    UIProcess/UserContent/WebUserContentControllerProxy.cpp
-
-    UIProcess/WebStorage/LocalStorageDatabase.cpp
-    UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp
-
-    UIProcess/WebsiteData/WebsiteDataRecord.cpp
-    UIProcess/WebsiteData/WebsiteDataStore.cpp
-
-    WebProcess/WebConnectionToUIProcess.cpp
-    WebProcess/WebProcess.cpp
-
-    WebProcess/Automation/WebAutomationSessionProxy.cpp
-
-    WebProcess/Cache/WebCacheStorageConnection.cpp
-    WebProcess/Cache/WebCacheStorageProvider.cpp
-
-    WebProcess/Databases/WebDatabaseProvider.cpp
-
-    WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp
-
-    WebProcess/FileAPI/BlobRegistryProxy.cpp
-
-    WebProcess/FullScreen/WebFullScreenManager.cpp
-
-    WebProcess/Gamepad/WebGamepad.cpp
-    WebProcess/Gamepad/WebGamepadProvider.cpp
-
-    WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp
-    WebProcess/Geolocation/WebGeolocationManager.cpp
-
-    WebProcess/InjectedBundle/InjectedBundle.cpp
-    WebProcess/InjectedBundle/InjectedBundleBackForwardList.cpp
-    WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp
-    WebProcess/InjectedBundle/InjectedBundleClient.cpp
-    WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
-    WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
-    WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
-    WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp
-
-    WebProcess/InjectedBundle/API/c/WKBundle.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
-    WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
-    WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp
-    WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
-    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
-
-    WebProcess/InjectedBundle/DOM/InjectedBundleCSSStyleDeclarationHandle.cpp
-    WebProcess/InjectedBundle/DOM/InjectedBundleFileHandle.cpp
-    WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
-    WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp
-
-    WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp
-    WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp
-
-    WebProcess/Network/NetworkProcessConnection.cpp
-    WebProcess/Network/WebLoaderStrategy.cpp
-    WebProcess/Network/WebResourceLoader.cpp
-    WebProcess/Network/WebSocketProvider.cpp
-    WebProcess/Network/WebSocketStream.cpp
-
-    WebProcess/Network/webrtc/LibWebRTCProvider.cpp
-    WebProcess/Network/webrtc/LibWebRTCResolver.cpp
-    WebProcess/Network/webrtc/LibWebRTCSocket.cpp
-    WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp
-    WebProcess/Network/webrtc/WebMDNSRegister.cpp
-    WebProcess/Network/webrtc/WebRTCMonitor.cpp
-    WebProcess/Network/webrtc/WebRTCResolver.cpp
-    WebProcess/Network/webrtc/WebRTCSocket.cpp
-
-    WebProcess/Notifications/NotificationPermissionRequestManager.cpp
-    WebProcess/Notifications/WebNotificationManager.cpp
-
-    WebProcess/Plugins/Plugin.cpp
-    WebProcess/Plugins/PluginProcessConnection.cpp
-    WebProcess/Plugins/PluginProcessConnectionManager.cpp
-    WebProcess/Plugins/PluginProxy.cpp
-    WebProcess/Plugins/PluginView.cpp
-    WebProcess/Plugins/WebPluginInfoProvider.cpp
-
-    WebProcess/Plugins/Netscape/JSNPMethod.cpp
-    WebProcess/Plugins/Netscape/JSNPObject.cpp
-    WebProcess/Plugins/Netscape/NPJSObject.cpp
-    WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
-    WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp
-    WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
-    WebProcess/Plugins/Netscape/NetscapePlugin.cpp
-    WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
-    WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
-
-    WebProcess/Storage/ServiceWorkerClientFetch.cpp
-    WebProcess/Storage/WebSWClientConnection.cpp
-    WebProcess/Storage/WebSWContextManagerConnection.cpp
-    WebProcess/Storage/WebSWOriginTable.cpp
-    WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp
-    WebProcess/Storage/WebServiceWorkerProvider.cpp
-    WebProcess/Storage/WebToStorageProcessConnection.cpp
-
-    WebProcess/UserContent/WebUserContentController.cpp
-
-    WebProcess/WebCoreSupport/SessionStateConversion.cpp
-    WebProcess/WebCoreSupport/WebChromeClient.cpp
-    WebProcess/WebCoreSupport/WebColorChooser.cpp
-    WebProcess/WebCoreSupport/WebContextMenuClient.cpp
-    WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp
-    WebProcess/WebCoreSupport/WebDragClient.cpp
-    WebProcess/WebCoreSupport/WebEditorClient.cpp
-    WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
-    WebProcess/WebCoreSupport/WebGeolocationClient.cpp
-    WebProcess/WebCoreSupport/WebInspectorClient.cpp
-    WebProcess/WebCoreSupport/WebMessagePortChannelProvider.cpp
-    WebProcess/WebCoreSupport/WebNotificationClient.cpp
-    WebProcess/WebCoreSupport/WebPerformanceLoggingClient.cpp
-    WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
-    WebProcess/WebCoreSupport/WebPlugInClient.cpp
-    WebProcess/WebCoreSupport/WebPopupMenu.cpp
-    WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp
-    WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp
-    WebProcess/WebCoreSupport/WebUserMediaClient.cpp
-
-    WebProcess/WebPage/DrawingArea.cpp
-    WebProcess/WebPage/EventDispatcher.cpp
-    WebProcess/WebPage/FindController.cpp
-    WebProcess/WebPage/LayerTreeHost.cpp
-    WebProcess/WebPage/PageBanner.cpp
-    WebProcess/WebPage/RemoteWebInspectorUI.cpp
-    WebProcess/WebPage/VisitedLinkTableController.cpp
-    WebProcess/WebPage/WebBackForwardListProxy.cpp
-    WebProcess/WebPage/WebContextMenu.cpp
-    WebProcess/WebPage/WebDocumentLoader.cpp
-    WebProcess/WebPage/WebFrame.cpp
-    WebProcess/WebPage/WebInspector.cpp
-    WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp
-    WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp
-    WebProcess/WebPage/WebInspectorUI.cpp
-    WebProcess/WebPage/WebOpenPanelResultListener.cpp
-    WebProcess/WebPage/WebPage.cpp
-    WebProcess/WebPage/WebPageGroupProxy.cpp
-    WebProcess/WebPage/WebPageOverlay.cpp
-    WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp
-    WebProcess/WebPage/WebURLSchemeTaskProxy.cpp
-    WebProcess/WebPage/WebUndoStep.cpp
-
-    WebProcess/WebStorage/StorageAreaImpl.cpp
-    WebProcess/WebStorage/StorageAreaMap.cpp
-    WebProcess/WebStorage/StorageNamespaceImpl.cpp
-    WebProcess/WebStorage/WebStorageNamespaceProvider.cpp
+list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
+    "Sources.txt"
 )
 
 set(WebKit_MESSAGES_IN_FILES
@@ -949,9 +426,7 @@
 
 list(APPEND WebKit_SOURCES ${WebKit_DERIVED_SOURCES})
 
-if ("${PORT}" STREQUAL "GTK" OR "${PORT}" STREQUAL "WPE")
-    WEBKIT_COMPUTE_SOURCES(WebKit)
-endif ()
+WEBKIT_COMPUTE_SOURCES(WebKit)
 
 WEBKIT_FRAMEWORK(WebKit)
 add_dependencies(WebKit WebCore ${WEBKIT_EXTRA_DEPENDENCIES})

Modified: trunk/Source/WebKit/ChangeLog (235097 => 235098)


--- trunk/Source/WebKit/ChangeLog	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/ChangeLog	2018-08-20 22:59:23 UTC (rev 235098)
@@ -1,3 +1,32 @@
+2018-08-20  Michael Catanzaro  <[email protected]>
+
+        [CMake] Sync unified build with Cocoa ports
+        https://bugs.webkit.org/show_bug.cgi?id=188732
+
+        Reviewed by Tim Horton.
+
+        Sync unified build with Cocoa ports. This enables unified build for WebKit/Platform and
+        WebKit/Shared.
+
+        Lots of files need to be moved around since the existing Sources.txt was not copied from
+        CMakeLists.txt. This replaces the Sources.txt with the sources list from CMakeList.txt.
+        Files that are not built for Cocoa are moved to SourcesGTK.txt, SourcesWPE.txt, and
+        PlatformWin.cmake. Files that are built only on Cocoa are moved to SourcesCocoa.txt. There's
+        plenty of room to determine if many of these files really need to be platform-specific in
+        the future, but let's not change that now.
+
+        Unfortunately, several files under Shared and PluginProcess need to be un-unified to be
+        usable for GTK's WebKitPluginProcess2. I've never managed to understand why, but it won't
+        link otherwise. Fortunately, this only affects a few files (listed in
+        PluginProcessGTK2_SOURCES), only a couple dozen of which are cross-platform.
+
+        * CMakeLists.txt:
+        * PlatformWin.cmake:
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * SourcesGTK.txt:
+        * SourcesWPE.txt:
+
 2018-08-20  Tim Horton  <[email protected]>
 
         Fix the iOSMac build with unified sources

Modified: trunk/Source/WebKit/PlatformGTK.cmake (235097 => 235098)


--- trunk/Source/WebKit/PlatformGTK.cmake	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/PlatformGTK.cmake	2018-08-20 22:59:23 UTC (rev 235098)
@@ -554,8 +554,7 @@
 if (ENABLE_PLUGIN_PROCESS_GTK2)
     set(PluginProcessGTK2_EXECUTABLE_NAME WebKitPluginProcess2)
 
-    # FIXME: We should figure out a way to avoid compiling files that are common between the plugin
-    # process and WebKit only once instead of recompiling them for the plugin process.
+    # FIXME: We should remove WebKitPluginProcess2 in 2020, once Flash is no longer supported.
     list(APPEND PluginProcessGTK2_SOURCES
         Platform/Logging.cpp
         Platform/Module.cpp

Modified: trunk/Source/WebKit/PlatformWin.cmake (235097 => 235098)


--- trunk/Source/WebKit/PlatformWin.cmake	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/PlatformWin.cmake	2018-08-20 22:59:23 UTC (rev 235098)
@@ -20,6 +20,8 @@
     Platform/win/ModuleWin.cpp
     Platform/win/SharedMemoryWin.cpp
 
+    Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
+
     Shared/win/ChildProcessMainWin.cpp
     Shared/win/NativeWebKeyboardEventWin.cpp
     Shared/win/NativeWebMouseEventWin.cpp
@@ -34,9 +36,13 @@
     UIProcess/DefaultUndoController.cpp
     UIProcess/DrawingAreaProxyImpl.cpp
     UIProcess/LegacySessionStateCodingNone.cpp
+    UIProcess/WebGrammarDetail.cpp
     UIProcess/WebResourceLoadStatisticsStore.cpp
     UIProcess/WebResourceLoadStatisticsTelemetry.cpp
+    UIProcess/WebViewportAttributes.cpp
 
+    UIProcess/API/C/WKViewportAttributes.cpp
+
     UIProcess/API/C/win/WKView.cpp
 
     UIProcess/API/win/APIWebsiteDataStoreWin.cpp
@@ -61,6 +67,7 @@
 
     WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
 
+    WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
     WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
 
     WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
@@ -69,6 +76,7 @@
     WebProcess/WebPage/AcceleratedDrawingArea.cpp
     WebProcess/WebPage/AcceleratedSurface.cpp
     WebProcess/WebPage/DrawingAreaImpl.cpp
+    WebProcess/WebPage/LayerTreeHost.cpp
 
     WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
     WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

Modified: trunk/Source/WebKit/Sources.txt (235097 => 235098)


--- trunk/Source/WebKit/Sources.txt	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/Sources.txt	2018-08-20 22:59:23 UTC (rev 235098)
@@ -22,9 +22,9 @@
 // THE POSSIBILITY OF SUCH DAMAGE.
 
 NetworkProcess/NetworkActivityTracker.cpp @no-unify
+NetworkProcess/NetworkCORSPreflightChecker.cpp @no-unify
 NetworkProcess/NetworkConnectionToWebProcess.cpp @no-unify
 NetworkProcess/NetworkContentRuleListManager.cpp @no-unify
-NetworkProcess/NetworkCORSPreflightChecker.cpp @no-unify
 NetworkProcess/NetworkDataTask.cpp @no-unify
 NetworkProcess/NetworkDataTaskBlob.cpp @no-unify
 NetworkProcess/NetworkLoad.cpp @no-unify
@@ -32,13 +32,21 @@
 NetworkProcess/NetworkProcess.cpp @no-unify
 NetworkProcess/NetworkProcessCreationParameters.cpp @no-unify
 NetworkProcess/NetworkProcessPlatformStrategies.cpp @no-unify
+NetworkProcess/NetworkResourceLoadParameters.cpp @no-unify
 NetworkProcess/NetworkResourceLoader.cpp @no-unify
-NetworkProcess/NetworkResourceLoadParameters.cpp @no-unify
 NetworkProcess/NetworkSession.cpp @no-unify
 NetworkProcess/NetworkSocketStream.cpp @no-unify
 NetworkProcess/PingLoad.cpp @no-unify
 NetworkProcess/PreconnectTask.cpp @no-unify
 
+NetworkProcess/Cookies/WebCookieManager.cpp @no-unify
+
+NetworkProcess/Downloads/Download.cpp @no-unify
+NetworkProcess/Downloads/DownloadManager.cpp @no-unify
+NetworkProcess/Downloads/PendingDownload.cpp @no-unify
+
+NetworkProcess/FileAPI/NetworkBlobRegistry.cpp @no-unify
+
 NetworkProcess/cache/CacheStorageEngine.cpp @no-unify
 NetworkProcess/cache/CacheStorageEngineCache.cpp @no-unify
 NetworkProcess/cache/CacheStorageEngineCaches.cpp @no-unify
@@ -46,7 +54,6 @@
 NetworkProcess/cache/NetworkCache.cpp @no-unify
 NetworkProcess/cache/NetworkCacheBlobStorage.cpp @no-unify
 NetworkProcess/cache/NetworkCacheCoders.cpp @no-unify
-NetworkProcess/cache/NetworkCacheCodersCocoa.cpp @no-unify
 NetworkProcess/cache/NetworkCacheData.cpp @no-unify
 NetworkProcess/cache/NetworkCacheEntry.cpp @no-unify
 NetworkProcess/cache/NetworkCacheFileSystem.cpp @no-unify
@@ -64,89 +71,34 @@
 NetworkProcess/capture/NetworkCaptureResource.cpp @no-unify
 NetworkProcess/capture/NetworkDataTaskReplay.cpp @no-unify
 
-NetworkProcess/Cookies/WebCookieManager.cpp @no-unify
-
-NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp @no-unify
-
-NetworkProcess/Downloads/Download.cpp @no-unify
-NetworkProcess/Downloads/DownloadManager.cpp @no-unify
-NetworkProcess/Downloads/PendingDownload.cpp @no-unify
-
-NetworkProcess/FileAPI/NetworkBlobRegistry.cpp @no-unify
-
-NetworkProcess/webrtc/LibWebRTCSocketClient.cpp @no-unify
 NetworkProcess/webrtc/NetworkMDNSRegister.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCMonitor.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCProvider.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCResolver.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCSocket.cpp @no-unify
 
-Platform/Logging.cpp
-Platform/Module.cpp
+// TODO: We should unify these files once GTK's PluginProcess2 is removed.
+Platform/Logging.cpp @no-unify
+Platform/Module.cpp @no-unify
 
-Platform/classifier/ResourceLoadStatisticsClassifier.cpp
+// TODO: We should unify these files once GTK's PluginProcess2 is removed.
+Platform/IPC/ArgumentCoders.cpp @no-unify
+Platform/IPC/Attachment.cpp @no-unify
+Platform/IPC/Connection.cpp @no-unify
+Platform/IPC/DataReference.cpp @no-unify
+Platform/IPC/Decoder.cpp @no-unify
+Platform/IPC/Encoder.cpp @no-unify
+Platform/IPC/MessageReceiverMap.cpp @no-unify
+Platform/IPC/MessageSender.cpp @no-unify
+Platform/IPC/StringReference.cpp @no-unify
 
-Platform/IPC/ArgumentCoders.cpp
-Platform/IPC/Attachment.cpp
-Platform/IPC/Connection.cpp
-Platform/IPC/DataReference.cpp
-Platform/IPC/Decoder.cpp
-Platform/IPC/Encoder.cpp
-Platform/IPC/MessageReceiverMap.cpp
-Platform/IPC/MessageSender.cpp
-Platform/IPC/StringReference.cpp
-
-Platform/unix/EnvironmentUtilities.cpp
-
 PluginProcess/PluginControllerProxy.cpp @no-unify
 PluginProcess/PluginCreationParameters.cpp @no-unify
 PluginProcess/PluginProcess.cpp @no-unify
 PluginProcess/WebProcessConnection.cpp @no-unify
 
-Shared/API/APIArray.cpp @no-unify
-Shared/API/APIData.cpp @no-unify
-Shared/API/APIDictionary.cpp @no-unify
-Shared/API/APIError.cpp @no-unify
-Shared/API/APIFrameHandle.cpp @no-unify
-Shared/API/APIGeometry.cpp @no-unify
-Shared/API/APIObject.cpp @no-unify
-Shared/API/APIPageGroupHandle.cpp @no-unify
-Shared/API/APIPageHandle.cpp @no-unify
-Shared/API/APIURLRequest.cpp @no-unify
-Shared/API/APIURLResponse.cpp @no-unify
-
-Shared/API/c/WKArray.cpp @no-unify
-Shared/API/c/WKCertificateInfo.cpp @no-unify
-Shared/API/c/WKConnectionRef.cpp @no-unify
-Shared/API/c/WKContextMenuItem.cpp @no-unify
-Shared/API/c/WKData.cpp @no-unify
-Shared/API/c/WKDeprecatedFunctions.cpp @no-unify
-Shared/API/c/WKDictionary.cpp @no-unify
-Shared/API/c/WKErrorRef.cpp @no-unify
-Shared/API/c/WKGeometry.cpp @no-unify
-Shared/API/c/WKImage.cpp @no-unify
-Shared/API/c/WKMutableArray.cpp @no-unify
-Shared/API/c/WKMutableDictionary.cpp @no-unify
-Shared/API/c/WKNumber.cpp @no-unify
-Shared/API/c/WKPluginInformation.cpp @no-unify
-Shared/API/c/WKRenderLayer.cpp @no-unify
-Shared/API/c/WKRenderObject.cpp @no-unify
-Shared/API/c/WKSecurityOriginRef.cpp @no-unify
-Shared/API/c/WKSerializedScriptValue.cpp @no-unify
-Shared/API/c/WKString.cpp @no-unify
-Shared/API/c/WKType.cpp @no-unify
-Shared/API/c/WKURL.cpp @no-unify
-Shared/API/c/WKURLRequest.cpp @no-unify
-Shared/API/c/WKURLResponse.cpp @no-unify
-Shared/API/c/WKUserContentURLPattern.cpp @no-unify
-
-Shared/ActivityAssertion.cpp
-Shared/AssistedNodeInformation.cpp
+// TODO: The files here marked @no-unify should be unified once GTK's PluginProcess2 is removed.
+Shared/ActivityAssertion.cpp @no-unify
 Shared/AsyncRequest.cpp
-Shared/BlobDataFileReferenceWithSandboxExtension.cpp
+Shared/BlobDataFileReferenceWithSandboxExtension.cpp @no-unify
 Shared/CacheModel.cpp
-Shared/ChildProcess.cpp
+Shared/ChildProcess.cpp @no-unify
 Shared/ContextMenuContextData.cpp
 Shared/EditorState.cpp
 Shared/FontInfo.cpp
@@ -160,18 +112,17 @@
 Shared/RTCPacketOptions.cpp
 Shared/SessionState.cpp
 Shared/SessionTracker.cpp
-Shared/ShareableBitmap.cpp
+Shared/ShareableBitmap.cpp @no-unify
 Shared/ShareableResource.cpp
 Shared/SharedStringHashStore.cpp
+Shared/SharedStringHashTableReadOnly.cpp
 Shared/SharedStringHashTable.cpp
-Shared/SharedStringHashTableReadOnly.cpp
 Shared/StatisticsData.cpp
 Shared/TouchBarMenuData.cpp
 Shared/TouchBarMenuItemData.cpp
+Shared/URLSchemeTaskParameters.cpp
 Shared/UpdateInfo.cpp
-Shared/URLSchemeTaskParameters.cpp
 Shared/UserData.cpp
-Shared/VisibleContentRectUpdateInfo.cpp
 Shared/WebBackForwardListItem.cpp
 Shared/WebCompiledContentRuleList.cpp
 Shared/WebCompiledContentRuleListData.cpp
@@ -179,21 +130,21 @@
 Shared/WebConnectionClient.cpp
 Shared/WebContextMenuItem.cpp
 Shared/WebContextMenuItemData.cpp
-Shared/WebCoreArgumentCoders.cpp
+Shared/WebCoreArgumentCoders.cpp @no-unify
 Shared/WebErrors.cpp
-Shared/WebEvent.cpp
+Shared/WebEvent.cpp @no-unify
 Shared/WebEventConversion.cpp
 Shared/WebGeolocationPosition.cpp
 Shared/WebHitTestResultData.cpp
 Shared/WebImage.cpp
-Shared/WebKeyboardEvent.cpp
-Shared/WebKit2Initialize.cpp
+Shared/WebKeyboardEvent.cpp @no-unify
+Shared/WebKit2Initialize.cpp @no-unify
 Shared/WebMediaSessionMetadata.cpp
 Shared/WebMemorySampler.cpp
-Shared/WebMouseEvent.cpp
+Shared/WebMouseEvent.cpp @no-unify
 Shared/WebPageCreationParameters.cpp
 Shared/WebPageGroupData.cpp
-Shared/WebPlatformTouchPoint.cpp
+Shared/WebPlatformTouchPoint.cpp @no-unify
 Shared/WebPopupItem.cpp
 Shared/WebPreferencesDefaultValues.cpp
 Shared/WebPreferencesStore.cpp
@@ -200,44 +151,81 @@
 Shared/WebProcessCreationParameters.cpp
 Shared/WebRenderLayer.cpp
 Shared/WebRenderObject.cpp
-Shared/WebsiteData/WebsiteData.cpp
+Shared/WebTouchEvent.cpp @no-unify
+Shared/WebUserContentControllerDataTypes.cpp
+Shared/WebWheelEvent.cpp @no-unify
 Shared/WebsiteDataStoreParameters.cpp
 Shared/WebsitePoliciesData.cpp
-Shared/WebSQLiteDatabaseTracker.cpp
-Shared/WebTouchEvent.cpp
-Shared/WebUserContentControllerDataTypes.cpp
-Shared/WebWheelEvent.cpp
 
+Shared/API/APIArray.cpp @no-unify
+Shared/API/APIData.cpp @no-unify
+Shared/API/APIDictionary.cpp @no-unify
+Shared/API/APIError.cpp @no-unify
+Shared/API/APIFrameHandle.cpp @no-unify
+Shared/API/APIGeometry.cpp @no-unify
+Shared/API/APIObject.cpp @no-unify
+Shared/API/APIPageGroupHandle.cpp @no-unify
+Shared/API/APIPageHandle.cpp @no-unify
+Shared/API/APIURLRequest.cpp @no-unify
+Shared/API/APIURLResponse.cpp @no-unify
+
+Shared/API/c/WKArray.cpp @no-unify
+Shared/API/c/WKCertificateInfo.cpp @no-unify
+Shared/API/c/WKConnectionRef.cpp @no-unify
+Shared/API/c/WKContextMenuItem.cpp @no-unify
+Shared/API/c/WKData.cpp @no-unify
+Shared/API/c/WKDeprecatedFunctions.cpp @no-unify
+Shared/API/c/WKDictionary.cpp @no-unify
+Shared/API/c/WKErrorRef.cpp @no-unify
+Shared/API/c/WKGeometry.cpp @no-unify
+Shared/API/c/WKImage.cpp @no-unify
+Shared/API/c/WKMutableArray.cpp @no-unify
+Shared/API/c/WKMutableDictionary.cpp @no-unify
+Shared/API/c/WKNumber.cpp @no-unify
+Shared/API/c/WKPluginInformation.cpp @no-unify
+Shared/API/c/WKRenderLayer.cpp @no-unify
+Shared/API/c/WKRenderObject.cpp @no-unify
+Shared/API/c/WKSecurityOriginRef.cpp @no-unify
+Shared/API/c/WKSerializedScriptValue.cpp @no-unify
+Shared/API/c/WKString.cpp @no-unify
+Shared/API/c/WKType.cpp @no-unify
+Shared/API/c/WKURL.cpp @no-unify
+Shared/API/c/WKURLRequest.cpp @no-unify
+Shared/API/c/WKURLResponse.cpp @no-unify
+Shared/API/c/WKUserContentURLPattern.cpp @no-unify
+
 Shared/Authentication/AuthenticationManager.cpp
 
-Shared/Cocoa/SharedRingBufferStorage.cpp
-
 Shared/Databases/IndexedDB/IDBUtilities.cpp
 Shared/Databases/IndexedDB/WebIDBResult.cpp
 
 Shared/Gamepad/GamepadData.cpp
 
-Shared/Plugins/NPIdentifierData.cpp
-Shared/Plugins/NPObjectMessageReceiver.cpp
-Shared/Plugins/NPObjectProxy.cpp
-Shared/Plugins/NPRemoteObjectMap.cpp
-Shared/Plugins/NPVariantData.cpp
-Shared/Plugins/PluginProcessCreationParameters.cpp
+// TODO: These files should be unified once GTK's PluginProcess2 is removed.
+Shared/Plugins/NPIdentifierData.cpp @no-unify
+Shared/Plugins/NPObjectMessageReceiver.cpp @no-unify
+Shared/Plugins/NPObjectProxy.cpp @no-unify
+Shared/Plugins/NPRemoteObjectMap.cpp @no-unify
+Shared/Plugins/NPVariantData.cpp @no-unify
+Shared/Plugins/PluginProcessCreationParameters.cpp @no-unify
 
-Shared/Plugins/Netscape/NetscapePluginModule.cpp
-Shared/Plugins/Netscape/PluginInformation.cpp
+// TODO: These files should be unified once GTK's PluginProcess2 is removed.
+Shared/Plugins/Netscape/NetscapePluginModule.cpp  @no-unify
+Shared/Plugins/Netscape/PluginInformation.cpp @no-unify
 
 Shared/Storage/StorageProcessCreationParameters.cpp
 
-StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp @no-unify
+Shared/WebsiteData/WebsiteData.cpp
+
 StorageProcess/StorageProcess.cpp @no-unify
 StorageProcess/StorageToWebProcessConnection.cpp @no-unify
 
+StorageProcess/IndexedDB/WebIDBConnectionToClient.cpp @no-unify
+
 StorageProcess/ServiceWorker/WebSWOriginStore.cpp @no-unify
 StorageProcess/ServiceWorker/WebSWServerConnection.cpp @no-unify
 StorageProcess/ServiceWorker/WebSWServerToContextConnection.cpp @no-unify
 
-UIProcess/AcceleratedDrawingAreaProxy.cpp @no-unify
 UIProcess/BackgroundProcessResponsivenessTimer.cpp @no-unify
 UIProcess/ChildProcessProxy.cpp @no-unify
 UIProcess/DrawingAreaProxy.cpp @no-unify
@@ -244,9 +232,7 @@
 UIProcess/FrameLoadState.cpp @no-unify
 UIProcess/GeolocationPermissionRequestManagerProxy.cpp @no-unify
 UIProcess/GeolocationPermissionRequestProxy.cpp @no-unify
-UIProcess/HighPerformanceGraphicsUsageSampler.cpp @no-unify
 UIProcess/PageLoadState.cpp @no-unify
-UIProcess/PerActivityStateCPUUsageSampler.cpp @no-unify
 UIProcess/ProcessAssertion.cpp @no-unify
 UIProcess/ProcessThrottler.cpp @no-unify
 UIProcess/RemoteWebInspectorProxy.cpp @no-unify
@@ -274,7 +260,6 @@
 UIProcess/WebContextMenuProxy.cpp @no-unify
 UIProcess/WebCookieManagerProxy.cpp @no-unify
 UIProcess/WebCookieManagerProxyClient.cpp @no-unify
-UIProcess/WebDataListSuggestionsDropdown.cpp @no-unify
 UIProcess/WebEditCommandProxy.cpp @no-unify
 UIProcess/WebFormClient.cpp @no-unify
 UIProcess/WebFormSubmissionListenerProxy.cpp @no-unify
@@ -285,8 +270,6 @@
 UIProcess/WebGeolocationProvider.cpp @no-unify
 UIProcess/WebInspectorProxy.cpp @no-unify
 UIProcess/WebInspectorUtilities.cpp @no-unify
-UIProcess/WebMediaSessionFocusManager.cpp @no-unify
-UIProcess/WebMediaSessionFocusManagerClient.cpp @no-unify
 UIProcess/WebNavigationState.cpp @no-unify
 UIProcess/WebOpenPanelResultListenerProxy.cpp @no-unify
 UIProcess/WebPageDiagnosticLoggingClient.cpp @no-unify
@@ -299,29 +282,25 @@
 UIProcess/WebProcessLifetimeTracker.cpp @no-unify
 UIProcess/WebProcessPool.cpp @no-unify
 UIProcess/WebProcessProxy.cpp @no-unify
-UIProcess/WebResourceLoadStatisticsStore.cpp @no-unify
-UIProcess/WebResourceLoadStatisticsTelemetry.cpp @no-unify
 UIProcess/WebURLSchemeHandler.cpp @no-unify
 UIProcess/WebURLSchemeTask.cpp @no-unify
 
-UIProcess/API/APIAttachment.cpp @no-unify
 UIProcess/API/APIContentRuleList.cpp @no-unify
 UIProcess/API/APIContentRuleListStore.cpp @no-unify
 UIProcess/API/APIExperimentalFeature.cpp @no-unify
 UIProcess/API/APIFrameInfo.cpp @no-unify
+UIProcess/API/APIHTTPCookieStore.cpp @no-unify
 UIProcess/API/APIHitTestResult.cpp @no-unify
-UIProcess/API/APIHTTPCookieStore.cpp @no-unify
 UIProcess/API/APINavigation.cpp @no-unify
 UIProcess/API/APINavigationData.cpp @no-unify
-UIProcess/API/APIOpenPanelParameters.cpp @no-unify
 UIProcess/API/APIPageConfiguration.cpp @no-unify
 UIProcess/API/APIProcessPoolConfiguration.cpp @no-unify
+UIProcess/API/APIOpenPanelParameters.cpp @no-unify
 UIProcess/API/APISessionState.cpp @no-unify
 UIProcess/API/APIURLSchemeTask.cpp @no-unify
 UIProcess/API/APIUserContentWorld.cpp @no-unify
 UIProcess/API/APIUserScript.cpp @no-unify
 UIProcess/API/APIUserStyleSheet.cpp @no-unify
-UIProcess/API/APIWebsiteDataRecord.cpp @no-unify
 UIProcess/API/APIWebsiteDataStore.cpp @no-unify
 UIProcess/API/APIWebsitePolicies.cpp @no-unify
 UIProcess/API/APIWindowFeatures.cpp @no-unify
@@ -333,7 +312,6 @@
 UIProcess/API/C/WKBackForwardListRef.cpp @no-unify
 UIProcess/API/C/WKContext.cpp @no-unify
 UIProcess/API/C/WKContextConfigurationRef.cpp @no-unify
-UIProcess/API/C/WKContextMenuListener.cpp @no-unify
 UIProcess/API/C/WKCookieManager.cpp @no-unify
 UIProcess/API/C/WKCredential.cpp @no-unify
 UIProcess/API/C/WKDownload.cpp @no-unify
@@ -349,7 +327,6 @@
 UIProcess/API/C/WKIconDatabase.cpp @no-unify
 UIProcess/API/C/WKInspector.cpp @no-unify
 UIProcess/API/C/WKKeyValueStorageManager.cpp @no-unify
-UIProcess/API/C/WKMediaSessionFocusManager.cpp @no-unify
 UIProcess/API/C/WKMediaSessionMetadata.cpp @no-unify
 UIProcess/API/C/WKMockMediaDevice.cpp @no-unify
 UIProcess/API/C/WKNavigationActionRef.cpp @no-unify
@@ -368,19 +345,15 @@
 UIProcess/API/C/WKProtectionSpace.cpp @no-unify
 UIProcess/API/C/WKResourceCacheManager.cpp @no-unify
 UIProcess/API/C/WKSessionStateRef.cpp @no-unify
-UIProcess/API/C/WKTestingSupport.cpp @no-unify
 UIProcess/API/C/WKTextChecker.cpp @no-unify
 UIProcess/API/C/WKUserContentControllerRef.cpp @no-unify
-UIProcess/API/C/WKUserContentExtensionStoreRef.cpp @no-unify
 UIProcess/API/C/WKUserMediaPermissionCheck.cpp @no-unify
 UIProcess/API/C/WKUserMediaPermissionRequest.cpp @no-unify
-UIProcess/API/C/WKUserScriptRef.cpp @no-unify
+UIProcess/API/C/WKViewportAttributes.cpp @no-unify
 UIProcess/API/C/WKWebsiteDataStoreRef.cpp @no-unify
 UIProcess/API/C/WKWebsitePolicies.cpp @no-unify
 UIProcess/API/C/WKWindowFeaturesRef.cpp @no-unify
 
-UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp @no-unify
-
 UIProcess/Authentication/AuthenticationChallengeProxy.cpp @no-unify
 UIProcess/Authentication/AuthenticationDecisionListener.cpp @no-unify
 UIProcess/Authentication/WebCredential.cpp @no-unify
@@ -389,11 +362,6 @@
 UIProcess/Automation/SimulatedInputDispatcher.cpp @no-unify
 UIProcess/Automation/WebAutomationSession.cpp @no-unify
 
-UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp @no-unify
-UIProcess/Cocoa/ViewGestureController.cpp @no-unify
-
-UIProcess/CredentialManagement/WebCredentialsMessengerProxy.cpp @no-unify
-
 UIProcess/Downloads/DownloadProxy.cpp @no-unify
 UIProcess/Downloads/DownloadProxyMap.cpp @no-unify
 
@@ -400,9 +368,9 @@
 UIProcess/Gamepad/UIGamepad.cpp @no-unify
 UIProcess/Gamepad/UIGamepadProvider.cpp @no-unify
 
+// TODO: This file should be "unified" once GTK's PluginProcess2 is removed.
 UIProcess/Launcher/ProcessLauncher.cpp @no-unify
 
-UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp @no-unify
 UIProcess/Network/NetworkProcessProxy.cpp @no-unify
 
 UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp @no-unify
@@ -420,29 +388,24 @@
 UIProcess/UserContent/WebScriptMessageHandler.cpp @no-unify
 UIProcess/UserContent/WebUserContentControllerProxy.cpp @no-unify
 
+UIProcess/WebStorage/LocalStorageDatabase.cpp @no-unify
+UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp @no-unify
+
 UIProcess/WebsiteData/WebsiteDataRecord.cpp @no-unify
 UIProcess/WebsiteData/WebsiteDataStore.cpp @no-unify
 
-UIProcess/WebStorage/LocalStorageDatabase.cpp @no-unify
-UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp @no-unify
-UIProcess/WebStorage/StorageManager.cpp @no-unify
-
 WebProcess/WebConnectionToUIProcess.cpp @no-unify
 WebProcess/WebProcess.cpp @no-unify
 
-WebProcess/ApplePay/WebPaymentCoordinator.cpp @no-unify
-
 WebProcess/Automation/WebAutomationSessionProxy.cpp @no-unify
 
 WebProcess/Cache/WebCacheStorageConnection.cpp @no-unify
 WebProcess/Cache/WebCacheStorageProvider.cpp @no-unify
 
-WebProcess/CredentialManagement/WebCredentialsMessenger.cpp @no-unify
+WebProcess/Databases/WebDatabaseProvider.cpp @no-unify
 
 WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp @no-unify
 
-WebProcess/Databases/WebDatabaseProvider.cpp @no-unify
-
 WebProcess/FileAPI/BlobRegistryProxy.cpp @no-unify
 
 WebProcess/FullScreen/WebFullScreenManager.cpp @no-unify
@@ -474,7 +437,6 @@
 WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp @no-unify
-WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp @no-unify
@@ -481,7 +443,6 @@
 WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundlePage.cpp @no-unify
-WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp @no-unify
 WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp @no-unify
@@ -492,8 +453,6 @@
 WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp @no-unify
 WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp @no-unify
 
-WebProcess/MediaCache/WebMediaKeyStorageManager.cpp @no-unify
-
 WebProcess/MediaStream/MediaDeviceSandboxExtensions.cpp @no-unify
 WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp @no-unify
 
@@ -515,6 +474,7 @@
 WebProcess/Notifications/NotificationPermissionRequestManager.cpp @no-unify
 WebProcess/Notifications/WebNotificationManager.cpp @no-unify
 
+// TODO: These files should be unified once GTK's PluginProcess2 is removed.
 WebProcess/Plugins/Plugin.cpp @no-unify
 WebProcess/Plugins/PluginProcessConnection.cpp @no-unify
 WebProcess/Plugins/PluginProcessConnectionManager.cpp @no-unify
@@ -522,21 +482,22 @@
 WebProcess/Plugins/PluginView.cpp @no-unify
 WebProcess/Plugins/WebPluginInfoProvider.cpp @no-unify
 
+// TODO: These files should be unified once GTK's PluginProcess2 is removed.
 WebProcess/Plugins/Netscape/JSNPMethod.cpp @no-unify
 WebProcess/Plugins/Netscape/JSNPObject.cpp @no-unify
+WebProcess/Plugins/Netscape/NPJSObject.cpp @no-unify
+WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp @no-unify
+WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp @no-unify
 WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp @no-unify
 WebProcess/Plugins/Netscape/NetscapePlugin.cpp @no-unify
 WebProcess/Plugins/Netscape/NetscapePluginStream.cpp @no-unify
-WebProcess/Plugins/Netscape/NPJSObject.cpp @no-unify
-WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp @no-unify
-WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp @no-unify
 
 WebProcess/Storage/ServiceWorkerClientFetch.cpp @no-unify
-WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp @no-unify
-WebProcess/Storage/WebServiceWorkerProvider.cpp @no-unify
 WebProcess/Storage/WebSWClientConnection.cpp @no-unify
 WebProcess/Storage/WebSWContextManagerConnection.cpp @no-unify
 WebProcess/Storage/WebSWOriginTable.cpp @no-unify
+WebProcess/Storage/WebServiceWorkerFetchTaskClient.cpp @no-unify
+WebProcess/Storage/WebServiceWorkerProvider.cpp @no-unify
 WebProcess/Storage/WebToStorageProcessConnection.cpp @no-unify
 
 WebProcess/UserContent/WebUserContentController.cpp @no-unify
@@ -545,7 +506,6 @@
 WebProcess/WebCoreSupport/WebChromeClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebColorChooser.cpp @no-unify
 WebProcess/WebCoreSupport/WebContextMenuClient.cpp @no-unify
-WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp @no-unify
 WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebDragClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebEditorClient.cpp @no-unify
@@ -554,7 +514,6 @@
 WebProcess/WebCoreSupport/WebInspectorClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebMessagePortChannelProvider.cpp @no-unify
 WebProcess/WebCoreSupport/WebNotificationClient.cpp @no-unify
-WebProcess/WebCoreSupport/WebPasteboardOverrides.cpp @no-unify
 WebProcess/WebCoreSupport/WebPerformanceLoggingClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebPlatformStrategies.cpp @no-unify
 WebProcess/WebCoreSupport/WebPlugInClient.cpp @no-unify
@@ -562,16 +521,12 @@
 WebProcess/WebCoreSupport/WebProgressTrackerClient.cpp @no-unify
 WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp @no-unify
 WebProcess/WebCoreSupport/WebUserMediaClient.cpp @no-unify
-WebProcess/WebCoreSupport/WebValidationMessageClient.cpp @no-unify
 
-WebProcess/WebPage/AcceleratedDrawingArea.cpp @no-unify
 WebProcess/WebPage/DrawingArea.cpp @no-unify
 WebProcess/WebPage/EventDispatcher.cpp @no-unify
 WebProcess/WebPage/FindController.cpp @no-unify
 WebProcess/WebPage/PageBanner.cpp @no-unify
 WebProcess/WebPage/RemoteWebInspectorUI.cpp @no-unify
-WebProcess/WebPage/ViewGestureGeometryCollector.cpp @no-unify
-WebProcess/WebPage/ViewUpdateDispatcher.cpp @no-unify
 WebProcess/WebPage/VisitedLinkTableController.cpp @no-unify
 WebProcess/WebPage/WebBackForwardListProxy.cpp @no-unify
 WebProcess/WebPage/WebContextMenu.cpp @no-unify
@@ -578,16 +533,16 @@
 WebProcess/WebPage/WebDocumentLoader.cpp @no-unify
 WebProcess/WebPage/WebFrame.cpp @no-unify
 WebProcess/WebPage/WebInspector.cpp @no-unify
+WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp @no-unify
 WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp @no-unify
-WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp @no-unify
 WebProcess/WebPage/WebInspectorUI.cpp @no-unify
 WebProcess/WebPage/WebOpenPanelResultListener.cpp @no-unify
 WebProcess/WebPage/WebPage.cpp @no-unify
 WebProcess/WebPage/WebPageGroupProxy.cpp @no-unify
 WebProcess/WebPage/WebPageOverlay.cpp @no-unify
-WebProcess/WebPage/WebUndoStep.cpp @no-unify
 WebProcess/WebPage/WebURLSchemeHandlerProxy.cpp @no-unify
 WebProcess/WebPage/WebURLSchemeTaskProxy.cpp @no-unify
+WebProcess/WebPage/WebUndoStep.cpp @no-unify
 
 WebProcess/WebStorage/StorageAreaImpl.cpp @no-unify
 WebProcess/WebStorage/StorageAreaMap.cpp @no-unify

Modified: trunk/Source/WebKit/SourcesCocoa.txt (235097 => 235098)


--- trunk/Source/WebKit/SourcesCocoa.txt	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/SourcesCocoa.txt	2018-08-20 22:59:23 UTC (rev 235098)
@@ -21,6 +21,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 // THE POSSIBILITY OF SUCH DAMAGE.
 
+NetworkProcess/cache/NetworkCacheCodersCocoa.cpp @no-unify
 NetworkProcess/cache/NetworkCacheDataCocoa.mm @no-unify
 NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm @no-unify
 
@@ -32,6 +33,7 @@
 NetworkProcess/Cookies/mac/WebCookieManagerMac.mm @no-unify
 
 NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm @no-unify
+NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp @no-unify
 
 NetworkProcess/Downloads/cocoa/DownloadCocoa.mm @no-unify
 
@@ -45,11 +47,19 @@
 NetworkProcess/watchos/NetworkProximityAssertion.mm @no-unify
 NetworkProcess/watchos/NetworkProximityManager.mm @no-unify
 
+NetworkProcess/webrtc/LibWebRTCSocketClient.cpp @no-unify
+NetworkProcess/webrtc/NetworkRTCMonitor.cpp @no-unify
+NetworkProcess/webrtc/NetworkRTCProvider.cpp @no-unify
+NetworkProcess/webrtc/NetworkRTCResolver.cpp @no-unify
+NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp @no-unify
+NetworkProcess/webrtc/NetworkRTCSocket.cpp @no-unify
+
 Platform/cf/ModuleCF.cpp
 
 Platform/cg/CGUtilities.cpp
 
 Platform/classifier/cocoa/ResourceLoadStatisticsClassifierCocoa.cpp
+Platform/classifier/ResourceLoadStatisticsClassifier.cpp
 
 Platform/cocoa/SharedMemoryCocoa.cpp
 Platform/cocoa/WKCrashReporter.mm
@@ -66,6 +76,8 @@
 Platform/mac/MenuUtilities.mm
 Platform/mac/StringUtilities.mm
 
+Platform/unix/EnvironmentUtilities.cpp
+
 PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm @no-unify
 
 PluginProcess/mac/PluginControllerProxyMac.mm @no-unify
@@ -98,6 +110,9 @@
 
 Shared/APIWebArchive.mm
 Shared/APIWebArchiveResource.mm
+Shared/AssistedNodeInformation.cpp
+Shared/VisibleContentRectUpdateInfo.cpp
+Shared/WebSQLiteDatabaseTracker.cpp
 
 Shared/cf/ArgumentCodersCF.cpp @no-unify
 Shared/cf/CookieStorageUtilsCF.mm
@@ -112,6 +127,7 @@
 Shared/Cocoa/CompletionHandlerCallChecker.mm
 Shared/Cocoa/DataDetectionResult.mm
 Shared/Cocoa/LoadParametersCocoa.mm
+Shared/Cocoa/SharedRingBufferStorage.cpp
 Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
 Shared/Cocoa/WebErrorsCocoa.mm
 Shared/Cocoa/WebKit2InitializeCocoa.mm
@@ -185,10 +201,29 @@
 StorageProcess/mac/StorageProcessMac.mm @no-unify
 
 UIProcess/_WKWebViewPrintFormatter.mm @no-unify
+UIProcess/AcceleratedDrawingAreaProxy.cpp @no-unify
 UIProcess/ApplicationStateTracker.mm @no-unify
+UIProcess/HighPerformanceGraphicsUsageSampler.cpp @no-unify
+UIProcess/PerActivityStateCPUUsageSampler.cpp @no-unify
+UIProcess/WebDataListSuggestionsDropdown.cpp @no-unify
+UIProcess/WebMediaSessionFocusManager.cpp @no-unify
+UIProcess/WebMediaSessionFocusManagerClient.cpp @no-unify
+UIProcess/WebResourceLoadStatisticsStore.cpp @no-unify
+UIProcess/WebResourceLoadStatisticsTelemetry.cpp @no-unify
 UIProcess/WKImagePreviewViewController.mm @no-unify
 UIProcess/WKInspectorHighlightView.mm @no-unify
 
+UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp @no-unify
+
+UIProcess/API/APIAttachment.cpp @no-unify
+UIProcess/API/APIWebsiteDataRecord.cpp @no-unify
+
+UIProcess/API/C/WKContextMenuListener.cpp @no-unify
+UIProcess/API/C/WKMediaSessionFocusManager.cpp @no-unify
+UIProcess/API/C/WKTestingSupport.cpp @no-unify
+UIProcess/API/C/WKUserContentExtensionStoreRef.cpp @no-unify
+UIProcess/API/C/WKUserScriptRef.cpp @no-unify
+
 UIProcess/API/C/cg/WKIconDatabaseCG.cpp @no-unify
 
 UIProcess/API/C/mac/WKContextPrivateMac.mm @no-unify
@@ -296,8 +331,10 @@
 UIProcess/Cocoa/SessionStateCoding.mm @no-unify
 UIProcess/Cocoa/SystemPreviewControllerCocoa.mm @no-unify
 UIProcess/Cocoa/UIDelegate.mm @no-unify
+UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp @no-unify
 UIProcess/Cocoa/VersionChecks.mm @no-unify
 UIProcess/Cocoa/VideoFullscreenManagerProxy.mm @no-unify
+UIProcess/Cocoa/ViewGestureController.cpp @no-unify
 UIProcess/Cocoa/WebPageProxyCocoa.mm @no-unify
 UIProcess/Cocoa/WebPasteboardProxyCocoa.mm @no-unify
 UIProcess/Cocoa/WebProcessPoolCocoa.mm @no-unify
@@ -307,6 +344,8 @@
 UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm @no-unify
 UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm @no-unify
 
+UIProcess/CredentialManagement/WebCredentialsMessengerProxy.cpp @no-unify
+
 UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm @no-unify
 UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm @no-unify
 UIProcess/Gamepad/mac/UIGamepadProviderMac.mm @no-unify
@@ -398,6 +437,8 @@
 UIProcess/mac/WKTextInputWindowController.mm @no-unify
 UIProcess/mac/WKViewLayoutStrategy.mm @no-unify
 
+UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp @no-unify
+
 UIProcess/Plugins/mac/PluginInfoStoreMac.mm @no-unify
 UIProcess/Plugins/mac/PluginProcessManagerMac.mm @no-unify
 UIProcess/Plugins/mac/PluginProcessProxyMac.mm @no-unify
@@ -413,8 +454,14 @@
 
 UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm @no-unify
 
+UIProcess/WebStorage/StorageManager.cpp @no-unify
+
 UIProcess/WebStorage/ios/LocalStorageDatabaseTrackerIOS.mm @no-unify
 
+WebProcess/ApplePay/WebPaymentCoordinator.cpp @no-unify
+
+WebProcess/CredentialManagement/WebCredentialsMessenger.cpp @no-unify
+
 WebProcess/cocoa/PlaybackSessionManager.mm @no-unify
 WebProcess/cocoa/UserMediaCaptureManager.cpp @no-unify
 WebProcess/cocoa/VideoFullscreenManager.mm @no-unify
@@ -422,6 +469,9 @@
 
 WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm @no-unify
 
+WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp @no-unify
+WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp @no-unify
+
 WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm @no-unify
 WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm @no-unify
 
@@ -445,6 +495,8 @@
 
 WebProcess/InjectedBundle/mac/InjectedBundleMac.mm @no-unify
 
+WebProcess/MediaCache/WebMediaKeyStorageManager.cpp @no-unify
+
 WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm @no-unify
 WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm @no-unify
 
@@ -454,10 +506,15 @@
 WebProcess/Plugins/PDF/PDFPluginPasswordField.mm @no-unify
 WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm @no-unify
 
+WebProcess/WebCoreSupport/WebDataListSuggestionPicker.cpp @no-unify
+WebProcess/WebCoreSupport/WebPasteboardOverrides.cpp @no-unify
+WebProcess/WebCoreSupport/WebValidationMessageClient.cpp @no-unify
+
 WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm @no-unify
 WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm @no-unify
 WebProcess/WebCoreSupport/ios/WebFrameLoaderClientIOS.mm @no-unify
 WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.cpp @no-unify
+
 WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp @no-unify
 WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm @no-unify
 WebProcess/WebCoreSupport/mac/WebDragClientMac.mm @no-unify
@@ -465,6 +522,9 @@
 WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm @no-unify
 WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm @no-unify
 
+WebProcess/WebPage/AcceleratedDrawingArea.cpp @no-unify
+WebProcess/WebPage/ViewGestureGeometryCollector.cpp @no-unify
+WebProcess/WebPage/ViewUpdateDispatcher.cpp @no-unify
 WebProcess/WebPage/WKAccessibilityWebPageObjectIOS.mm @no-unify
 
 WebProcess/WebPage/Cocoa/WebPageCocoa.mm @no-unify

Modified: trunk/Source/WebKit/SourcesGTK.txt (235097 => 235098)


--- trunk/Source/WebKit/SourcesGTK.txt	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/SourcesGTK.txt	2018-08-20 22:59:23 UTC (rev 235098)
@@ -77,6 +77,7 @@
 Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
 Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
 
+Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp @no-unify
 Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp @no-unify
 
 Shared/Plugins/unix/PluginSearchPath.cpp
@@ -110,12 +111,15 @@
 UIProcess/DefaultUndoController.cpp
 UIProcess/DrawingAreaProxyImpl.cpp
 UIProcess/LegacySessionStateCodingNone.cpp
+UIProcess/WebGrammarDetail.cpp
 UIProcess/WebResourceLoadStatisticsStore.cpp
 UIProcess/WebResourceLoadStatisticsTelemetry.cpp
 UIProcess/WebTextChecker.cpp
 UIProcess/WebTextCheckerClient.cpp
+UIProcess/WebViewportAttributes.cpp
 
 UIProcess/API/C/WKGrammarDetail.cpp
+UIProcess/API/C/WKViewportAttributes.cpp
 
 UIProcess/API/C/gtk/WKTextCheckerGtk.cpp
 UIProcess/API/C/gtk/WKView.cpp
@@ -243,48 +247,6 @@
 UIProcess/soup/WebCookieManagerProxySoup.cpp
 UIProcess/soup/WebProcessPoolSoup.cpp
 
-WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp
-
-WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
-
-WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp @no-unify
-WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
-
-WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @no-unify
-
-WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
-WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
-WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
-WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
-
-WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
-
-WebProcess/WebPage/AcceleratedDrawingArea.cpp
-WebProcess/WebPage/AcceleratedSurface.cpp
-
-WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
-WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
-WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
-
-WebProcess/WebPage/DrawingAreaImpl.cpp
-
-WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
-
-WebProcess/WebPage/gstreamer/WebPageGStreamer.cpp
-
-WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.cpp
-WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp @no-unify
-WebProcess/WebPage/gtk/PrinterListGtk.cpp
-WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp
-WebProcess/WebPage/gtk/WebPageGtk.cpp
-WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
-
-WebProcess/gtk/WaylandCompositorDisplay.cpp
-WebProcess/gtk/WebProcessMainGtk.cpp
-
-WebProcess/soup/WebKitSoupRequestInputStream.cpp
-WebProcess/soup/WebProcessSoup.cpp
-
 WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp @no-unify
 WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMDocument.cpp @no-unify
 WebProcess/InjectedBundle/API/glib/DOM/WebKitDOMElement.cpp @no-unify
@@ -408,3 +370,48 @@
 WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp
 WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathNSResolver.cpp
 WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp
+
+WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp
+
+WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
+
+WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp @no-unify
+WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp @no-unify
+
+WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @no-unify
+
+WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
+WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
+WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
+WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
+
+WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
+
+WebProcess/WebPage/AcceleratedDrawingArea.cpp
+WebProcess/WebPage/AcceleratedSurface.cpp
+WebProcess/WebPage/LayerTreeHost.cpp
+
+WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
+WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
+WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
+
+WebProcess/WebPage/DrawingAreaImpl.cpp
+
+WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
+
+WebProcess/WebPage/gstreamer/WebPageGStreamer.cpp
+
+WebProcess/WebPage/gtk/AcceleratedSurfaceWayland.cpp
+WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp @no-unify
+WebProcess/WebPage/gtk/PrinterListGtk.cpp
+WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp
+WebProcess/WebPage/gtk/WebPageGtk.cpp
+WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
+
+WebProcess/gtk/WaylandCompositorDisplay.cpp
+WebProcess/gtk/WebProcessMainGtk.cpp
+
+WebProcess/soup/WebKitSoupRequestInputStream.cpp
+WebProcess/soup/WebProcessSoup.cpp
+
+WebProcess/Plugins/Netscape/NetscapePluginNone.cpp

Modified: trunk/Source/WebKit/SourcesWPE.txt (235097 => 235098)


--- trunk/Source/WebKit/SourcesWPE.txt	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/SourcesWPE.txt	2018-08-20 22:59:23 UTC (rev 235098)
@@ -74,6 +74,7 @@
 Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
 Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
 
+Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
 Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
 
 Shared/cairo/ShareableBitmapCairo.cpp
@@ -100,10 +101,13 @@
 UIProcess/BackingStore.cpp
 UIProcess/DefaultUndoController.cpp
 UIProcess/LegacySessionStateCodingNone.cpp
+UIProcess/WebGrammarDetail.cpp
 UIProcess/WebResourceLoadStatisticsStore.cpp
 UIProcess/WebResourceLoadStatisticsTelemetry.cpp
+UIProcess/WebViewportAttributes.cpp
 
 UIProcess/API/C/WKGrammarDetail.cpp
+UIProcess/API/C/WKViewportAttributes.cpp
 
 UIProcess/API/C/wpe/WKView.cpp
 
@@ -222,6 +226,8 @@
 
 WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
 
+WebProcess/Plugins/Netscape/NetscapePluginNone.cpp @no-unify
+
 WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
 
 WebProcess/WebCoreSupport/wpe/WebContextMenuClientWPE.cpp
@@ -230,6 +236,7 @@
 
 WebProcess/WebPage/AcceleratedDrawingArea.cpp
 WebProcess/WebPage/AcceleratedSurface.cpp
+WebProcess/WebPage/LayerTreeHost.cpp
 
 WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
 WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (235097 => 235098)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2018-08-20 22:57:02 UTC (rev 235097)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2018-08-20 22:59:23 UTC (rev 235098)
@@ -788,6 +788,37 @@
 		2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */; };
 		2D8949F0182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8949EE182044F600E898AA /* PlatformCALayerRemoteTiledBacking.cpp */; };
 		2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */; };
+		2D92A779212B6A6100F493FD /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
+		2D92A77A212B6A6100F493FD /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA451209E2BA00A49D01 /* Module.cpp */; };
+		2D92A77B212B6A7100F493FD /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
+		2D92A77C212B6A7100F493FD /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEE966A112FAF57006BCC24 /* Attachment.cpp */; };
+		2D92A77D212B6A7100F493FD /* Connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC032DA210F437D10058C15A /* Connection.cpp */; };
+		2D92A77E212B6A7100F493FD /* DataReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC7537D183BE50F0072CB15 /* DataReference.cpp */; };
+		2D92A77F212B6A7100F493FD /* Decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC032D9D10F437D10058C15A /* Decoder.cpp */; };
+		2D92A780212B6A7100F493FD /* Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC032D9F10F437D10058C15A /* Encoder.cpp */; };
+		2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3EED0C161A535300AEB4F5 /* MessageReceiverMap.cpp */; };
+		2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAB0377185A7C6A00EDF501 /* MessageSender.cpp */; };
+		2D92A783212B6A7100F493FD /* StringReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D6918327C1200087DD7 /* StringReference.cpp */; };
+		2D92A784212B6AB100F493FD /* ActivityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */; };
+		2D92A785212B6AB100F493FD /* BlobDataFileReferenceWithSandboxExtension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E164A2EF191AF14E0010737D /* BlobDataFileReferenceWithSandboxExtension.cpp */; };
+		2D92A786212B6AB100F493FD /* ChildProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D956E12848564001EB962 /* ChildProcess.cpp */; };
+		2D92A787212B6AB100F493FD /* ShareableBitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */; };
+		2D92A788212B6AB100F493FD /* WebCoreArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */; };
+		2D92A789212B6AB100F493FD /* WebEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */; };
+		2D92A78A212B6AB100F493FD /* WebKeyboardEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD2127A2A0E008FF4F4 /* WebKeyboardEvent.cpp */; };
+		2D92A78B212B6AB100F493FD /* WebKit2Initialize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9BA5021697C45300E44616 /* WebKit2Initialize.cpp */; };
+		2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DAF127A28D0008FF4F4 /* WebMouseEvent.cpp */; };
+		2D92A78D212B6AB100F493FD /* WebPlatformTouchPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DDC127A521C008FF4F4 /* WebPlatformTouchPoint.cpp */; };
+		2D92A78E212B6AB100F493FD /* WebTouchEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD7127A51B6008FF4F4 /* WebTouchEvent.cpp */; };
+		2D92A78F212B6AB100F493FD /* WebWheelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0337DD0127A2980008FF4F4 /* WebWheelEvent.cpp */; };
+		2D92A790212B6AD400F493FD /* NPIdentifierData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D848A127F6A49001EB962 /* NPIdentifierData.cpp */; };
+		2D92A791212B6AD400F493FD /* NPObjectMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA35C127A45BF0050E709 /* NPObjectMessageReceiver.cpp */; };
+		2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA284127A13BC0050E709 /* NPObjectProxy.cpp */; };
+		2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FA252127A0E4F0050E709 /* NPRemoteObjectMap.cpp */; };
+		2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D84A2127F6AD1001EB962 /* NPVariantData.cpp */; };
+		2D92A795212B6AD400F493FD /* PluginProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D90D11281C966001EB962 /* PluginProcessCreationParameters.cpp */; };
+		2D92A796212B6ADA00F493FD /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */; };
+		2D92A797212B6ADA00F493FD /* PluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */; };
 		2D9EA30D1A96CB59002D2807 /* WKPageInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9EA30C1A96CB59002D2807 /* WKPageInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		2D9EA30F1A96CBFF002D2807 /* WebPageInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */; };
 		2D9EA3111A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */; };
@@ -11164,6 +11195,7 @@
 				5120C8361E5B74BE0025B250 /* _WKWebsiteDataStoreConfiguration.mm in Sources */,
 				5CB2378B1DF0DE5300117AA3 /* _WKWebsitePolicies.mm in Sources */,
 				A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */,
+				2D92A784212B6AB100F493FD /* ActivityAssertion.cpp in Sources */,
 				BC64696F11DBE603006455B0 /* APIArray.cpp in Sources */,
 				2E5C770F1FA7D429005932C3 /* APIAttachment.cpp in Sources */,
 				7C89D2B31A6B068C003A5FDE /* APIContentRuleList.cpp in Sources */,
@@ -11200,7 +11232,9 @@
 				5C8DD37E1FE4502000F2A556 /* APIWebsitePolicies.cpp in Sources */,
 				1A6563E41B7A8C50009CF787 /* APIWindowFeatures.cpp in Sources */,
 				1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,
+				2D92A77B212B6A7100F493FD /* ArgumentCoders.cpp in Sources */,
 				2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */,
+				2D92A77C212B6A7100F493FD /* Attachment.cpp in Sources */,
 				512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
 				570AB90220B2517400B8BE87 /* AuthenticationChallengeProxyCocoa.mm in Sources */,
 				512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
@@ -11211,6 +11245,7 @@
 				9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */,
 				990D28BC1C6539DA00986977 /* AutomationSessionClient.mm in Sources */,
 				46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */,
+				2D92A785212B6AB100F493FD /* BlobDataFileReferenceWithSandboxExtension.cpp in Sources */,
 				E170876B16D6CA6900F99226 /* BlobRegistryProxy.cpp in Sources */,
 				41897ED71F415D8A0016FA42 /* CacheStorageEngine.cpp in Sources */,
 				41C8581A1F5136CA0065E085 /* CacheStorageEngineCache.cpp in Sources */,
@@ -11217,9 +11252,13 @@
 				4135FBD11F4FB8090074C47B /* CacheStorageEngineCaches.cpp in Sources */,
 				41897ED91F415D8A0016FA42 /* CacheStorageEngineConnection.cpp in Sources */,
 				517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */,
+				2D92A786212B6AB100F493FD /* ChildProcess.cpp in Sources */,
 				51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */,
 				E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
+				2D92A77D212B6A7100F493FD /* Connection.cpp in Sources */,
 				B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
+				2D92A77E212B6A7100F493FD /* DataReference.cpp in Sources */,
+				2D92A77F212B6A7100F493FD /* Decoder.cpp in Sources */,
 				83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */,
 				C1817363205844A900DFDA65 /* DisplayLink.cpp in Sources */,
 				5C1427011C23F84C00D41183 /* Download.cpp in Sources */,
@@ -11235,6 +11274,7 @@
 				1A64229912DD029200CAAE2C /* DrawingAreaMessageReceiver.cpp in Sources */,
 				BC2652161182608100243E12 /* DrawingAreaProxy.cpp in Sources */,
 				1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */,
+				2D92A780212B6A7100F493FD /* Encoder.cpp in Sources */,
 				1AA575FA1496B52600A4EE06 /* EventDispatcher.cpp in Sources */,
 				1AA576021496B97900A4EE06 /* EventDispatcherMessageReceiver.cpp in Sources */,
 				00B9661918E25AE100CE1F88 /* FindClient.mm in Sources */,
@@ -11290,11 +11330,16 @@
 				1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
 				1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
 				5120C8311E54EDDE0025B250 /* LocalStorageDatabaseTrackerIOS.mm in Sources */,
+				2D92A779212B6A6100F493FD /* Logging.cpp in Sources */,
 				074E76021DF707BE00D318EC /* MediaDeviceSandboxExtensions.cpp in Sources */,
+				2D92A781212B6A7100F493FD /* MessageReceiverMap.cpp in Sources */,
+				2D92A782212B6A7100F493FD /* MessageSender.cpp in Sources */,
+				2D92A77A212B6A6100F493FD /* Module.cpp in Sources */,
 				1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */,
 				1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */,
 				1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */,
 				1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */,
+				2D92A796212B6ADA00F493FD /* NetscapePluginModule.cpp in Sources */,
 				1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */,
 				5379DB72207E9470007D8C33 /* NetworkActivityTracker.cpp in Sources */,
 				5315876C2076B762004BF9F3 /* NetworkActivityTrackerCocoa.mm in Sources */,
@@ -11363,10 +11408,15 @@
 				5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */,
 				3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
 				31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */,
+				2D92A790212B6AD400F493FD /* NPIdentifierData.cpp in Sources */,
 				1AE4976911FF658E0048B464 /* NPJSObject.cpp in Sources */,
+				2D92A791212B6AD400F493FD /* NPObjectMessageReceiver.cpp in Sources */,
 				1A2D8439127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp in Sources */,
+				2D92A792212B6AD400F493FD /* NPObjectProxy.cpp in Sources */,
+				2D92A793212B6AD400F493FD /* NPRemoteObjectMap.cpp in Sources */,
 				1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */,
 				1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
+				2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */,
 				7C387434172F5615001BD88A /* PageBanner.cpp in Sources */,
 				7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */,
 				5C6CE6D11F59BC7A0007C6CB /* PageClientImplCocoa.mm in Sources */,
@@ -11395,6 +11445,7 @@
 				1A2D91A61281D739001EB962 /* PluginControllerProxyMac.mm in Sources */,
 				1A8EF96E1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp in Sources */,
 				1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */,
+				2D92A797212B6ADA00F493FD /* PluginInformation.cpp in Sources */,
 				1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
 				1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */,
 				1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */,
@@ -11402,6 +11453,7 @@
 				1A0EC910124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp in Sources */,
 				1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */,
 				1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */,
+				2D92A795212B6AD400F493FD /* PluginProcessCreationParameters.cpp in Sources */,
 				1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
 				1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
 				9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */,
@@ -11459,6 +11511,7 @@
 				414DEDD81F9EDDE50047C40D /* ServiceWorkerProcessProxy.cpp in Sources */,
 				1A002D48196B345D00B9AD44 /* SessionStateCoding.mm in Sources */,
 				1A7284481959F8040007BCE5 /* SessionStateConversion.cpp in Sources */,
+				2D92A787212B6AB100F493FD /* ShareableBitmap.cpp in Sources */,
 				995226D7207D184600F78420 /* SimulatedInputDispatcher.cpp in Sources */,
 				2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */,
 				2DE6943D18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp in Sources */,
@@ -11478,6 +11531,7 @@
 				51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */,
 				51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */,
 				5118E9AC1F295977003EF9F5 /* StorageToWebProcessConnectionMessageReceiver.cpp in Sources */,
+				2D92A783212B6A7100F493FD /* StringReference.cpp in Sources */,
 				515C415C207D7CAE00726E02 /* SuspendedPageProxy.cpp in Sources */,
 				318A1F05204F4764003480BC /* SystemPreviewController.cpp in Sources */,
 				3157135E2040A9B20084F9CF /* SystemPreviewControllerCocoa.mm in Sources */,
@@ -11698,6 +11752,7 @@
 				33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */,
 				F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */,
 				330934491315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp in Sources */,
+				2D92A788212B6AB100F493FD /* WebCoreArgumentCoders.cpp in Sources */,
 				512F589A12A8838800629530 /* WebCredential.cpp in Sources */,
 				575075A820AB8DE100693EA9 /* WebCredentialMac.mm in Sources */,
 				5760828E2029895E00116678 /* WebCredentialsMessenger.cpp in Sources */,
@@ -11716,6 +11771,7 @@
 				BC111A5E112F4FBB00337BAB /* WebEditorClient.cpp in Sources */,
 				2D28F3E61885CCC1004B9EAE /* WebEditorClientIOS.mm in Sources */,
 				C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */,
+				2D92A789212B6AB100F493FD /* WebEvent.cpp in Sources */,
 				BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */,
 				BCE469551214E6CB000B98EB /* WebFormSubmissionListenerProxy.cpp in Sources */,
 				BC111ADD112F5B9300337BAB /* WebFrame.cpp in Sources */,
@@ -11753,7 +11809,9 @@
 				1CA8B954127C891500576C2B /* WebInspectorUIMac.mm in Sources */,
 				1CBBE4A019B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp in Sources */,
 				A55BA82C1BA38E64007CD33D /* WebInspectorUtilities.cpp in Sources */,
+				2D92A78A212B6AB100F493FD /* WebKeyboardEvent.cpp in Sources */,
 				1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
+				2D92A78B212B6AB100F493FD /* WebKit2Initialize.cpp in Sources */,
 				51FB08FF1639DE1A00EC324A /* WebLoaderStrategy.cpp in Sources */,
 				41F12A9E2069BB4400FF26E8 /* WebMDNSRegister.cpp in Sources */,
 				51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */,
@@ -11762,6 +11820,7 @@
 				C9C1833B1B74026A007036A7 /* WebMediaSessionFocusManagerClient.cpp in Sources */,
 				2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */,
 				513FFB90201459C6002596EA /* WebMessagePortChannelProvider.cpp in Sources */,
+				2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */,
 				7CCCC8FA1A5F50FD008FB0DA /* WebNavigationState.cpp in Sources */,
 				31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */,
 				31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */,
@@ -11800,6 +11859,7 @@
 				1AB1F7981D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp in Sources */,
 				0F850FE61ED7C39F00FB77A7 /* WebPerformanceLoggingClient.cpp in Sources */,
 				1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
+				2D92A78D212B6AB100F493FD /* WebPlatformTouchPoint.cpp in Sources */,
 				31D5929E166E060000E6BF02 /* WebPlugInClient.cpp in Sources */,
 				1A08FEE41D593E2A008BA8CB /* WebPluginInfoProvider.cpp in Sources */,
 				D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
@@ -11861,6 +11921,7 @@
 				5185430E1FB6816100478F95 /* WebSWServerToContextConnection.cpp in Sources */,
 				515262BD1FB951610070E579 /* WebSWServerToContextConnectionMessageReceiver.cpp in Sources */,
 				5118E99B1F295266003EF9F5 /* WebToStorageProcessConnection.cpp in Sources */,
+				2D92A78E212B6AB100F493FD /* WebTouchEvent.cpp in Sources */,
 				BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
 				51D124281E6D3F5D002B2820 /* WebURLSchemeHandler.cpp in Sources */,
 				51D124331E6DE6CA002B2820 /* WebURLSchemeHandlerCocoa.mm in Sources */,
@@ -11874,6 +11935,7 @@
 				15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */,
 				83EE575B1DB7D61100C74C50 /* WebValidationMessageClient.cpp in Sources */,
 				2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */,
+				2D92A78F212B6AB100F493FD /* WebWheelEvent.cpp in Sources */,
 				868160D0187645570021E79D /* WindowServerConnection.mm in Sources */,
 				29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm in Sources */,
 				29232DF818B2A9AE00D0596F /* WKAccessibilityWebPageObjectIOS.mm in Sources */,

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes