Attachment 347475 Details for Bug 188732 – Patch

[patch] Patch

bug-188732-20180819202107.patch (text/plain), 66.47 KB, created by Michael Catanzaro on 2018-08-19 18:21:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-08-19 18:21:08 PDT

Size: 66.47 KB

patch

obsolete

>Subversion Revision: 235016
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2195422db9aba4b42b2a1f68c13807b5f8c21d2c..b065a98b07c7ec5d2447667c5c2b763b3d7b33dc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-19  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [CMake] Sync unified build with Cocoa ports
>+        https://bugs.webkit.org/show_bug.cgi?id=188732
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-18  David Kilzer  <ddkilzer@apple.com>
> 
>         Let Xcode have its way with the WebCore project
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b80e102e9e1d0b71e0fd5effd3a2da1c8f8b78a8..e7f27a13f99da2d418b86284467a57e78baef4ef 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,32 @@
>+2018-08-19  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [CMake] Sync unified build with Cocoa ports
>+        https://bugs.webkit.org/show_bug.cgi?id=188732
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-19  David Kilzer  <ddkilzer@apple.com>
> 
>         REGRESSION (r234396): Leak of CFURLRef in WebKit::NetworkProcess::deleteHSTSCacheForHostNames()
>diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
>index 8cde5b9be10411c02d0cde6438fd19698006fd0c..4b88e00daddf49bd05ef7cad2815f2602609382b 100644
>--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
>+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
>@@ -142,7 +142,7 @@ namespace WebCore {
> #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 @@ namespace WebCore {
> #if !PLATFORM(IOS)
>         RetainPtr<NSEvent> m_macEvent;
> #else
>-        RetainPtr<WebEvent> m_Event;
>+        RetainPtr<::WebEvent> m_Event;
> #endif
> #endif
> #if PLATFORM(GTK)
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index cc76dc35624a6341fac4a28f2a94286a98c747d4..8c95c629d7c83d2643735be864a9c740d543c65a 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -97,531 +97,8 @@ set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
>     ${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
>diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
>index 1c9c9b988e3cafd35c8fa13cff4521095b1af8c1..e36e4c351055f85418e9e3b172ef257a8b9dfa73 100644
>--- a/Source/WebKit/PlatformGTK.cmake
>+++ b/Source/WebKit/PlatformGTK.cmake
>@@ -554,8 +554,7 @@ endif ()
> 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
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index acf6775077df3f84ee25e3bcc45064452131438f..0be7e266c39059b99b3fa1288a362b66eeb8315d 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -20,6 +20,8 @@ list(APPEND WebKit_SOURCES
>     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,8 +36,12 @@ list(APPEND WebKit_SOURCES
>     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
> 
>@@ -61,6 +67,7 @@ list(APPEND WebKit_SOURCES
> 
>     WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
> 
>+    WebProcess/Plugins/Netscape/NetscapePluginNone.cpp
>     WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
> 
>     WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
>@@ -69,6 +76,7 @@ list(APPEND WebKit_SOURCES
>     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
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>index 3368cec9df8290c22b9871bcdde6cebb85d04a26..dea81965cee397d6c50dc5b5873f49a1f59d72aa 100644
>--- a/Source/WebKit/Sources.txt
>+++ b/Source/WebKit/Sources.txt
>@@ -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/NetworkLoadChecker.cpp @no-unify
> NetworkProcess/NetworkProcess.cpp @no-unify
> NetworkProcess/NetworkProcessCreationParameters.cpp @no-unify
> NetworkProcess/NetworkProcessPlatformStrategies.cpp @no-unify
>-NetworkProcess/NetworkResourceLoader.cpp @no-unify
> NetworkProcess/NetworkResourceLoadParameters.cpp @no-unify
>+NetworkProcess/NetworkResourceLoader.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/CacheStorageEngineConnection.cpp @no-unify
> 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/NetworkCaptureReplayer.cpp @no-unify
> 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
>-
>-Platform/classifier/ResourceLoadStatisticsClassifier.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
>-
>-Platform/unix/EnvironmentUtilities.cpp
>+// TODO: We should unify these files once GTK's PluginProcess2 is removed.
>+Platform/Logging.cpp @no-unify
>+Platform/Module.cpp @no-unify
>+
>+// 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
> 
> 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/RTCNetwork.cpp
> Shared/RTCPacketOptions.cpp
> Shared/SessionState.cpp
> Shared/SessionTracker.cpp
>-Shared/ShareableBitmap.cpp
>+Shared/ShareableBitmap.cpp @no-unify
> Shared/ShareableResource.cpp
> Shared/SharedStringHashStore.cpp
>-Shared/SharedStringHashTable.cpp
> Shared/SharedStringHashTableReadOnly.cpp
>+Shared/SharedStringHashTable.cpp
> Shared/StatisticsData.cpp
> Shared/TouchBarMenuData.cpp
> Shared/TouchBarMenuItemData.cpp
>-Shared/UpdateInfo.cpp
> Shared/URLSchemeTaskParameters.cpp
>+Shared/UpdateInfo.cpp
> Shared/UserData.cpp
>-Shared/VisibleContentRectUpdateInfo.cpp
> Shared/WebBackForwardListItem.cpp
> Shared/WebCompiledContentRuleList.cpp
> Shared/WebCompiledContentRuleListData.cpp
>@@ -179,74 +130,109 @@ Shared/WebConnection.cpp
> 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
> 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/Authentication/AuthenticationManager.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/Cocoa/SharedRingBufferStorage.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
>+// 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
> 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/WebContextMenuListenerProxy.cpp @no-unify
> 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/WebGeolocationManagerProxy.cpp @no-unify
> 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/WebProcessLifetimeObserver.cpp @no-unify
> 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/APIHitTestResult.cpp @no-unify
> UIProcess/API/APIHTTPCookieStore.cpp @no-unify
>+UIProcess/API/APIHitTestResult.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/WKBackForwardListItemRef.cpp @no-unify
> 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/WKHitTestResult.cpp @no-unify
> 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/WKPreferences.cpp @no-unify
> 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,20 +362,15 @@ UIProcess/Authentication/WebProtectionSpace.cpp @no-unify
> 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
> 
> 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/Storage/StorageProcessProxy.cpp @no-unify
> UIProcess/UserContent/WebScriptMessageHandler.cpp @no-unify
> UIProcess/UserContent/WebUserContentControllerProxy.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
>+
>+UIProcess/WebsiteData/WebsiteDataRecord.cpp @no-unify
>+UIProcess/WebsiteData/WebsiteDataStore.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,14 +437,12 @@ WebProcess/InjectedBundle/API/c/WKBundle.cpp @no-unify
> 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
> 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/InjectedBundleFileHandle.cpp @no-unify
> 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/Network/webrtc/WebRTCSocket.cpp @no-unify
> 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/PluginProxy.cpp @no-unify
> 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/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/Plugins/Netscape/NetscapeBrowserFuncs.cpp @no-unify
>+WebProcess/Plugins/Netscape/NetscapePlugin.cpp @no-unify
>+WebProcess/Plugins/Netscape/NetscapePluginStream.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/SessionStateConversion.cpp @no-unify
> 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/WebGeolocationClient.cpp @no-unify
> 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,32 +521,28 @@ WebProcess/WebCoreSupport/WebPopupMenu.cpp @no-unify
> 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
> WebProcess/WebPage/WebDocumentLoader.cpp @no-unify
> WebProcess/WebPage/WebFrame.cpp @no-unify
> WebProcess/WebPage/WebInspector.cpp @no-unify
>-WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp @no-unify
> WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp @no-unify
>+WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.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
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index e235c22b76dcb717b77b3c3b91ea7dd2bbdcd206..cbcf85a00ea0c1e81f6e2ad3d8978fc025be05d0 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -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/cocoa/NetworkSessionCocoa.mm @no-unify
> 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/mac/RemoteNetworkingContext.mm @no-unify
> 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/MachUtilities.cpp
> 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/API/Cocoa/WKRemoteObjectCoder.mm @no-unify
> 
> 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/ChildProcessCocoa.mm
> 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/ios/StorageProcessIOS.mm @no-unify
> 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/SafeBrowsingResultCocoa.mm @no-unify
> 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/WebViewImpl.mm @no-unify
> 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/WKTextFinderClient.mm @no-unify
> 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/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm @no-unify
> 
> 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/cocoa/WebProcessCocoa.mm @no-unify
> 
> 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/API/mac/WKWebProcessPlugInBrowserContextController.mm
> 
> 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/PDFPluginChoiceAnnotation.mm @no-unify
> 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/WebEditorClientMac.mm @no-unify
> 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
>diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
>index 38b600e2b83e8864b5b4eee8ffe3ccc6f5209ae9..a2dc5c98002b35f7f9ad568650dca1d5e63a9890 100644
>--- a/Source/WebKit/SourcesGTK.txt
>+++ b/Source/WebKit/SourcesGTK.txt
>@@ -77,6 +77,7 @@ Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp
> 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/BackingStore.cpp
> 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/gtk/WebProcessPoolGtk.cpp @no-unify
> 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/WebKitDOMWheelEvent.cpp
> 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
>diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
>index c71ae5c11cdce8665721245273d64b0f6c22ac5c..f9cf37175b6f99f5fb529ea20d00a11743655f23 100644
>--- a/Source/WebKit/SourcesWPE.txt
>+++ b/Source/WebKit/SourcesWPE.txt
>@@ -74,6 +74,7 @@ Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp
> 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/AcceleratedDrawingAreaProxy.cpp
> 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/InjectedBundle/glib/InjectedBundleGlib.cpp
> 
> 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/WebCoreSupport/wpe/WebPopupMenuWPE.cpp
> 
> WebProcess/WebPage/AcceleratedDrawingArea.cpp
> WebProcess/WebPage/AcceleratedSurface.cpp
>+WebProcess/WebPage/LayerTreeHost.cpp
> 
> WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
> WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

Actions: View | Formatted Diff | Diff

Attachments on bug 188732: 347459 | 347460 | 347461 | 347464 | 347475 | 347479 | 347482 | 347524 | 347548