Use unified build for UIProcess
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Aug 2018 00:59:11 +0000 (00:59 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Aug 2018 00:59:11 +0000 (00:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=185014

Reviewed by Alex Christensen.

* Sources.txt:
* SourcesCocoa.txt:
* UIProcess/API/APIWebsiteDataStore.h:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration urlSchemeHandlerForURLScheme:]):
* UIProcess/API/glib/IconDatabase.cpp:
* UIProcess/API/gtk/PageClientImpl.cpp:
* UIProcess/API/gtk/WebKitColorChooser.cpp:
* UIProcess/API/gtk/WebKitPopupMenu.cpp:
* UIProcess/API/gtk/WebKitRemoteInspectorProtocolHandler.cpp:
* UIProcess/ApplicationStateTracker.mm:
* UIProcess/Authentication/mac/WebCredentialMac.mm:
* UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm:
* UIProcess/Automation/ios/WebAutomationSessionIOS.mm:
* UIProcess/Automation/mac/WebAutomationSessionMac.mm:
* UIProcess/Cocoa/NavigationState.mm:
* UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
* UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
* UIProcess/Cocoa/ViewGestureController.cpp:
* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
(-[WKWebViewContentProviderRegistry initWithConfiguration:]):
(-[WKWebViewContentProviderRegistry addPage:]):
(-[WKWebViewContentProviderRegistry removePage:]):
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
* UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm:
* UIProcess/Cocoa/WebViewImpl.mm:
(-[WKTextTouchBarItemController itemForIdentifier:]):
(WebKit::WebViewImpl::performDragOperation):
* UIProcess/Downloads/DownloadProxy.cpp:
* UIProcess/DrawingAreaProxy.cpp:
* UIProcess/Gamepad/UIGamepad.cpp:
* UIProcess/Gamepad/UIGamepadProvider.cpp:
* UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm:
* UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
* UIProcess/Network/NetworkProcessProxy.cpp:
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
* UIProcess/PerActivityStateCPUUsageSampler.cpp:
* UIProcess/Plugins/PluginInfoStore.cpp:
* UIProcess/Plugins/PluginProcessProxy.cpp:
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
* UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
* UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm:
* UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
* UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp:
* UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
* UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
* UIProcess/RemoteWebInspectorProxy.cpp:
* UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
* UIProcess/ServiceWorkerProcessProxy.cpp:
* UIProcess/Storage/StorageProcessProxy.cpp:
* UIProcess/SuspendedPageProxy.cpp:
* UIProcess/TextCheckerCompletion.cpp:
* UIProcess/UIMessagePortChannelProvider.cpp:
* UIProcess/UserMediaPermissionCheckProxy.cpp:
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
* UIProcess/UserMediaPermissionRequestProxy.cpp:
* UIProcess/VisitedLinkStore.cpp:
* UIProcess/WKInspectorHighlightView.mm:
(findIntersectionOnLineBetweenPoints):
(quadIntersection):
(layerPathWithHole):
(layerPath):
(-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
(-[WKInspectorHighlightView _layoutForNodeListHighlight:]):
(-[WKInspectorHighlightView _layoutForRectsHighlight:]):
(-[WKInspectorHighlightView update:]):
* UIProcess/WebBackForwardList.cpp:
* UIProcess/WebContextMenuListenerProxy.cpp:
* UIProcess/WebCookieManagerProxy.cpp:
* UIProcess/WebEditCommandProxy.cpp:
* UIProcess/WebFrameProxy.cpp:
* UIProcess/WebFullScreenManagerProxy.cpp:
* UIProcess/WebInspectorProxy.cpp:
* UIProcess/WebNavigationState.cpp:
* UIProcess/WebOpenPanelResultListenerProxy.cpp:
* UIProcess/WebPageInjectedBundleClient.cpp:
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebProcessPool.cpp:
* UIProcess/WebProcessProxy.cpp:
* UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp:
* UIProcess/WebURLSchemeHandler.cpp:
* UIProcess/WebURLSchemeTask.cpp:
* UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
* UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
* UIProcess/ios/DragDropInteractionState.mm:
* UIProcess/ios/InputViewUpdateDeferrer.mm:
* UIProcess/ios/PageClientImplIOS.mm:
(-[WKEditCommandObjC initWithWebEditCommandProxy:]):
(-[WKEditCommandObjC command]):
* UIProcess/ios/SmartMagnificationController.mm:
* UIProcess/ios/TextCheckerIOS.mm:
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::removeSwipeSnapshot):
* UIProcess/ios/WKActionSheetAssistant.mm:
(presentationStyleForView):
* UIProcess/ios/WKApplicationStateTrackingView.mm:
(-[WKApplicationStateTrackingView initWithFrame:webView:]):
(-[WKApplicationStateTrackingView _applicationDidEnterBackground]):
(-[WKApplicationStateTrackingView _applicationDidFinishSnapshottingAfterEnteringBackground]):
(-[WKApplicationStateTrackingView _applicationWillEnterForeground]):
* UIProcess/ios/WKGeolocationProviderIOS.mm:
(-[WKGeolocationProviderIOS _startUpdating]):
(-[WKGeolocationProviderIOS _stopUpdating]):
(-[WKGeolocationProviderIOS _setEnableHighAccuracy:]):
(-[WKGeolocationProviderIOS init]):
(-[WKGeolocationProviderIOS initWithProcessPool:]):
(-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:completionHandler:view:]):
(-[WKGeolocationProviderIOS geolocationAuthorizationGranted]):
(-[WKLegacyCoreLocationProvider positionChanged:]):
* UIProcess/ios/WKKeyboardScrollingAnimator.mm:
(-[WKKeyboardScrollingAnimator _scrollOffsetForEvent:]):
(-[WKKeyboardScrollingAnimator beginWithEvent:]):
(-[WKKeyboardScrollingAnimator handleKeyEvent:]):
(-[WKKeyboardScrollingAnimator startAnimatedScroll]):
(-[WKKeyboardScrollingAnimator stopAnimatedScroll]):
* UIProcess/ios/WKLegacyPDFView.mm:
* UIProcess/ios/WKPDFView.mm:
(-[WKPDFView web_setContentProviderData:suggestedFilename:]):
* UIProcess/ios/WKScrollView.mm:
(-[WKScrollView _systemContentInset]):
* UIProcess/ios/WKSystemPreviewView.mm:
* UIProcess/ios/WebPageProxyIOS.mm:
* UIProcess/mac/CorrectionPanel.mm:
(correctionIndicatorType):
* UIProcess/mac/PageClientImplMac.mm:
* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(-[WKRemoteWebInspectorProxyObjCAdapter initWithRemoteWebInspectorProxy:]):
* UIProcess/mac/TextCheckerMac.mm:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
* UIProcess/mac/ViewGestureControllerMac.mm:
* UIProcess/mac/ViewSnapshotStore.mm:
* UIProcess/mac/WKFullKeyboardAccessWatcher.mm:
(-[WKFullKeyboardAccessWatcher notifyAllProcessPools]):
* UIProcess/mac/WKFullScreenWindowController.mm:
(WebKit::WKFullScreenWindowControllerVideoFullscreenModelClient::setInterface):
(WebKit::WKFullScreenWindowControllerVideoFullscreenModelClient::interface const):
(-[WKFullScreenWindowController initWithWindow:webView:page:]):
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
(-[WKFullScreenWindowController windowDidEnterFullScreen:]):
(-[WKFullScreenWindowController windowDidExitFullScreen:]):
(-[WKFullScreenWindowController _manager]):
(-[WKFullScreenWindowController _replaceView:with:]):
(zoomAnimation):
(createMask):
(maskAnimation):
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController initWithPage:view:viewImpl:recognizer:]):
(-[WKImmediateActionController willDestroyView:]):
(-[WKImmediateActionController _clearImmediateActionState]):
(-[WKImmediateActionController didPerformImmediateActionHitTest:contentPreventsDefault:userData:]):
(-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
(-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
(-[WKImmediateActionController _webHitTestResult]):
(-[WKImmediateActionController _defaultAnimationController]):
(-[WKImmediateActionController menuItem:maxSizeForPoint:]):
(-[WKImmediateActionController _animationControllerForDataDetectedText]):
(-[WKImmediateActionController _animationControllerForDataDetectedLink]):
(-[WKImmediateActionController _animationControllerForText]):
* UIProcess/mac/WKInspectorViewController.mm:
(-[WKInspectorViewController initWithInspectedPage:]):
(-[WKInspectorViewController webView]):
(-[WKInspectorViewController configuration]):
(-[WKInspectorViewController webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
(-[WKInspectorViewController webView:decidePolicyForNavigationAction:decisionHandler:]):
(-[WKInspectorViewController inspectorWKWebViewReload:]):
* UIProcess/mac/WKPrintingView.mm:
(-[WKPrintingView _expectedPreviewCallbackForRect:]):
(pageDidDrawToImage):
(-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
(pageDidComputePageRects):
(-[WKPrintingView _askPageToComputePageRects]):
(-[WKPrintingView _pageForRect:]):
(-[WKPrintingView _drawPDFDocument:page:atPoint:]):
(-[WKPrintingView _drawPreview:]):
(-[WKPrintingView drawRect:]):
(-[WKPrintingView rectForPage:]):
* UIProcess/mac/WKTextFinderClient.mm:
(-[WKTextFinderClient initWithPage:view:]):
(-[WKTextFinderClient findMatchesForString:relativeToMatch:findOptions:maxResults:resultCollector:]):
(-[WKTextFinderClient getSelectedText:]):
(arrayFromRects):
(-[WKTextFinderClient didFindStringMatchesWithRects:didWrapAround:]):
(-[WKTextFinderClient didGetImageForMatchResult:]):
* UIProcess/mac/WKTextInputWindowController.mm:
* UIProcess/mac/WKViewLayoutStrategy.mm:
(+[WKViewLayoutStrategy layoutStrategyWithPage:view:viewImpl:mode:]):
(-[WKViewLayoutStrategy initWithPage:view:viewImpl:mode:]):
(-[WKViewViewSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
(-[WKViewFixedSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
(-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy initWithPage:view:viewImpl:mode:]):
(-[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
* UIProcess/mac/WebColorPickerMac.mm:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(-[WKMenuTarget forwardContextMenuAction:]):
(WebKit::menuItemIdentifier):
(WebKit::WebContextMenuProxyMac::createContextMenuItem):
* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WKWebInspectorProxyObjCAdapter initWithWebInspectorProxy:]):
* UIProcess/mac/WebPageProxyMac.mm:
* UIProcess/mac/WebPopupMenuProxyMac.mm:
* UIProcess/win/PageClientImpl.cpp:
* UIProcess/win/TextCheckerWin.cpp:
* UIProcess/win/WebContextMenuProxyWin.cpp:
* UIProcess/win/WebPopupMenuProxyWin.cpp:
* UIProcess/win/WebView.cpp:
* UIProcess/wpe/TextCheckerWPE.cpp:
* UIProcess/wpe/WebPasteboardProxyWPE.cpp:
* WebKit.xcodeproj/project.pbxproj:

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

120 files changed:
Source/WebKit/ChangeLog
Source/WebKit/Sources.txt
Source/WebKit/SourcesCocoa.txt
Source/WebKit/UIProcess/API/APIWebsiteDataStore.h
Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
Source/WebKit/UIProcess/API/glib/IconDatabase.cpp
Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
Source/WebKit/UIProcess/API/gtk/WebKitColorChooser.cpp
Source/WebKit/UIProcess/API/gtk/WebKitPopupMenu.cpp
Source/WebKit/UIProcess/API/gtk/WebKitRemoteInspectorProtocolHandler.cpp
Source/WebKit/UIProcess/ApplicationStateTracker.mm
Source/WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm
Source/WebKit/UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm
Source/WebKit/UIProcess/Automation/ios/WebAutomationSessionIOS.mm
Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
Source/WebKit/UIProcess/Cocoa/NavigationState.mm
Source/WebKit/UIProcess/Cocoa/PlaybackSessionManagerProxy.mm
Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
Source/WebKit/UIProcess/Cocoa/ViewGestureController.cpp
Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
Source/WebKit/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit/UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
Source/WebKit/UIProcess/DrawingAreaProxy.cpp
Source/WebKit/UIProcess/Gamepad/UIGamepad.cpp
Source/WebKit/UIProcess/Gamepad/UIGamepadProvider.cpp
Source/WebKit/UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm
Source/WebKit/UIProcess/HighPerformanceGraphicsUsageSampler.cpp
Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit/UIProcess/Notifications/WebNotificationManagerProxy.cpp
Source/WebKit/UIProcess/PerActivityStateCPUUsageSampler.cpp
Source/WebKit/UIProcess/Plugins/PluginInfoStore.cpp
Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp
Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm
Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm
Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp
Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
Source/WebKit/UIProcess/ServiceWorkerProcessProxy.cpp
Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp
Source/WebKit/UIProcess/SuspendedPageProxy.cpp
Source/WebKit/UIProcess/TextCheckerCompletion.cpp
Source/WebKit/UIProcess/UIMessagePortChannelProvider.cpp
Source/WebKit/UIProcess/UserMediaPermissionCheckProxy.cpp
Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp
Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.cpp
Source/WebKit/UIProcess/VisitedLinkStore.cpp
Source/WebKit/UIProcess/WKInspectorHighlightView.mm
Source/WebKit/UIProcess/WebBackForwardList.cpp
Source/WebKit/UIProcess/WebContextMenuListenerProxy.cpp
Source/WebKit/UIProcess/WebCookieManagerProxy.cpp
Source/WebKit/UIProcess/WebEditCommandProxy.cpp
Source/WebKit/UIProcess/WebFrameProxy.cpp
Source/WebKit/UIProcess/WebFullScreenManagerProxy.cpp
Source/WebKit/UIProcess/WebInspectorProxy.cpp
Source/WebKit/UIProcess/WebNavigationState.cpp
Source/WebKit/UIProcess/WebOpenPanelResultListenerProxy.cpp
Source/WebKit/UIProcess/WebPageInjectedBundleClient.cpp
Source/WebKit/UIProcess/WebPageProxy.cpp
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessProxy.cpp
Source/WebKit/UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp
Source/WebKit/UIProcess/WebURLSchemeHandler.cpp
Source/WebKit/UIProcess/WebURLSchemeTask.cpp
Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp
Source/WebKit/UIProcess/ios/DragDropInteractionState.mm
Source/WebKit/UIProcess/ios/InputViewUpdateDeferrer.mm
Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
Source/WebKit/UIProcess/ios/SmartMagnificationController.mm
Source/WebKit/UIProcess/ios/TextCheckerIOS.mm
Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm
Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm
Source/WebKit/UIProcess/ios/WKApplicationStateTrackingView.mm
Source/WebKit/UIProcess/ios/WKGeolocationProviderIOS.mm
Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm
Source/WebKit/UIProcess/ios/WKLegacyPDFView.mm
Source/WebKit/UIProcess/ios/WKPDFView.mm
Source/WebKit/UIProcess/ios/WKScrollView.mm
Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm
Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
Source/WebKit/UIProcess/mac/CorrectionPanel.mm
Source/WebKit/UIProcess/mac/PageClientImplMac.mm
Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm
Source/WebKit/UIProcess/mac/TextCheckerMac.mm
Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm
Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm
Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.mm
Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm
Source/WebKit/UIProcess/mac/WKImmediateActionController.mm
Source/WebKit/UIProcess/mac/WKInspectorViewController.mm
Source/WebKit/UIProcess/mac/WKPrintingView.mm
Source/WebKit/UIProcess/mac/WKTextFinderClient.mm
Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
Source/WebKit/UIProcess/mac/WKViewLayoutStrategy.mm
Source/WebKit/UIProcess/mac/WebColorPickerMac.mm
Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm
Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm
Source/WebKit/UIProcess/win/PageClientImpl.cpp
Source/WebKit/UIProcess/win/TextCheckerWin.cpp
Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
Source/WebKit/UIProcess/win/WebPopupMenuProxyWin.cpp
Source/WebKit/UIProcess/win/WebView.cpp
Source/WebKit/UIProcess/wpe/TextCheckerWPE.cpp
Source/WebKit/UIProcess/wpe/WebPasteboardProxyWPE.cpp
Source/WebKit/WebKit.xcodeproj/project.pbxproj

index 6e53e96..7ebaa99 100644 (file)
@@ -1,3 +1,228 @@
+2018-08-23  Tim Horton  <timothy_horton@apple.com>
+
+        Use unified build for UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=185014
+
+        Reviewed by Alex Christensen.
+
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * UIProcess/API/APIWebsiteDataStore.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration urlSchemeHandlerForURLScheme:]):
+        * UIProcess/API/glib/IconDatabase.cpp:
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        * UIProcess/API/gtk/WebKitColorChooser.cpp:
+        * UIProcess/API/gtk/WebKitPopupMenu.cpp:
+        * UIProcess/API/gtk/WebKitRemoteInspectorProtocolHandler.cpp:
+        * UIProcess/ApplicationStateTracker.mm:
+        * UIProcess/Authentication/mac/WebCredentialMac.mm:
+        * UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm:
+        * UIProcess/Automation/ios/WebAutomationSessionIOS.mm:
+        * UIProcess/Automation/mac/WebAutomationSessionMac.mm:
+        * UIProcess/Cocoa/NavigationState.mm:
+        * UIProcess/Cocoa/PlaybackSessionManagerProxy.mm:
+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        * UIProcess/Cocoa/ViewGestureController.cpp:
+        * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+        (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+        (-[WKWebViewContentProviderRegistry addPage:]):
+        (-[WKWebViewContentProviderRegistry removePage:]):
+        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+        * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        * UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm:
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (-[WKTextTouchBarItemController itemForIdentifier:]):
+        (WebKit::WebViewImpl::performDragOperation):
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        * UIProcess/DrawingAreaProxy.cpp:
+        * UIProcess/Gamepad/UIGamepad.cpp:
+        * UIProcess/Gamepad/UIGamepadProvider.cpp:
+        * UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm:
+        * UIProcess/HighPerformanceGraphicsUsageSampler.cpp:
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+        * UIProcess/PerActivityStateCPUUsageSampler.cpp:
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        * UIProcess/Plugins/PluginProcessProxy.cpp:
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm:
+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
+        * UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp:
+        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+        * UIProcess/RemoteWebInspectorProxy.cpp:
+        * UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
+        * UIProcess/ServiceWorkerProcessProxy.cpp:
+        * UIProcess/Storage/StorageProcessProxy.cpp:
+        * UIProcess/SuspendedPageProxy.cpp:
+        * UIProcess/TextCheckerCompletion.cpp:
+        * UIProcess/UIMessagePortChannelProvider.cpp:
+        * UIProcess/UserMediaPermissionCheckProxy.cpp:
+        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+        * UIProcess/UserMediaPermissionRequestProxy.cpp:
+        * UIProcess/VisitedLinkStore.cpp:
+        * UIProcess/WKInspectorHighlightView.mm:
+        (findIntersectionOnLineBetweenPoints):
+        (quadIntersection):
+        (layerPathWithHole):
+        (layerPath):
+        (-[WKInspectorHighlightView _layoutForNodeHighlight:offset:]):
+        (-[WKInspectorHighlightView _layoutForNodeListHighlight:]):
+        (-[WKInspectorHighlightView _layoutForRectsHighlight:]):
+        (-[WKInspectorHighlightView update:]):
+        * UIProcess/WebBackForwardList.cpp:
+        * UIProcess/WebContextMenuListenerProxy.cpp:
+        * UIProcess/WebCookieManagerProxy.cpp:
+        * UIProcess/WebEditCommandProxy.cpp:
+        * UIProcess/WebFrameProxy.cpp:
+        * UIProcess/WebFullScreenManagerProxy.cpp:
+        * UIProcess/WebInspectorProxy.cpp:
+        * UIProcess/WebNavigationState.cpp:
+        * UIProcess/WebOpenPanelResultListenerProxy.cpp:
+        * UIProcess/WebPageInjectedBundleClient.cpp:
+        * UIProcess/WebPageProxy.cpp:
+        * UIProcess/WebProcessPool.cpp:
+        * UIProcess/WebProcessProxy.cpp:
+        * UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp:
+        * UIProcess/WebURLSchemeHandler.cpp:
+        * UIProcess/WebURLSchemeTask.cpp:
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+        * UIProcess/ios/DragDropInteractionState.mm:
+        * UIProcess/ios/InputViewUpdateDeferrer.mm:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (-[WKEditCommandObjC initWithWebEditCommandProxy:]):
+        (-[WKEditCommandObjC command]):
+        * UIProcess/ios/SmartMagnificationController.mm:
+        * UIProcess/ios/TextCheckerIOS.mm:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::beginSwipeGesture):
+        (WebKit::ViewGestureController::removeSwipeSnapshot):
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (presentationStyleForView):
+        * UIProcess/ios/WKApplicationStateTrackingView.mm:
+        (-[WKApplicationStateTrackingView initWithFrame:webView:]):
+        (-[WKApplicationStateTrackingView _applicationDidEnterBackground]):
+        (-[WKApplicationStateTrackingView _applicationDidFinishSnapshottingAfterEnteringBackground]):
+        (-[WKApplicationStateTrackingView _applicationWillEnterForeground]):
+        * UIProcess/ios/WKGeolocationProviderIOS.mm:
+        (-[WKGeolocationProviderIOS _startUpdating]):
+        (-[WKGeolocationProviderIOS _stopUpdating]):
+        (-[WKGeolocationProviderIOS _setEnableHighAccuracy:]):
+        (-[WKGeolocationProviderIOS init]):
+        (-[WKGeolocationProviderIOS initWithProcessPool:]):
+        (-[WKGeolocationProviderIOS decidePolicyForGeolocationRequestFromOrigin:frame:completionHandler:view:]):
+        (-[WKGeolocationProviderIOS geolocationAuthorizationGranted]):
+        (-[WKLegacyCoreLocationProvider positionChanged:]):
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (-[WKKeyboardScrollingAnimator _scrollOffsetForEvent:]):
+        (-[WKKeyboardScrollingAnimator beginWithEvent:]):
+        (-[WKKeyboardScrollingAnimator handleKeyEvent:]):
+        (-[WKKeyboardScrollingAnimator startAnimatedScroll]):
+        (-[WKKeyboardScrollingAnimator stopAnimatedScroll]):
+        * UIProcess/ios/WKLegacyPDFView.mm:
+        * UIProcess/ios/WKPDFView.mm:
+        (-[WKPDFView web_setContentProviderData:suggestedFilename:]):
+        * UIProcess/ios/WKScrollView.mm:
+        (-[WKScrollView _systemContentInset]):
+        * UIProcess/ios/WKSystemPreviewView.mm:
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        * UIProcess/mac/CorrectionPanel.mm:
+        (correctionIndicatorType):
+        * UIProcess/mac/PageClientImplMac.mm:
+        * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+        (-[WKRemoteWebInspectorProxyObjCAdapter initWithRemoteWebInspectorProxy:]):
+        * UIProcess/mac/TextCheckerMac.mm:
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        * UIProcess/mac/ViewSnapshotStore.mm:
+        * UIProcess/mac/WKFullKeyboardAccessWatcher.mm:
+        (-[WKFullKeyboardAccessWatcher notifyAllProcessPools]):
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (WebKit::WKFullScreenWindowControllerVideoFullscreenModelClient::setInterface):
+        (WebKit::WKFullScreenWindowControllerVideoFullscreenModelClient::interface const):
+        (-[WKFullScreenWindowController initWithWindow:webView:page:]):
+        (-[WKFullScreenWindowController enterFullScreen:]):
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+        (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+        (-[WKFullScreenWindowController windowDidEnterFullScreen:]):
+        (-[WKFullScreenWindowController windowDidExitFullScreen:]):
+        (-[WKFullScreenWindowController _manager]):
+        (-[WKFullScreenWindowController _replaceView:with:]):
+        (zoomAnimation):
+        (createMask):
+        (maskAnimation):
+        * UIProcess/mac/WKImmediateActionController.mm:
+        (-[WKImmediateActionController initWithPage:view:viewImpl:recognizer:]):
+        (-[WKImmediateActionController willDestroyView:]):
+        (-[WKImmediateActionController _clearImmediateActionState]):
+        (-[WKImmediateActionController didPerformImmediateActionHitTest:contentPreventsDefault:userData:]):
+        (-[WKImmediateActionController immediateActionRecognizerWillPrepare:]):
+        (-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+        (-[WKImmediateActionController _webHitTestResult]):
+        (-[WKImmediateActionController _defaultAnimationController]):
+        (-[WKImmediateActionController menuItem:maxSizeForPoint:]):
+        (-[WKImmediateActionController _animationControllerForDataDetectedText]):
+        (-[WKImmediateActionController _animationControllerForDataDetectedLink]):
+        (-[WKImmediateActionController _animationControllerForText]):
+        * UIProcess/mac/WKInspectorViewController.mm:
+        (-[WKInspectorViewController initWithInspectedPage:]):
+        (-[WKInspectorViewController webView]):
+        (-[WKInspectorViewController configuration]):
+        (-[WKInspectorViewController webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
+        (-[WKInspectorViewController webView:decidePolicyForNavigationAction:decisionHandler:]):
+        (-[WKInspectorViewController inspectorWKWebViewReload:]):
+        * UIProcess/mac/WKPrintingView.mm:
+        (-[WKPrintingView _expectedPreviewCallbackForRect:]):
+        (pageDidDrawToImage):
+        (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
+        (pageDidComputePageRects):
+        (-[WKPrintingView _askPageToComputePageRects]):
+        (-[WKPrintingView _pageForRect:]):
+        (-[WKPrintingView _drawPDFDocument:page:atPoint:]):
+        (-[WKPrintingView _drawPreview:]):
+        (-[WKPrintingView drawRect:]):
+        (-[WKPrintingView rectForPage:]):
+        * UIProcess/mac/WKTextFinderClient.mm:
+        (-[WKTextFinderClient initWithPage:view:]):
+        (-[WKTextFinderClient findMatchesForString:relativeToMatch:findOptions:maxResults:resultCollector:]):
+        (-[WKTextFinderClient getSelectedText:]):
+        (arrayFromRects):
+        (-[WKTextFinderClient didFindStringMatchesWithRects:didWrapAround:]):
+        (-[WKTextFinderClient didGetImageForMatchResult:]):
+        * UIProcess/mac/WKTextInputWindowController.mm:
+        * UIProcess/mac/WKViewLayoutStrategy.mm:
+        (+[WKViewLayoutStrategy layoutStrategyWithPage:view:viewImpl:mode:]):
+        (-[WKViewLayoutStrategy initWithPage:view:viewImpl:mode:]):
+        (-[WKViewViewSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
+        (-[WKViewFixedSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
+        (-[WKViewDynamicSizeComputedFromViewScaleLayoutStrategy initWithPage:view:viewImpl:mode:]):
+        (-[WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy initWithPage:view:viewImpl:mode:]):
+        * UIProcess/mac/WebColorPickerMac.mm:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (-[WKMenuTarget forwardContextMenuAction:]):
+        (WebKit::menuItemIdentifier):
+        (WebKit::WebContextMenuProxyMac::createContextMenuItem):
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (-[WKWebInspectorProxyObjCAdapter initWithWebInspectorProxy:]):
+        * UIProcess/mac/WebPageProxyMac.mm:
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        * UIProcess/win/PageClientImpl.cpp:
+        * UIProcess/win/TextCheckerWin.cpp:
+        * UIProcess/win/WebContextMenuProxyWin.cpp:
+        * UIProcess/win/WebPopupMenuProxyWin.cpp:
+        * UIProcess/win/WebView.cpp:
+        * UIProcess/wpe/TextCheckerWPE.cpp:
+        * UIProcess/wpe/WebPasteboardProxyWPE.cpp:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2018-08-23  Sihui Liu  <sihui_liu@apple.com>
 
         Move legacy directory configuration from WebProcessPool to API::WebsiteDataStore
index 86949a7..56a5c2b 100644 (file)
@@ -226,64 +226,64 @@ StorageProcess/ServiceWorker/WebSWOriginStore.cpp @no-unify
 StorageProcess/ServiceWorker/WebSWServerConnection.cpp @no-unify
 StorageProcess/ServiceWorker/WebSWServerToContextConnection.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/PageLoadState.cpp @no-unify
-UIProcess/ProcessAssertion.cpp @no-unify
-UIProcess/ProcessThrottler.cpp @no-unify
-UIProcess/RemoteWebInspectorProxy.cpp @no-unify
-UIProcess/ResourceLoadStatisticsMemoryStore.cpp @no-unify
-UIProcess/ResourceLoadStatisticsPersistentStorage.cpp @no-unify
-UIProcess/ResponsivenessTimer.cpp @no-unify
-UIProcess/ServiceWorkerProcessProxy.cpp @no-unify
-UIProcess/StatisticsRequest.cpp @no-unify
-UIProcess/SuspendedPageProxy.cpp @no-unify
-UIProcess/SystemPreviewController.cpp @no-unify
-UIProcess/TextCheckerCompletion.cpp @no-unify
-UIProcess/UIMessagePortChannelProvider.cpp @no-unify
-UIProcess/UserMediaPermissionCheckProxy.cpp @no-unify
-UIProcess/UserMediaPermissionRequestManagerProxy.cpp @no-unify
-UIProcess/UserMediaPermissionRequestProxy.cpp @no-unify
-UIProcess/UserMediaProcessManager.cpp @no-unify
-UIProcess/VisitedLinkStore.cpp @no-unify
-UIProcess/WebBackForwardList.cpp @no-unify
-UIProcess/WebColorPicker.cpp @no-unify
-UIProcess/WebConnectionToWebProcess.cpp @no-unify
-UIProcess/WebContextClient.cpp @no-unify
-UIProcess/WebContextConnectionClient.cpp @no-unify
-UIProcess/WebContextInjectedBundleClient.cpp @no-unify
-UIProcess/WebContextMenuListenerProxy.cpp @no-unify
-UIProcess/WebContextMenuProxy.cpp @no-unify
-UIProcess/WebCookieManagerProxy.cpp @no-unify
-UIProcess/WebCookieManagerProxyClient.cpp @no-unify
-UIProcess/WebEditCommandProxy.cpp @no-unify
-UIProcess/WebFormClient.cpp @no-unify
-UIProcess/WebFormSubmissionListenerProxy.cpp @no-unify
-UIProcess/WebFramePolicyListenerProxy.cpp @no-unify
-UIProcess/WebFrameProxy.cpp @no-unify
-UIProcess/WebFullScreenManagerProxy.cpp @no-unify
-UIProcess/WebGeolocationManagerProxy.cpp @no-unify
-UIProcess/WebGeolocationProvider.cpp @no-unify
-UIProcess/WebInspectorProxy.cpp @no-unify
-UIProcess/WebInspectorUtilities.cpp @no-unify
-UIProcess/WebNavigationState.cpp @no-unify
-UIProcess/WebOpenPanelResultListenerProxy.cpp @no-unify
-UIProcess/WebPageDiagnosticLoggingClient.cpp @no-unify
-UIProcess/WebPageGroup.cpp @no-unify
-UIProcess/WebPageInjectedBundleClient.cpp @no-unify
-UIProcess/WebPageProxy.cpp @no-unify
-UIProcess/WebPasteboardProxy.cpp @no-unify
-UIProcess/WebPreferences.cpp @no-unify
-UIProcess/WebProcessLifetimeObserver.cpp @no-unify
-UIProcess/WebProcessLifetimeTracker.cpp @no-unify
-UIProcess/WebProcessPool.cpp @no-unify
-UIProcess/WebProcessProxy.cpp @no-unify
-UIProcess/WebURLSchemeHandler.cpp @no-unify
-UIProcess/WebURLSchemeTask.cpp @no-unify
+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/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/API/APIAttachment.cpp @no-unify
 UIProcess/API/APIContentRuleList.cpp @no-unify
@@ -356,45 +356,45 @@ UIProcess/API/C/WKWebsiteDataStoreRef.cpp @no-unify
 UIProcess/API/C/WKWebsitePolicies.cpp @no-unify
 UIProcess/API/C/WKWindowFeaturesRef.cpp @no-unify
 
-UIProcess/Authentication/AuthenticationChallengeProxy.cpp @no-unify
-UIProcess/Authentication/AuthenticationDecisionListener.cpp @no-unify
-UIProcess/Authentication/WebCredential.cpp @no-unify
-UIProcess/Authentication/WebProtectionSpace.cpp @no-unify
+UIProcess/Authentication/AuthenticationChallengeProxy.cpp
+UIProcess/Authentication/AuthenticationDecisionListener.cpp
+UIProcess/Authentication/WebCredential.cpp
+UIProcess/Authentication/WebProtectionSpace.cpp
 
-UIProcess/Automation/SimulatedInputDispatcher.cpp @no-unify
-UIProcess/Automation/WebAutomationSession.cpp @no-unify
+UIProcess/Automation/SimulatedInputDispatcher.cpp
+UIProcess/Automation/WebAutomationSession.cpp
 
-UIProcess/Downloads/DownloadProxy.cpp @no-unify
-UIProcess/Downloads/DownloadProxyMap.cpp @no-unify
+UIProcess/Downloads/DownloadProxy.cpp
+UIProcess/Downloads/DownloadProxyMap.cpp
 
-UIProcess/Gamepad/UIGamepad.cpp @no-unify
-UIProcess/Gamepad/UIGamepadProvider.cpp @no-unify
+UIProcess/Gamepad/UIGamepad.cpp
+UIProcess/Gamepad/UIGamepadProvider.cpp
 
 // TODO: This file should be "unified" once GTK's PluginProcess2 is removed.
 UIProcess/Launcher/ProcessLauncher.cpp @no-unify
 
-UIProcess/Network/NetworkProcessProxy.cpp @no-unify
+UIProcess/Network/NetworkProcessProxy.cpp
 
-UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp @no-unify
-UIProcess/Notifications/WebNotification.cpp @no-unify
-UIProcess/Notifications/WebNotificationManagerProxy.cpp @no-unify
-UIProcess/Notifications/WebNotificationProvider.cpp @no-unify
+UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp
+UIProcess/Notifications/WebNotification.cpp
+UIProcess/Notifications/WebNotificationManagerProxy.cpp
+UIProcess/Notifications/WebNotificationProvider.cpp
 
-UIProcess/Plugins/PlugInAutoStartProvider.cpp @no-unify
-UIProcess/Plugins/PluginInfoStore.cpp @no-unify
-UIProcess/Plugins/PluginProcessManager.cpp @no-unify
-UIProcess/Plugins/PluginProcessProxy.cpp @no-unify
+UIProcess/Plugins/PlugInAutoStartProvider.cpp
+UIProcess/Plugins/PluginInfoStore.cpp
+UIProcess/Plugins/PluginProcessManager.cpp
+UIProcess/Plugins/PluginProcessProxy.cpp
 
-UIProcess/Storage/StorageProcessProxy.cpp @no-unify
+UIProcess/Storage/StorageProcessProxy.cpp
 
-UIProcess/UserContent/WebScriptMessageHandler.cpp @no-unify
-UIProcess/UserContent/WebUserContentControllerProxy.cpp @no-unify
+UIProcess/UserContent/WebScriptMessageHandler.cpp
+UIProcess/UserContent/WebUserContentControllerProxy.cpp
 
-UIProcess/WebStorage/LocalStorageDatabase.cpp @no-unify
-UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp @no-unify
+UIProcess/WebStorage/LocalStorageDatabase.cpp
+UIProcess/WebStorage/LocalStorageDatabaseTracker.cpp
 
-UIProcess/WebsiteData/WebsiteDataRecord.cpp @no-unify
-UIProcess/WebsiteData/WebsiteDataStore.cpp @no-unify
+UIProcess/WebsiteData/WebsiteDataRecord.cpp
+UIProcess/WebsiteData/WebsiteDataStore.cpp
 
 WebProcess/WebConnectionToUIProcess.cpp
 WebProcess/WebProcess.cpp
index 2d0235e..d8a3c90 100644 (file)
@@ -200,19 +200,19 @@ StorageProcess/ios/StorageProcessIOS.mm @no-unify
 
 StorageProcess/mac/StorageProcessMac.mm @no-unify
 
-UIProcess/_WKWebViewPrintFormatter.mm @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/_WKWebViewPrintFormatter.mm
+UIProcess/ApplicationStateTracker.mm
+UIProcess/HighPerformanceGraphicsUsageSampler.cpp
+UIProcess/PerActivityStateCPUUsageSampler.cpp
+UIProcess/WebDataListSuggestionsDropdown.cpp
+UIProcess/WebMediaSessionFocusManager.cpp
+UIProcess/WebMediaSessionFocusManagerClient.cpp
+UIProcess/WebResourceLoadStatisticsStore.cpp
+UIProcess/WebResourceLoadStatisticsTelemetry.cpp
+UIProcess/WKImagePreviewViewController.mm
+UIProcess/WKInspectorHighlightView.mm
+
+UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp
 
 UIProcess/API/APIWebsiteDataRecord.cpp @no-unify
 
@@ -296,165 +296,168 @@ UIProcess/API/Cocoa/WKWindowFeatures.mm @no-unify
 
 UIProcess/API/mac/WKView.mm @no-unify
 
-UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm @no-unify
-
-UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm @no-unify
-
-UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm @no-unify
-
-UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm @no-unify
-UIProcess/Authentication/cocoa/SecKeyProxyStore.mm @no-unify
-
-UIProcess/Authentication/mac/WebCredentialMac.mm @no-unify
-
-UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm @no-unify
-
-UIProcess/Automation/ios/WebAutomationSessionIOS.mm @no-unify
-
-UIProcess/Automation/mac/WebAutomationSessionMac.mm @no-unify
-
-UIProcess/Cocoa/AutomationClient.mm @no-unify
-UIProcess/Cocoa/AutomationSessionClient.mm @no-unify
-UIProcess/Cocoa/DiagnosticLoggingClient.mm @no-unify
-UIProcess/Cocoa/DownloadClient.mm @no-unify
-UIProcess/Cocoa/FindClient.mm @no-unify
-UIProcess/Cocoa/FullscreenClient.mm @no-unify
-UIProcess/Cocoa/IconLoadingDelegate.mm @no-unify
-UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm @no-unify
-UIProcess/Cocoa/NavigationState.mm @no-unify
-UIProcess/Cocoa/PageClientImplCocoa.mm @no-unify
-UIProcess/Cocoa/PlaybackSessionManagerProxy.mm @no-unify
-UIProcess/Cocoa/ResourceLoadStatisticsMemoryStoreCocoa.mm @no-unify
-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
-UIProcess/Cocoa/WebProcessProxyCocoa.mm @no-unify
-UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm @no-unify
-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
-
-UIProcess/ios/DragDropInteractionState.mm @no-unify
-
-UIProcess/ios/forms/WKAirPlayRoutePicker.mm @no-unify
-UIProcess/ios/forms/WKDatePickerViewController.mm @no-unify
-UIProcess/ios/forms/WKFileUploadPanel.mm @no-unify
-UIProcess/ios/forms/WKFocusedFormControlView.mm @no-unify
-UIProcess/ios/forms/WKFormColorControl.mm @no-unify
-UIProcess/ios/forms/WKFormColorPicker.mm @no-unify
-UIProcess/ios/forms/WKFormInputControl.mm @no-unify
-UIProcess/ios/forms/WKFormPopover.mm @no-unify
-UIProcess/ios/forms/WKFormSelectControl.mm @no-unify
-UIProcess/ios/forms/WKFormSelectPicker.mm @no-unify
-UIProcess/ios/forms/WKFormSelectPopover.mm @no-unify
-UIProcess/ios/forms/WKNumberPadView.mm @no-unify
-UIProcess/ios/forms/WKNumberPadViewController.mm @no-unify
-UIProcess/ios/forms/WKQuickboardListViewController.mm @no-unify
-UIProcess/ios/forms/WKSelectMenuListViewController.mm @no-unify
-UIProcess/ios/forms/WKTextInputListViewController.mm @no-unify
-UIProcess/ios/forms/WKTimePickerViewController.mm @no-unify
-
-UIProcess/ios/fullscreen/FullscreenTouchSecheuristic.cpp @no-unify
-UIProcess/ios/fullscreen/WKFullscreenStackView.mm @no-unify
-UIProcess/ios/fullscreen/WKFullScreenViewController.mm @no-unify
-UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm @no-unify
-
-UIProcess/ios/InputViewUpdateDeferrer.mm @no-unify
-UIProcess/ios/LayerRepresentation.mm @no-unify
-UIProcess/ios/PageClientImplIOS.mm @no-unify
-UIProcess/ios/ProcessAssertionIOS.mm @no-unify
-UIProcess/ios/ResourceLoadStatisticsPersistentStorageIOS.mm @no-unify
-UIProcess/ios/SmartMagnificationController.mm @no-unify
-UIProcess/ios/TextCheckerIOS.mm @no-unify
-UIProcess/ios/ViewGestureControllerIOS.mm @no-unify
-UIProcess/ios/WebMemoryPressureHandlerIOS.mm @no-unify
-UIProcess/ios/WebPageProxyIOS.mm @no-unify
-UIProcess/ios/WebProcessProxyIOS.mm @no-unify
-UIProcess/ios/WKActionSheet.mm @no-unify
-UIProcess/ios/WKActionSheetAssistant.mm @no-unify
-UIProcess/ios/WKApplicationStateTrackingView.mm @no-unify
+UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
+
+UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
+
+UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
+
+UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
+UIProcess/Authentication/cocoa/SecKeyProxyStore.mm
+
+UIProcess/Authentication/mac/WebCredentialMac.mm
+
+UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm
+
+UIProcess/Automation/ios/WebAutomationSessionIOS.mm
+
+UIProcess/Automation/mac/WebAutomationSessionMac.mm
+
+UIProcess/Cocoa/AutomationClient.mm
+UIProcess/Cocoa/AutomationSessionClient.mm
+UIProcess/Cocoa/DiagnosticLoggingClient.mm
+UIProcess/Cocoa/DownloadClient.mm
+UIProcess/Cocoa/FindClient.mm
+UIProcess/Cocoa/FullscreenClient.mm
+UIProcess/Cocoa/IconLoadingDelegate.mm
+UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm
+UIProcess/Cocoa/NavigationState.mm
+UIProcess/Cocoa/PageClientImplCocoa.mm
+UIProcess/Cocoa/PlaybackSessionManagerProxy.mm
+UIProcess/Cocoa/ResourceLoadStatisticsMemoryStoreCocoa.mm
+UIProcess/Cocoa/SafeBrowsingResultCocoa.mm
+UIProcess/Cocoa/SessionStateCoding.mm
+UIProcess/Cocoa/SystemPreviewControllerCocoa.mm
+UIProcess/Cocoa/UIDelegate.mm
+UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp
+UIProcess/Cocoa/VersionChecks.mm
+UIProcess/Cocoa/VideoFullscreenManagerProxy.mm
+UIProcess/Cocoa/ViewGestureController.cpp
+UIProcess/Cocoa/WebPageProxyCocoa.mm
+UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
+UIProcess/Cocoa/WebProcessPoolCocoa.mm
+UIProcess/Cocoa/WebProcessProxyCocoa.mm
+UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
+UIProcess/Cocoa/WebViewImpl.mm
+UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
+UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
+
+UIProcess/CredentialManagement/WebCredentialsMessengerProxy.cpp
+
+UIProcess/Gamepad/cocoa/UIGamepadProviderCocoa.mm
+UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm
+UIProcess/Gamepad/mac/UIGamepadProviderMac.mm
+
+UIProcess/ios/DragDropInteractionState.mm
+
+UIProcess/ios/forms/WKAirPlayRoutePicker.mm
+UIProcess/ios/forms/WKDatePickerViewController.mm
+UIProcess/ios/forms/WKFileUploadPanel.mm
+UIProcess/ios/forms/WKFocusedFormControlView.mm
+UIProcess/ios/forms/WKFormColorControl.mm
+UIProcess/ios/forms/WKFormColorPicker.mm
+UIProcess/ios/forms/WKFormInputControl.mm
+UIProcess/ios/forms/WKFormPopover.mm
+UIProcess/ios/forms/WKFormSelectControl.mm
+UIProcess/ios/forms/WKFormSelectPicker.mm
+UIProcess/ios/forms/WKFormSelectPopover.mm
+UIProcess/ios/forms/WKNumberPadView.mm
+UIProcess/ios/forms/WKNumberPadViewController.mm
+UIProcess/ios/forms/WKQuickboardListViewController.mm
+UIProcess/ios/forms/WKSelectMenuListViewController.mm
+UIProcess/ios/forms/WKTextInputListViewController.mm
+UIProcess/ios/forms/WKTimePickerViewController.mm
+
+UIProcess/ios/fullscreen/FullscreenTouchSecheuristic.cpp
+UIProcess/ios/fullscreen/WKFullscreenStackView.mm
+UIProcess/ios/fullscreen/WKFullScreenViewController.mm
+UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
+
+UIProcess/ios/InputViewUpdateDeferrer.mm
+UIProcess/ios/LayerRepresentation.mm
+UIProcess/ios/PageClientImplIOS.mm
+UIProcess/ios/ProcessAssertionIOS.mm
+UIProcess/ios/ResourceLoadStatisticsPersistentStorageIOS.mm
+UIProcess/ios/SmartMagnificationController.mm
+UIProcess/ios/TextCheckerIOS.mm
+UIProcess/ios/ViewGestureControllerIOS.mm
+UIProcess/ios/WebMemoryPressureHandlerIOS.mm
+UIProcess/ios/WebPageProxyIOS.mm
+UIProcess/ios/WebProcessProxyIOS.mm
+UIProcess/ios/WKActionSheet.mm
+UIProcess/ios/WKActionSheetAssistant.mm
+UIProcess/ios/WKApplicationStateTrackingView.mm
 UIProcess/ios/WKContentView.mm @no-unify
 UIProcess/ios/WKContentViewInteraction.mm @no-unify
-UIProcess/ios/WKGeolocationProviderIOS.mm @no-unify
-UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm @no-unify
-UIProcess/ios/WKInspectorNodeSearchGestureRecognizer.mm @no-unify
-UIProcess/ios/WKKeyboardScrollingAnimator.mm @no-unify
-UIProcess/ios/WKLegacyPDFView.mm @no-unify
-UIProcess/ios/WKPasswordView.mm @no-unify
-UIProcess/ios/WKPDFPageNumberIndicator.mm @no-unify
-UIProcess/ios/WKPDFView.mm @no-unify
-UIProcess/ios/WKScrollView.mm @no-unify
-UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m @no-unify
-UIProcess/ios/WKSystemPreviewView.mm @no-unify
-
-UIProcess/Launcher/mac/ProcessLauncherMac.mm @no-unify
-
-UIProcess/mac/CorrectionPanel.mm @no-unify
-UIProcess/mac/DisplayLink.cpp @no-unify
-UIProcess/mac/LegacySessionStateCoding.cpp @no-unify
-UIProcess/mac/PageClientImplMac.mm @no-unify
-UIProcess/mac/RemoteWebInspectorProxyMac.mm @no-unify
-UIProcess/mac/SecItemShimProxy.cpp @no-unify
-UIProcess/mac/ServicesController.mm @no-unify
-UIProcess/mac/TextCheckerMac.mm @no-unify
-UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm @no-unify
-UIProcess/mac/ViewGestureControllerMac.mm @no-unify
-UIProcess/mac/ViewSnapshotStore.mm @no-unify
-UIProcess/mac/WebColorPickerMac.mm @no-unify
-UIProcess/mac/WebContextMenuProxyMac.mm @no-unify
-UIProcess/mac/WebCookieManagerProxyMac.mm @no-unify
-UIProcess/mac/WebDataListSuggestionsDropdownMac.mm @no-unify
-UIProcess/mac/WebInspectorProxyMac.mm @no-unify
-UIProcess/mac/WebPageProxyMac.mm @no-unify
-UIProcess/mac/WebPopupMenuProxyMac.mm @no-unify
-UIProcess/mac/WebPreferencesMac.mm @no-unify
-UIProcess/mac/WebProcessProxyMac.mm @no-unify
-UIProcess/mac/WKFullKeyboardAccessWatcher.mm @no-unify
-UIProcess/mac/WKFullScreenWindowController.mm @no-unify
-UIProcess/mac/WKImmediateActionController.mm @no-unify
-UIProcess/mac/WKInspectorViewController.mm @no-unify
-UIProcess/mac/WKInspectorWindow.mm @no-unify
-UIProcess/mac/WKInspectorWKWebView.mm @no-unify
-UIProcess/mac/WKPrintingView.mm @no-unify
-UIProcess/mac/WKSharingServicePickerDelegate.mm @no-unify
-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
-
-UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm @no-unify
-UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm @no-unify
-UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm @no-unify
-UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm @no-unify
-
-UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm @no-unify
-UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm @no-unify
-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
+UIProcess/ios/WKGeolocationProviderIOS.mm
+UIProcess/ios/WKGeolocationProviderIOSObjCSecurityOrigin.mm
+UIProcess/ios/WKInspectorNodeSearchGestureRecognizer.mm
+UIProcess/ios/WKKeyboardScrollingAnimator.mm
+UIProcess/ios/WKLegacyPDFView.mm
+UIProcess/ios/WKPasswordView.mm
+UIProcess/ios/WKPDFPageNumberIndicator.mm
+UIProcess/ios/WKPDFView.mm
+UIProcess/ios/WKScrollView.mm
+UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m
+UIProcess/ios/WKSystemPreviewView.mm
+
+UIProcess/Launcher/mac/ProcessLauncherMac.mm
+
+UIProcess/mac/CorrectionPanel.mm
+UIProcess/mac/DisplayLink.cpp
+UIProcess/mac/LegacySessionStateCoding.cpp
+UIProcess/mac/PageClientImplMac.mm
+UIProcess/mac/RemoteWebInspectorProxyMac.mm
+UIProcess/mac/SecItemShimProxy.cpp
+UIProcess/mac/ServicesController.mm
+UIProcess/mac/TextCheckerMac.mm
+UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
+UIProcess/mac/ViewGestureControllerMac.mm
+UIProcess/mac/ViewSnapshotStore.mm
+UIProcess/mac/WebColorPickerMac.mm
+UIProcess/mac/WebContextMenuProxyMac.mm
+UIProcess/mac/WebCookieManagerProxyMac.mm
+UIProcess/mac/WebDataListSuggestionsDropdownMac.mm
+UIProcess/mac/WebInspectorProxyMac.mm
+UIProcess/mac/WebPageProxyMac.mm
+UIProcess/mac/WebPopupMenuProxyMac.mm
+UIProcess/mac/WebPreferencesMac.mm
+UIProcess/mac/WebProcessProxyMac.mm
+UIProcess/mac/WindowServerConnection.mm
+UIProcess/mac/WKFullKeyboardAccessWatcher.mm
+UIProcess/mac/WKFullScreenWindowController.mm
+UIProcess/mac/WKImmediateActionController.mm
+UIProcess/mac/WKInspectorViewController.mm
+UIProcess/mac/WKInspectorWindow.mm
+UIProcess/mac/WKInspectorWKWebView.mm
+UIProcess/mac/WKPrintingView.mm
+UIProcess/mac/WKSharingServicePickerDelegate.mm
+UIProcess/mac/WKTextFinderClient.mm
+UIProcess/mac/WKTextInputWindowController.mm
+UIProcess/mac/WKViewLayoutStrategy.mm
+
+UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
+
+UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+UIProcess/Plugins/mac/PluginProcessManagerMac.mm
+UIProcess/Plugins/mac/PluginProcessProxyMac.mm
+
+UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
+UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
+UIProcess/RemoteLayerTree/ios/ScrollingTreeOverflowScrollingNodeIOS.mm
+UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
+
+UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
+UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
+UIProcess/RemoteLayerTree/RemoteLayerTreeScrollingPerformanceData.mm
+UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
+UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
+
+UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm
+
+UIProcess/WebStorage/StorageManager.cpp
+
+UIProcess/WebStorage/ios/LocalStorageDatabaseTrackerIOS.mm
 
 WebProcess/ApplePay/WebPaymentCoordinator.cpp
 
index bfcbecf..66efa58 100644 (file)
@@ -53,28 +53,28 @@ public:
     WebKit::WebsiteDataStore& websiteDataStore() { return m_websiteDataStore.get(); }
     HTTPCookieStore& httpCookieStore();
 
-    static String defaultApplicationCacheDirectory();
-    static String defaultCacheStorageDirectory();
-    static String defaultNetworkCacheDirectory();
-    static String defaultMediaCacheDirectory();
-    static String defaultIndexedDBDatabaseDirectory();
-    static String defaultServiceWorkerRegistrationDirectory();
-    static String defaultLocalStorageDirectory();
-    static String defaultMediaKeysStorageDirectory();
-    static String defaultWebSQLDatabaseDirectory();
-    static String defaultResourceLoadStatisticsDirectory();
-    static String defaultJavaScriptConfigurationDirectory();
+    static WTF::String defaultApplicationCacheDirectory();
+    static WTF::String defaultCacheStorageDirectory();
+    static WTF::String defaultNetworkCacheDirectory();
+    static WTF::String defaultMediaCacheDirectory();
+    static WTF::String defaultIndexedDBDatabaseDirectory();
+    static WTF::String defaultServiceWorkerRegistrationDirectory();
+    static WTF::String defaultLocalStorageDirectory();
+    static WTF::String defaultMediaKeysStorageDirectory();
+    static WTF::String defaultWebSQLDatabaseDirectory();
+    static WTF::String defaultResourceLoadStatisticsDirectory();
+    static WTF::String defaultJavaScriptConfigurationDirectory();
 
     static WebKit::WebsiteDataStore::Configuration defaultDataStoreConfiguration();
 
-    static String legacyDefaultApplicationCacheDirectory();
-    static String legacyDefaultNetworkCacheDirectory();
-    static String legacyDefaultLocalStorageDirectory();
-    static String legacyDefaultIndexedDBDatabaseDirectory();
-    static String legacyDefaultWebSQLDatabaseDirectory();
-    static String legacyDefaultMediaKeysStorageDirectory();
-    static String legacyDefaultMediaCacheDirectory();
-    static String legacyDefaultJavaScriptConfigurationDirectory();
+    static WTF::String legacyDefaultApplicationCacheDirectory();
+    static WTF::String legacyDefaultNetworkCacheDirectory();
+    static WTF::String legacyDefaultLocalStorageDirectory();
+    static WTF::String legacyDefaultIndexedDBDatabaseDirectory();
+    static WTF::String legacyDefaultWebSQLDatabaseDirectory();
+    static WTF::String legacyDefaultMediaKeysStorageDirectory();
+    static WTF::String legacyDefaultMediaCacheDirectory();
+    static WTF::String legacyDefaultJavaScriptConfigurationDirectory();
 
     static WebKit::WebsiteDataStore::Configuration legacyDefaultDataStoreConfiguration();
 
@@ -83,9 +83,9 @@ private:
 
     WebsiteDataStore();
 
-    static String tempDirectoryFileSystemRepresentation(const String& directoryName, ShouldCreateDirectory shouldCreateDirectory = CreateDirectory);
-    static String cacheDirectoryFileSystemRepresentation(const String& directoryName);
-    static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
+    static WTF::String tempDirectoryFileSystemRepresentation(const WTF::String& directoryName, ShouldCreateDirectory = CreateDirectory);
+    static WTF::String cacheDirectoryFileSystemRepresentation(const WTF::String& directoryName);
+    static WTF::String websiteDataDirectoryFileSystemRepresentation(const WTF::String& directoryName);
 
     Ref<WebKit::WebsiteDataStore> m_websiteDataStore;
     RefPtr<HTTPCookieStore> m_apiHTTPCookieStore;
index 825a98a..008b965 100644 (file)
@@ -6617,3 +6617,5 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(UISe
 @end
 
 #endif // WK_API_ENABLED
+
+#undef RELEASE_LOG_IF_ALLOWED
index a918c06..8478db2 100644 (file)
@@ -490,7 +490,7 @@ static NSString *defaultApplicationNameForUserAgent()
     _pageConfiguration->setURLSchemeHandlerForURLScheme(WebKit::WebURLSchemeHandlerCocoa::create(urlSchemeHandler), *canonicalScheme);
 }
 
-- (nullable id <WKURLSchemeHandler>)urlSchemeHandlerForURLScheme:(NSString *)urlScheme
+- (id <WKURLSchemeHandler>)urlSchemeHandlerForURLScheme:(NSString *)urlScheme
 {
     auto canonicalScheme = WebCore::URLParser::maybeCanonicalizeScheme(urlScheme);
     if (!canonicalScheme)
index 86c2cf6..a729fab 100644 (file)
@@ -46,9 +46,8 @@
 #define IS_ICON_SYNC_THREAD() (m_syncThread == &Thread::current())
 #define ASSERT_ICON_SYNC_THREAD() ASSERT(IS_ICON_SYNC_THREAD())
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static int databaseCleanupCounter = 0;
 
index ea8a737..c6a6b6b 100644 (file)
@@ -51,9 +51,8 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 PageClientImpl::PageClientImpl(GtkWidget* viewWidget)
     : m_viewWidget(viewWidget)
index 71919d8..224c823 100644 (file)
@@ -25,9 +25,8 @@
 #include <WebCore/Color.h>
 #include <WebCore/IntRect.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<WebKitColorChooser> WebKitColorChooser::create(WebPageProxy& page, const WebCore::Color& initialColor, const WebCore::IntRect& rect)
 {
index a3b3c71..202dd09 100644 (file)
@@ -24,9 +24,8 @@
 #include "WebKitOptionMenuPrivate.h"
 #include "WebKitWebViewPrivate.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebKitPopupMenu::WebKitPopupMenu(GtkWidget* webView, WebPopupMenuProxy::Client& client)
     : WebPopupMenuProxyGtk(webView, client)
index b266a95..28a1407 100644 (file)
@@ -30,9 +30,8 @@
 #include "WebScriptMessageHandler.h"
 #include <WebCore/URL.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 class ScriptMessageClient final : public WebScriptMessageHandler::Client {
 public:
index b878848..aad1abf 100644 (file)
@@ -41,7 +41,6 @@
 
 namespace WebKit {
 
-
 enum class ApplicationType {
     Application,
     ViewService,
index ba0f2c9..6aec754 100644 (file)
@@ -35,9 +35,8 @@
 
 WTF_DECLARE_CF_TYPE_TRAIT(SecCertificate);
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static SecCertificateRef leafCertificate(const CertificateInfo& certificateInfo)
 {
index 455f7f2..3ed825d 100644 (file)
@@ -34,9 +34,8 @@
 #include <WebCore/KeyEventCodesIOS.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 std::optional<String> WebAutomationSession::platformGetBase64EncodedPNGData(const ShareableBitmap::Handle& imageDataHandle)
 {
index 39cf660..de3a16f 100644 (file)
@@ -35,9 +35,8 @@
 #import <WebCore/NotImplemented.h>
 #import <WebCore/WebEvent.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebAutomationSession::sendSynthesizedEventsToPage(WebPageProxy& page, NSArray *eventsToSend)
 {
index 0e6523a..3c94e1a 100644 (file)
@@ -38,9 +38,8 @@
 #import <WebCore/PlatformMouseEvent.h>
 #import <objc/runtime.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #pragma mark Commands for Platform: 'macOS'
 
index 11d1665..5661af3 100644 (file)
@@ -81,9 +81,8 @@
 #import "QuickLookDocumentData.h"
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static HashMap<WebPageProxy*, NavigationState*>& navigationStates()
 {
index f4c7066..c0b80ff 100644 (file)
@@ -33,9 +33,8 @@
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #pragma mark - PlaybackSessionModelContext
 
index f343a05..71a691f 100644 (file)
@@ -38,9 +38,8 @@
 #include <WebCore/WebAudioBufferList.h>
 #include <wtf/UniqueRef.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 class UserMediaCaptureManagerProxy::SourceProxy : public RealtimeMediaSource::Observer, public SharedRingBufferStorage::Client {
 public:
index 9100afd..bdfbc80 100644 (file)
@@ -48,8 +48,6 @@
 #import <pal/spi/cocoa/AVKitSPI.h>
 #endif
 
-using namespace WebKit;
-
 @interface WKLayerHostView : PlatformView
 @property (nonatomic, assign) uint32_t contextID;
 @end
@@ -84,7 +82,7 @@ using namespace WebKit;
 #if PLATFORM(IOS)
 @interface WKVideoFullScreenViewController : UIViewController
 - (instancetype)initWithAVPlayerViewController:(AVPlayerViewController *)viewController NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithNibName:(NSString * _Nullable)nibNameOrNil bundle:(NSBundle * _Nullable)nibBundleOrNil NS_UNAVAILABLE;
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
 - (instancetype)initWithCoder:(NSCoder *)aDecoder NS_UNAVAILABLE;
 - (instancetype)init NS_UNAVAILABLE;
 @end
@@ -123,9 +121,8 @@ using namespace WebKit;
 
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #if PLATFORM(IOS) && !HAVE(AVKIT)
 
index bac287e..f97730a 100644 (file)
@@ -37,9 +37,8 @@
 #import <wtf/NeverDestroyed.h>
 #import <wtf/text/StringBuilder.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const Seconds swipeSnapshotRemovalWatchdogAfterFirstVisuallyNonEmptyLayoutDuration { 3_s };
 static const Seconds swipeSnapshotRemovalActiveLoadMonitoringInterval { 250_ms };
index b987896..6a5df4c 100644 (file)
 #import <WebKitAdditions/SystemPreviewTypes.cpp>
 #endif
 
-using namespace WebKit;
-
 @implementation WKWebViewContentProviderRegistry {
     HashMap<String, Class <WKWebViewContentProvider>, ASCIICaseInsensitiveHash> _contentProviderForMIMEType;
-    HashCountedSet<WebPageProxy*> _pages;
+    HashCountedSet<WebKit::WebPageProxy*> _pages;
 }
 
 - (instancetype)initWithConfiguration:(WKWebViewConfiguration *)configuration
@@ -68,7 +66,7 @@ using namespace WebKit;
 
 #if USE(SYSTEM_PREVIEW) && USE(APPLE_INTERNAL_SDK)
     if (configuration._systemPreviewEnabled) {
-        for (auto& mimeType : getSystemPreviewMIMETypes())
+        for (auto& mimeType : WebKit::getSystemPreviewMIMETypes())
             [self registerProvider:[WKSystemPreviewView class] forMIMEType:mimeType];
     }
 #endif
@@ -76,13 +74,13 @@ using namespace WebKit;
     return self;
 }
 
-- (void)addPage:(WebPageProxy&)page
+- (void)addPage:(WebKit::WebPageProxy&)page
 {
     ASSERT(!_pages.contains(&page));
     _pages.add(&page);
 }
 
-- (void)removePage:(WebPageProxy&)page
+- (void)removePage:(WebKit::WebPageProxy&)page
 {
     ASSERT(_pages.contains(&page));
     _pages.remove(&page);
index ecdc688..be1424a 100644 (file)
@@ -41,9 +41,8 @@
 #import <wtf/BlockPtr.h>
 #import <wtf/cf/TypeCastsCF.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #if ENABLE(DATA_DETECTION)
 void WebPageProxy::setDataDetectionResult(const DataDetectionResult& dataDetectionResult)
index 8f5a2f9..4b0544f 100644 (file)
@@ -35,9 +35,8 @@
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/URL.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebPasteboardProxy::getPasteboardTypes(const String& pasteboardName, Vector<String>& pasteboardTypes)
 {
index 049a481..0498d08 100644 (file)
@@ -60,8 +60,6 @@
 #import <QuartzCore/CARemoteLayerServer.h>
 #endif
 
-using namespace WebCore;
-
 NSString *WebServiceWorkerRegistrationDirectoryDefaultsKey = @"WebServiceWorkerRegistrationDirectory";
 NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
 NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
@@ -89,6 +87,7 @@ static NSString * const WebKitRecordReplayCacheLocationDefaultsKey = @"WebKitRec
 #endif
 
 namespace WebKit {
+using namespace WebCore;
 
 static void registerUserDefaultsIfNeeded()
 {
index 537347a..5bf3f45 100644 (file)
@@ -34,9 +34,8 @@
 #import "WebURLSchemeTask.h"
 #import <wtf/RunLoop.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<WebURLSchemeHandlerCocoa> WebURLSchemeHandlerCocoa::create(id <WKURLSchemeHandler> apiHandler)
 {
index 4e5e251..6ed86cf 100644 (file)
@@ -676,7 +676,7 @@ static const NSUInteger orderedListSegment = 2;
     return [self itemForIdentifier:identifier];
 }
 
-- (nullable NSTouchBarItem *)itemForIdentifier:(NSString *)identifier
+- (NSTouchBarItem *)itemForIdentifier:(NSString *)identifier
 {
     NSTouchBarItem *item = [super itemForIdentifier:identifier];
     BOOL isTextFormatItem = [identifier isEqualToString:NSTouchBarItemIdentifierTextFormat];
@@ -3836,12 +3836,12 @@ bool WebViewImpl::performDragOperation(id <NSDraggingInfo> draggingInfo)
         Vector<String> *fileNames = new Vector<String>;
         NSURL *dropDestination = [NSURL fileURLWithPath:dropDestinationPath isDirectory:YES];
         String pasteboardName = draggingInfo.draggingPasteboard.name;
-        [draggingInfo enumerateDraggingItemsWithOptions:0 forView:m_view.getAutoreleased() classes:@[[NSFilePromiseReceiver class]] searchOptions:@{ } usingBlock:^(NSDraggingItem * __nonnull draggingItem, NSInteger idx, BOOL * __nonnull stop) {
+        [draggingInfo enumerateDraggingItemsWithOptions:0 forView:m_view.getAutoreleased() classes:@[[NSFilePromiseReceiver class]] searchOptions:@{ } usingBlock:^(NSDraggingItem *draggingItem, NSInteger idx, BOOL *stop) {
             NSFilePromiseReceiver *item = draggingItem.item;
             NSDictionary *options = @{ };
 
             RetainPtr<NSOperationQueue> queue = adoptNS([NSOperationQueue new]);
-            [item receivePromisedFilesAtDestination:dropDestination options:options operationQueue:queue.get() reader:^(NSURL * _Nonnull fileURL, NSError * _Nullable errorOrNil) {
+            [item receivePromisedFilesAtDestination:dropDestination options:options operationQueue:queue.get() reader:^(NSURL *fileURL, NSError *errorOrNil) {
                 if (errorOrNil)
                     return;
 
index 96326eb..35508bc 100644 (file)
@@ -41,9 +41,8 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static uint64_t generateDownloadID()
 {
index a755d17..3efa1de 100644 (file)
@@ -35,9 +35,8 @@
 #include <wtf/MachSendRight.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 DrawingAreaProxy::DrawingAreaProxy(DrawingAreaType type, WebPageProxy& webPageProxy)
     : m_type(type)
index 5c0b320..bca1c92 100644 (file)
@@ -31,9 +31,8 @@
 #include "GamepadData.h"
 #include <WebCore/PlatformGamepad.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 UIGamepad::UIGamepad(WebCore::PlatformGamepad& platformGamepad)
     : m_index(platformGamepad.index())
index 90ae7d3..ecaac30 100644 (file)
@@ -36,9 +36,8 @@
 #include <WebCore/PlatformGamepad.h>
 #include <wtf/NeverDestroyed.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const Seconds maximumGamepadUpdateInterval { 1_s / 120. };
 
index ac17df8..7374aad 100644 (file)
@@ -32,9 +32,8 @@
 #include <WebCore/HIDGamepadProvider.h>
 #include <WebCore/MockGamepadProvider.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static bool useGameControllerFramework = false;
 
index 03ad160..ef3d6f6 100644 (file)
@@ -31,7 +31,6 @@
 #include <WebCore/DiagnosticLoggingKeys.h>
 
 namespace WebKit {
-
 using namespace WebCore;
 
 static const Seconds samplingInterval { 10_min };
index f8ce172..61b604d 100644 (file)
@@ -56,9 +56,8 @@
 
 #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static uint64_t generateCallbackID()
 {
@@ -647,3 +646,6 @@ void NetworkProcessProxy::sendProcessDidTransitionToBackground()
 }
 
 } // namespace WebKit
+
+#undef MESSAGE_CHECK
+#undef MESSAGE_CHECK_URL
index c85cc5a..7965868 100644 (file)
@@ -35,9 +35,8 @@
 #include "WebProcessPool.h"
 #include "WebProcessProxy.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static uint64_t generateGlobalNotificationID()
 {
index 4ef4a6f..51f7786 100644 (file)
@@ -34,7 +34,6 @@
 #include <wtf/DecimalNumber.h>
 
 namespace WebKit {
-
 using namespace WebCore;
 
 static const Seconds loggingInterval { 60_min };
index b946315..231075a 100644 (file)
@@ -36,9 +36,8 @@
 #include <wtf/ListHashSet.h>
 #include <wtf/StdLibExtras.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 PluginInfoStore::PluginInfoStore()
     : m_pluginListIsUpToDate(false)
index 7b6aa32..c2b91a6 100644 (file)
@@ -39,9 +39,8 @@
 #include <WebCore/NotImplemented.h>
 #include <wtf/RunLoop.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const Seconds minimumLifetime { 2_min };
 static const Seconds snapshottingMinimumLifetime { 30_s };
index 7be4b7f..2c3d735 100644 (file)
@@ -38,9 +38,8 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/text/CString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Vector<String> PluginInfoStore::pluginsDirectories()
 {
index 5b0d525..d435e1f 100644 (file)
@@ -56,9 +56,9 @@
 
 @end
 
+namespace WebKit {
 using namespace WebCore;
 
-namespace WebKit {
     
 void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
 {
index 7fd6ec8..4f09f6f 100644 (file)
@@ -40,9 +40,6 @@
 #import <wtf/MachSendRight.h>
 #import <wtf/SystemTracing.h>
 
-using namespace IPC;
-using namespace WebCore;
-
 // FIXME: Mac will need something similar; we should figure out how to share this with DisplayRefreshMonitor without
 // breaking WebKit1 behavior or WebKit2-WebKit1 coexistence.
 #if PLATFORM(IOS)
@@ -105,6 +102,8 @@ using namespace WebCore;
 #endif
 
 namespace WebKit {
+using namespace IPC;
+using namespace WebCore;
 
 RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy& webPageProxy)
     : DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
index 5a6406c..8ff54b2 100644 (file)
@@ -46,9 +46,8 @@
 #import <UIKit/UIView.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(m_drawingArea.isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
 
@@ -312,3 +311,5 @@ void RemoteLayerTreeHost::mapAllIOSurfaceBackingStore()
 }
 
 } // namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
index 6c9307f..85dacfe 100644 (file)
 #import <QuartzCore/CALayer.h>
 #import <WebCore/TileController.h>
 
-using namespace WebCore;
-
 namespace WebKit {
-
+using namespace WebCore;
 
 RemoteLayerTreeScrollingPerformanceData::RemoteLayerTreeScrollingPerformanceData(RemoteLayerTreeDrawingAreaProxy& drawingArea)
     : m_drawingArea(drawingArea)
index 96c58ed..8fa85ca 100644 (file)
@@ -40,9 +40,8 @@
 #include <WebCore/ScrollingStateTree.h>
 #include <WebCore/ScrollingTreeScrollingNode.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy(WebPageProxy& webPageProxy)
     : m_webPageProxy(webPageProxy)
index b9d55f8..9705d33 100644 (file)
@@ -40,9 +40,8 @@
 #include <WebCore/ScrollingTreeFrameScrollingNodeMac.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<RemoteScrollingTree> RemoteScrollingTree::create(RemoteScrollingCoordinatorProxy& scrollingCoordinator)
 {
index e2b8141..46f84d7 100644 (file)
@@ -44,9 +44,8 @@
 #import <WebCore/ScrollingTreeFrameScrollingNode.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static LayerRepresentation layerRepresentationFromLayerOrView(LayerOrView *layerOrView)
 {
index 753667f..8945c07 100644 (file)
@@ -33,9 +33,8 @@
 
 #import <WebCore/ScrollingStateOverflowScrollingNode.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<ScrollingTreeOverflowScrollingNodeIOS> ScrollingTreeOverflowScrollingNodeIOS::create(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
 {
index 4256f95..d82e582 100644 (file)
@@ -34,9 +34,8 @@
 #include "WebPageProxy.h"
 #include <WebCore/NotImplemented.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 RemoteWebInspectorProxy::RemoteWebInspectorProxy()
 {
index 7f45c76..6dfc918 100644 (file)
@@ -44,7 +44,6 @@
 #endif
 
 namespace WebKit {
-
 using namespace WebCore;
 
 constexpr unsigned statisticsModelVersion { 12 };
index 7953d13..f3cb27d 100644 (file)
@@ -39,7 +39,6 @@
 #include <WebCore/RegistrationDatabase.h>
 
 namespace WebKit {
-
 using namespace WebCore;
 
 Ref<ServiceWorkerProcessProxy> ServiceWorkerProcessProxy::create(WebProcessPool& pool, const SecurityOriginData& securityOrigin, WebsiteDataStore& store)
index eb66053..efa8d13 100644 (file)
@@ -34,9 +34,8 @@
 #include "WebsiteData.h"
 #include <WebCore/NotImplemented.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static uint64_t generateCallbackID()
 {
index 9693792..f9a5011 100644 (file)
@@ -36,9 +36,8 @@
 #include <WebCore/URL.h>
 #include <wtf/DebugUtilities.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #if !LOG_DISABLED
 static const HashSet<IPC::StringReference>& messageNamesToIgnoreWhileSuspended()
index 3babebb..fb5ddff 100644 (file)
@@ -26,9 +26,8 @@
 #include "config.h"
 #include "TextCheckerCompletion.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<TextCheckerCompletion> TextCheckerCompletion::create(uint64_t requestID, const TextCheckingRequestData& requestData, WebPageProxy* page)
 {
index 5f68f31..f990820 100644 (file)
@@ -30,9 +30,8 @@
 #include "WebProcessProxy.h"
 #include <wtf/CompletionHandler.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 UIMessagePortChannelProvider& UIMessagePortChannelProvider::singleton()
 {
index 5a78f24..d2dfc62 100644 (file)
@@ -30,9 +30,8 @@
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/SecurityOriginData.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 UserMediaPermissionCheckProxy::UserMediaPermissionCheckProxy(uint64_t userMediaID, uint64_t frameID, CompletionHandler&& handler, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin)
     : m_userMediaID(userMediaID)
index 02b2a23..185c074 100644 (file)
@@ -35,9 +35,8 @@
 #include <WebCore/SecurityOriginData.h>
 #include <WebCore/UserMediaRequest.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 #if ENABLE(MEDIA_STREAM)
 static const MediaProducer::MediaStateFlags activeCaptureMask = MediaProducer::HasActiveAudioCaptureDevice | MediaProducer::HasActiveVideoCaptureDevice;
index 674044a..f74a503 100644 (file)
@@ -27,9 +27,8 @@
 #include <WebCore/SecurityOriginData.h>
 #include <wtf/text/StringHash.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, uint64_t mainFrameID, uint64_t frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, String&& deviceIDHashSalt, WebCore::MediaStreamRequest&& request)
     : m_manager(&manager)
index b89581e..29bf944 100644 (file)
@@ -32,9 +32,8 @@
 #include "WebProcessPool.h"
 #include "WebProcessProxy.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<VisitedLinkStore> VisitedLinkStore::create()
 {
index 5ee55a5..7cda6cc 100644 (file)
@@ -32,8 +32,6 @@
 #import <WebCore/GeometryUtilities.h>
 #import <WebCore/InspectorOverlay.h>
 
-using namespace WebCore;
-
 @implementation WKInspectorHighlightView
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -73,10 +71,10 @@ using namespace WebCore;
     }
 }
 
-static bool findIntersectionOnLineBetweenPoints(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection) 
+static bool findIntersectionOnLineBetweenPoints(const WebCore::FloatPoint& p1, const WebCore::FloatPoint& p2, const WebCore::FloatPoint& d1, const WebCore::FloatPoint& d2, WebCore::FloatPoint& intersection) 
 {
     // Do the lines intersect?
-    FloatPoint temporaryIntersectionPoint;
+    WebCore::FloatPoint temporaryIntersectionPoint;
     if (!findIntersection(p1, p2, d1, d2, temporaryIntersectionPoint))
         return false;
 
@@ -102,10 +100,10 @@ static bool findIntersectionOnLineBetweenPoints(const FloatPoint& p1, const Floa
 
 // This quad intersection works because the two quads are known to be at the same
 // rotation and clockwise-ness.
-static FloatQuad quadIntersection(FloatQuad bounds, FloatQuad toClamp)
+static WebCore::FloatQuad quadIntersection(WebCore::FloatQuad bounds, WebCore::FloatQuad toClamp)
 {
     // Resulting points.
-    FloatPoint p1, p2, p3, p4;
+    WebCore::FloatPoint p1, p2, p3, p4;
     bool containsPoint1 = false;
     bool containsPoint2 = false;
     bool containsPoint3 = false;
@@ -167,10 +165,10 @@ static FloatQuad quadIntersection(FloatQuad bounds, FloatQuad toClamp)
     if (!containsPoint4 && !intersectForPoint4)
         findIntersectionOnLineBetweenPoints(bounds.p1(), bounds.p4(), p4, p3, p4);
 
-    return FloatQuad(p1, p2, p3, p4);
+    return WebCore::FloatQuad(p1, p2, p3, p4);
 }
 
-static void layerPathWithHole(CAShapeLayer *layer, const FloatQuad& outerQuad, const FloatQuad& holeQuad)
+static void layerPathWithHole(CAShapeLayer *layer, const WebCore::FloatQuad& outerQuad, const WebCore::FloatQuad& holeQuad)
 {
     // Nothing to show.
     if (outerQuad == holeQuad || holeQuad.containsQuad(outerQuad)) {
@@ -181,7 +179,7 @@ static void layerPathWithHole(CAShapeLayer *layer, const FloatQuad& outerQuad, c
     // If there is a negative margin / padding then the outer box might not
     // fully contain the hole box. In such cases we recalculate the hole to
     // be the intersection of the two quads.
-    FloatQuad innerHole;
+    WebCore::FloatQuad innerHole;
     if (outerQuad.containsQuad(holeQuad))
         innerHole = holeQuad;
     else
@@ -201,7 +199,7 @@ static void layerPathWithHole(CAShapeLayer *layer, const FloatQuad& outerQuad, c
     CGPathRelease(path);
 }
 
-static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
+static void layerPath(CAShapeLayer *layer, const WebCore::FloatQuad& outerQuad)
 {
     CGMutablePathRef path = CGPathCreateMutable();
     CGPathMoveToPoint(path, 0, outerQuad.p1().x(), outerQuad.p1().y());
@@ -212,7 +210,7 @@ static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
     CGPathRelease(path);
 }
 
-- (void)_layoutForNodeHighlight:(const Highlight&)highlight offset:(unsigned)offset
+- (void)_layoutForNodeHighlight:(const WebCore::Highlight&)highlight offset:(unsigned)offset
 {
     ASSERT([_layers count] >= offset + 4);
     ASSERT(highlight.quads.size() >= offset + 4);
@@ -224,10 +222,10 @@ static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
     CAShapeLayer *paddingLayer = [_layers objectAtIndex:offset + 2];
     CAShapeLayer *contentLayer = [_layers objectAtIndex:offset + 3];
 
-    FloatQuad marginQuad = highlight.quads[offset];
-    FloatQuad borderQuad = highlight.quads[offset + 1];
-    FloatQuad paddingQuad = highlight.quads[offset + 2];
-    FloatQuad contentQuad = highlight.quads[offset + 3];
+    WebCore::FloatQuad marginQuad = highlight.quads[offset];
+    WebCore::FloatQuad borderQuad = highlight.quads[offset + 1];
+    WebCore::FloatQuad paddingQuad = highlight.quads[offset + 2];
+    WebCore::FloatQuad contentQuad = highlight.quads[offset + 3];
 
     marginLayer.fillColor = cachedCGColor(highlight.marginColor);
     borderLayer.fillColor = cachedCGColor(highlight.borderColor);
@@ -240,7 +238,7 @@ static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
     layerPath(contentLayer, contentQuad);
 }
 
-- (void)_layoutForNodeListHighlight:(const Highlight&)highlight
+- (void)_layoutForNodeListHighlight:(const WebCore::Highlight&)highlight
 {
     if (!highlight.quads.size()) {
         [self _removeAllLayers];
@@ -254,7 +252,7 @@ static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
         [self _layoutForNodeHighlight:highlight offset:i * 4];
 }
 
-- (void)_layoutForRectsHighlight:(const Highlight&)highlight
+- (void)_layoutForRectsHighlight:(const WebCore::Highlight&)highlight
 {
     NSUInteger numLayers = highlight.quads.size();
     if (!numLayers) {
@@ -272,11 +270,11 @@ static void layerPath(CAShapeLayer *layer, const FloatQuad& outerQuad)
     }
 }
 
-- (void)update:(const Highlight&)highlight
+- (void)update:(const WebCore::Highlight&)highlight
 {
-    if (highlight.type == HighlightType::Node || highlight.type == HighlightType::NodeList)
+    if (highlight.type == WebCore::HighlightType::Node || highlight.type == WebCore::HighlightType::NodeList)
         [self _layoutForNodeListHighlight:highlight];
-    else if (highlight.type == HighlightType::Rects)
+    else if (highlight.type == WebCore::HighlightType::Rects)
         [self _layoutForRectsHighlight:highlight];
 }
 
index 063b543..6031291 100644 (file)
@@ -36,7 +36,6 @@
 #include <wtf/text/StringBuilder.h>
 
 namespace WebKit {
-
 using namespace WebCore;
 
 static const unsigned DefaultCapacity = 100;
index a80c262..115f033 100644 (file)
@@ -34,9 +34,8 @@
 #include "WebContextMenuItem.h"
 #include "WebContextMenuItemData.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebContextMenuListenerProxy::WebContextMenuListenerProxy(WebContextMenuProxy* contextMenuMac)
     : m_contextMenuMac(contextMenuMac)
index 06ff06e..6e8c9d2 100644 (file)
@@ -36,9 +36,8 @@
 #include <WebCore/Cookie.h>
 #include <WebCore/SecurityOriginData.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 const char* WebCookieManagerProxy::supplementName()
 {
index 6fbece0..dfb11d7 100644 (file)
@@ -33,9 +33,8 @@
 #include <WebCore/LocalizedStrings.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebEditCommandProxy::WebEditCommandProxy(uint64_t commandID, WebCore::EditAction editAction, WebPageProxy* page)
     : m_commandID(commandID)
index f2d9eb8..b5f520e 100644 (file)
@@ -40,9 +40,8 @@
 #include <stdio.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebFrameProxy::WebFrameProxy(WebPageProxy* page, uint64_t frameID)
     : m_page(page)
index 57cb6f8..0e5ba53 100644 (file)
@@ -37,9 +37,8 @@
 #include "WebProcessProxy.h"
 #include <WebCore/IntRect.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebFullScreenManagerProxy::WebFullScreenManagerProxy(WebPageProxy& page, WebFullScreenManagerProxyClient& client)
     : m_page(page)
index d78951e..689b4cf 100644 (file)
@@ -47,9 +47,8 @@
 #include "WebInspectorProxyClient.h"
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 const unsigned WebInspectorProxy::minimumWindowWidth = 500;
 const unsigned WebInspectorProxy::minimumWindowHeight = 400;
index 98024a4..9ffabb2 100644 (file)
@@ -30,9 +30,8 @@
 #include "WebPageProxy.h"
 #include <WebCore/ResourceRequest.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebNavigationState::WebNavigationState()
 {
index d503e6a..3a594bb 100644 (file)
@@ -32,9 +32,8 @@
 #include <WebCore/URL.h>
 #include <wtf/Vector.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebOpenPanelResultListenerProxy::WebOpenPanelResultListenerProxy(WebPageProxy* page)
     : m_page(page)
index a893575..353e7fb 100644 (file)
@@ -30,9 +30,8 @@
 #include "WebProcessPool.h"
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebPageInjectedBundleClient::didReceiveMessageFromInjectedBundle(WebPageProxy* page, const String& messageName, API::Object* messageBody)
 {
index 966537b..e072bc2 100644 (file)
 
 #define RELEASE_LOG_IF_ALLOWED(channel, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), channel, __VA_ARGS__)
 
-using namespace WebCore;
-
 // Represents the number of wheel events we can hold in the queue before we start pushing them preemptively.
 static const unsigned wheelEventQueueSizeThreshold = 10;
 
@@ -238,6 +236,7 @@ static const Seconds resetRecentCrashCountDelay = 30_s;
 static unsigned maximumWebProcessRelaunchAttempts = 1;
 
 namespace WebKit {
+using namespace WebCore;
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
 
@@ -7980,3 +7979,8 @@ void WebPageProxy::getIsViewVisible(bool& result)
 }
 
 } // namespace WebKit
+
+#undef MERGE_WHEEL_EVENTS
+#undef MESSAGE_CHECK
+#undef MESSAGE_CHECK_URL
+#undef RELEASE_LOG_IF_ALLOWED
index 965d30b..46b7680 100644 (file)
 #include <wtf/RefCountedLeakCounter.h>
 #endif
 
-using namespace WebCore;
-using namespace WebKit;
-
 namespace WebKit {
+using namespace WebCore;
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, processPoolCounter, ("WebProcessPool"));
 
index 2d7f976..4f6e3f1 100644 (file)
 #include "SecItemShimProxy.h"
 #endif
 
-using namespace WebCore;
-
 #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
 #define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(checkURLReceivedFromWebProcess(url), connection())
 
 namespace WebKit {
+using namespace WebCore;
 
 static bool isMainThreadOrCheckDisabled()
 {
@@ -1452,3 +1451,6 @@ void WebProcessProxy::releaseBackgroundActivityTokenForFullscreenInput()
 #endif
 
 } // namespace WebKit
+
+#undef MESSAGE_CHECK
+#undef MESSAGE_CHECK_URL
index c6d815f..68c67e0 100644 (file)
@@ -36,9 +36,8 @@
 #include <wtf/WorkQueue.h>
 #include <wtf/text/CString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<LocalStorageDatabaseTracker> LocalStorageDatabaseTracker::create(Ref<WorkQueue>&& queue, const String& localStorageDirectory)
 {
index dab593f..a09edd9 100644 (file)
@@ -29,9 +29,8 @@
 #include "WebPageProxy.h"
 #include "WebURLSchemeTask.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static uint64_t generateWebURLSchemeHandlerIdentifier()
 {
index f68cdc9..7773899 100644 (file)
@@ -32,9 +32,8 @@
 #include "WebPageProxy.h"
 #include "WebURLSchemeHandler.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 Ref<WebURLSchemeTask> WebURLSchemeTask::create(WebURLSchemeHandler& handler, WebPageProxy& page, uint64_t resourceIdentifier, ResourceRequest&& request, SyncLoadCompletionHandler&& syncCompletionHandler)
 {
index 1043cf4..216362c 100644 (file)
@@ -39,9 +39,8 @@
 #include <WebCore/OpenGLShims.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 std::unique_ptr<AcceleratedBackingStoreWayland> AcceleratedBackingStoreWayland::create(WebPageProxy& webPage)
 {
index b5ce80f..09eeb55 100644 (file)
@@ -42,9 +42,8 @@
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static std::optional<int> s_damageEventBase;
 static std::optional<int> s_damageErrorBase;
index f685bd1..dc50740 100644 (file)
 #import <WebCore/DragItem.h>
 #import <WebCore/Image.h>
 
-using namespace WebCore;
-using namespace WebKit;
-
 namespace WebKit {
+using namespace WebCore;
 
 static UIDragItem *dragItemMatchingIdentifier(id <UIDragSession> session, NSInteger identifier)
 {
index 96a3a86..0638652 100644 (file)
@@ -30,8 +30,6 @@
 
 #import "UIKitSPI.h"
 
-using namespace WebKit;
-
 namespace WebKit {
 
 InputViewUpdateDeferrer::InputViewUpdateDeferrer()
index 017498e..629b299 100644 (file)
 
 #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_webView->_page->process().connection())
 
-using namespace WebCore;
-using namespace WebKit;
-
 @interface WKEditCommandObjC : NSObject
 {
-    RefPtr<WebEditCommandProxy> m_command;
+    RefPtr<WebKit::WebEditCommandProxy> m_command;
 }
-- (id)initWithWebEditCommandProxy:(Ref<WebEditCommandProxy>&&)command;
-- (WebEditCommandProxy*)command;
+- (id)initWithWebEditCommandProxy:(Ref<WebKit::WebEditCommandProxy>&&)command;
+- (WebKit::WebEditCommandProxy*)command;
 @end
 
 @interface WKEditorUndoTargetObjC : NSObject
@@ -80,7 +77,7 @@ using namespace WebKit;
 
 @implementation WKEditCommandObjC
 
-- (id)initWithWebEditCommandProxy:(Ref<WebEditCommandProxy>&&)command
+- (id)initWithWebEditCommandProxy:(Ref<WebKit::WebEditCommandProxy>&&)command
 {
     self = [super init];
     if (!self)
@@ -90,7 +87,7 @@ using namespace WebKit;
     return self;
 }
 
-- (WebEditCommandProxy *)command
+- (WebKit::WebEditCommandProxy *)command
 {
     return m_command.get();
 }
@@ -114,6 +111,7 @@ using namespace WebKit;
 @end
 
 namespace WebKit {
+using namespace WebCore;
 
 PageClientImpl::PageClientImpl(WKContentView *contentView, WKWebView *webView)
     : PageClientImplCocoa(webView)
@@ -833,3 +831,5 @@ void PageClientImpl::requestPasswordForQuickLookDocument(const String& fileName,
 } // namespace WebKit
 
 #endif // PLATFORM(IOS)
+
+#undef MESSAGE_CHECK
index 5631398..b362d57 100644 (file)
@@ -44,8 +44,6 @@
 
 #pragma clang diagnostic pop
 
-using namespace WebCore;
-
 static const float smartMagnificationPanScrollThresholdZoomedOut = 60;
 static const float smartMagnificationPanScrollThresholdIPhone = 100;
 static const float smartMagnificationPanScrollThresholdIPad = 150;
@@ -55,6 +53,7 @@ static const double smartMagnificationMaximumScale = 1.6;
 static const double smartMagnificationMinimumScale = 0;
 
 namespace WebKit {
+using namespace WebCore;
 
 SmartMagnificationController::SmartMagnificationController(WKContentView *contentView)
     : m_webPageProxy(*contentView.page)
index 4002abe..50d829c 100644 (file)
@@ -36,9 +36,8 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/text/StringView.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static TextCheckerState& mutableState()
 {
index 3132c54..7b98e56 100644 (file)
@@ -46,8 +46,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/WeakObjCPtr.h>
 
-using namespace WebCore;
-
 @interface WKSwipeTransitionController : NSObject <_UINavigationInteractiveTransitionBaseDelegate>
 - (instancetype)initWithViewGestureController:(WebKit::ViewGestureController*)gestureController gestureRecognizerView:(UIView *)gestureRecognizerView;
 - (void)invalidate;
@@ -203,17 +201,17 @@ void ViewGestureController::beginSwipeGesture(_UINavigationInteractiveTransition
     RetainPtr<UIColor> backgroundColor = [UIColor whiteColor];
     if (ViewSnapshot* snapshot = targetItem->snapshot()) {
         float deviceScaleFactor = m_webPageProxy.deviceScaleFactor();
-        FloatSize swipeLayerSizeInDeviceCoordinates(liveSwipeViewFrame.size);
+        WebCore::FloatSize swipeLayerSizeInDeviceCoordinates(liveSwipeViewFrame.size);
         swipeLayerSizeInDeviceCoordinates.scale(deviceScaleFactor);
         
         BOOL shouldRestoreScrollPosition = targetItem->pageState().mainFrameState.shouldRestoreScrollPosition;
-        IntPoint currentScrollPosition = roundedIntPoint(m_webPageProxy.viewScrollPosition());
+        WebCore::IntPoint currentScrollPosition = WebCore::roundedIntPoint(m_webPageProxy.viewScrollPosition());
 
         if (snapshot->hasImage() && snapshot->size() == swipeLayerSizeInDeviceCoordinates && deviceScaleFactor == snapshot->deviceScaleFactor() && (shouldRestoreScrollPosition || (currentScrollPosition == snapshot->viewScrollPosition())))
             [m_snapshotView layer].contents = snapshot->asLayerContents();
-        Color coreColor = snapshot->backgroundColor();
+        WebCore::Color coreColor = snapshot->backgroundColor();
         if (coreColor.isValid())
-            backgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(coreColor)]);
+            backgroundColor = adoptNS([[UIColor alloc] initWithCGColor:WebCore::cachedCGColor(coreColor)]);
     }
 
     [m_snapshotView setBackgroundColor:backgroundColor.get()];
@@ -371,7 +369,7 @@ void ViewGestureController::removeSwipeSnapshot()
 
     m_swipeTransitionContext = nullptr;
 
-    m_backgroundColorForCurrentSnapshot = Color();
+    m_backgroundColorForCurrentSnapshot = WebCore::Color();
 
     didEndGesture();
 }
index 3def229..6f748b4 100644 (file)
@@ -61,8 +61,6 @@ SOFT_LINK_PRIVATE_FRAMEWORK(TCC)
 SOFT_LINK(TCC, TCCAccessPreflight, TCCAccessPreflightResult, (CFStringRef service, CFDictionaryRef options), (service, options))
 SOFT_LINK_CONSTANT(TCC, kTCCServicePhotos, CFStringRef)
 
-using namespace WebKit;
-
 #if HAVE(APP_LINKS)
 static bool applicationHasAppLinkEntitlements()
 {
@@ -396,7 +394,7 @@ static const CGFloat presentationElementRectPadding = 15;
     showImageSheetWithAlternateURLBlock(nil, nil);
 }
 
-static WKActionSheetPresentationStyle presentationStyleForView(UIView *view, const InteractionInformationAtPosition& positionInfo, _WKActivatedElementInfo *elementInfo)
+static WKActionSheetPresentationStyle presentationStyleForView(UIView *view, const WebKit::InteractionInformationAtPosition& positionInfo, _WKActivatedElementInfo *elementInfo)
 {
     auto apparentElementRect = [view convertRect:positionInfo.bounds toView:view.window];
     if (CGRectIsEmpty(apparentElementRect))
index d9a0867..ab0e16e 100644 (file)
@@ -35,7 +35,7 @@
 #import <wtf/WeakObjCPtr.h>
 
 @implementation WKApplicationStateTrackingView {
-    WeakObjCPtr<WKWebView> _webView;
+    WeakObjCPtr<WKWebView> _webViewToTrack;
     std::unique_ptr<WebKit::ApplicationStateTracker> _applicationStateTracker;
 }
 
@@ -44,7 +44,7 @@
     if (!(self = [super initWithFrame:frame]))
         return nil;
 
-    _webView = webView;
+    _webViewToTrack = webView;
     return self;
 }
 
@@ -68,7 +68,7 @@
 
 - (void)_applicationDidEnterBackground
 {
-    auto page = [_webView _page];
+    auto page = [_webViewToTrack _page];
     if (!page)
         return;
 
 
 - (void)_applicationDidFinishSnapshottingAfterEnteringBackground
 {
-    if (auto page = [_webView _page])
+    if (auto page = [_webViewToTrack _page])
         page->applicationDidFinishSnapshottingAfterEnteringBackground();
 }
 
 - (void)_applicationWillEnterForeground
 {
-    auto page = [_webView _page];
+    auto page = [_webViewToTrack _page];
     if (!page)
         return;
 
index 892dee1..88d9397 100644 (file)
@@ -53,9 +53,6 @@
 #import <WebKit/WebGeolocationCoreLocationProvider.h>
 #import <WebKit/WebAllowDenyPolicyListener.h>
 
-using namespace WebCore;
-using namespace WebKit;
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
@@ -71,21 +68,21 @@ using namespace WebKit;
 @end
 
 namespace WebKit {
-void decidePolicyForGeolocationRequestFromOrigin(SecurityOrigin*, const String& urlString, id<WebAllowDenyPolicyListener>, UIWindow*);
+void decidePolicyForGeolocationRequestFromOrigin(WebCore::SecurityOrigin*, const String& urlString, id<WebAllowDenyPolicyListener>, UIWindow*);
 };
 
 struct GeolocationRequestData {
-    RefPtr<SecurityOrigin> origin;
-    RefPtr<WebFrameProxy> frame;
+    RefPtr<WebCore::SecurityOrigin> origin;
+    RefPtr<WebKit::WebFrameProxy> frame;
     Function<void(bool)> completionHandler;
     RetainPtr<WKWebView> view;
 };
 
 @implementation WKGeolocationProviderIOS {
-    RefPtr<WebGeolocationManagerProxy> _geolocationManager;
+    RefPtr<WebKit::WebGeolocationManagerProxy> _geolocationManager;
     RetainPtr<id <_WKGeolocationCoreLocationProvider>> _coreLocationProvider;
     BOOL _isWebCoreGeolocationActive;
-    RefPtr<WebGeolocationPosition> _lastActivePosition;
+    RefPtr<WebKit::WebGeolocationPosition> _lastActivePosition;
     Vector<GeolocationRequestData> _requestsWaitingForCoreLocationAuthorization;
 }
 
@@ -112,7 +109,7 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
     [geolocationProvider _setEnableHighAccuracy:enable];
 }
 
--(void)_startUpdating
+- (void)_startUpdating
 {
     _isWebCoreGeolocationActive = YES;
     [_coreLocationProvider start];
@@ -123,33 +120,33 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
         _geolocationManager->providerDidChangePosition(_lastActivePosition.get());
 }
 
--(void)_stopUpdating
+- (void)_stopUpdating
 {
     _isWebCoreGeolocationActive = NO;
     [_coreLocationProvider stop];
     _lastActivePosition = nullptr;
 }
 
--(void)_setEnableHighAccuracy:(BOOL)enableHighAccuracy
+- (void)_setEnableHighAccuracy:(BOOL)enableHighAccuracy
 {
     [_coreLocationProvider setEnableHighAccuracy:enableHighAccuracy];
 }
 
 #pragma mark - Public API implementation.
 
--(id)init
+- (id)init
 {
     ASSERT_NOT_REACHED();
     [self release];
     return nil;
 }
 
--(id)initWithProcessPool:(WebProcessPool&)processPool
+- (id)initWithProcessPool:(WebKit::WebProcessPool&)processPool
 {
     self = [super init];
     if (!self)
         return nil;
-    _geolocationManager = processPool.supplement<WebGeolocationManagerProxy>();
+    _geolocationManager = processPool.supplement<WebKit::WebGeolocationManagerProxy>();
     WKGeolocationProviderV1 providerCallback = {
         { 1, self },
         startUpdatingCallback,
@@ -162,7 +159,7 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
     return self;
 }
 
--(void)decidePolicyForGeolocationRequestFromOrigin:(SecurityOrigin&)origin frame:(WebFrameProxy&)frame completionHandler:(Function<void(bool)>&&)completionHandler view:(WKWebView*)contentView
+- (void)decidePolicyForGeolocationRequestFromOrigin:(WebCore::SecurityOrigin&)origin frame:(WebKit::WebFrameProxy&)frame completionHandler:(Function<void(bool)>&&)completionHandler view:(WKWebView *)contentView
 {
     // Step 1: ask the user if the app can use Geolocation.
     GeolocationRequestData geolocationRequestData;
@@ -188,9 +185,9 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
 
         id<WKUIDelegatePrivate> uiDelegate = static_cast<id <WKUIDelegatePrivate>>([request.view UIDelegate]);
         if ([uiDelegate respondsToSelector:@selector(_webView:requestGeolocationAuthorizationForURL:frame:decisionHandler:)]) {
-            URL requestFrameURL(URL(), request.frame->url());
+            WebCore::URL requestFrameURL(WebCore::URL(), request.frame->url());
             RetainPtr<WKFrameInfo> frameInfo = wrapper(API::FrameInfo::create(*request.frame.get(), *request.origin.get()));
-            RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(uiDelegate, @selector(_webView:requestGeolocationAuthorizationForURL:frame:decisionHandler:));
+            RefPtr<WebKit::CompletionHandlerCallChecker> checker = WebKit::CompletionHandlerCallChecker::create(uiDelegate, @selector(_webView:requestGeolocationAuthorizationForURL:frame:decisionHandler:));
             WKWebView *viewFromRequest = request.view.get();
             [uiDelegate _webView:viewFromRequest requestGeolocationAuthorizationForURL:requestFrameURL frame:frameInfo.get() decisionHandler:BlockPtr<void(BOOL)>::fromCallable([request = WTFMove(request), checker = WTFMove(checker)](BOOL authorized) {
                 if (checker->completionHandlerHasBeenCalled())
@@ -202,10 +199,10 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
         }
 
         if ([uiDelegate respondsToSelector:@selector(_webView:shouldRequestGeolocationAuthorizationForURL:isMainFrame:mainFrameURL:)]) {
-            const WebFrameProxy* mainFrame = request.frame->page()->mainFrame();
+            const WebKit::WebFrameProxy* mainFrame = request.frame->page()->mainFrame();
             bool isMainFrame = request.frame == mainFrame;
-            URL requestFrameURL(URL(), request.frame->url());
-            URL mainFrameURL(URL(), mainFrame->url());
+            WebCore::URL requestFrameURL(WebCore::URL(), request.frame->url());
+            WebCore::URL mainFrameURL(WebCore::URL(), mainFrame->url());
             requiresUserAuthorization = [uiDelegate _webView:request.view.get()
                  shouldRequestGeolocationAuthorizationForURL:requestFrameURL
                                                  isMainFrame:isMainFrame
@@ -214,7 +211,7 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
 
         if (requiresUserAuthorization) {
             RetainPtr<WKWebAllowDenyPolicyListener> policyListener = adoptNS([[WKWebAllowDenyPolicyListener alloc] initWithCompletionHandler:WTFMove(request.completionHandler)]);
-            decidePolicyForGeolocationRequestFromOrigin(request.origin.get(), request.frame->url(), policyListener.get(), [request.view window]);
+            WebKit::decidePolicyForGeolocationRequestFromOrigin(request.origin.get(), request.frame->url(), policyListener.get(), [request.view window]);
         } else
             request.completionHandler(true);
     }
@@ -302,7 +299,7 @@ static void setEnableHighAccuracy(WKGeolocationManagerRef geolocationManager, bo
 - (void)positionChanged:(WebCore::GeolocationPosition&&)corePosition
 {
     ASSERT(_listener);
-    auto position = WebGeolocationPosition::create(WTFMove(corePosition));
+    auto position = WebKit::WebGeolocationPosition::create(WTFMove(corePosition));
     [_listener positionChanged:wrapper(position.get())];
 }
 
index 960a85a..f779707 100644 (file)
@@ -35,8 +35,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/RetainPtr.h>
 
-using namespace WebKit;
-
 namespace WebKit {
 
 enum class KeyboardScrollingAnimatorState : uint8_t {
@@ -52,7 +50,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
     CFTimeInterval _startTime;
     WebCore::FloatPoint _scrollOffsetPerIncrement;
     RetainPtr<CADisplayLink> _displayLink;
-    KeyboardScrollingAnimatorState _state;
+    WebKit::KeyboardScrollingAnimatorState _state;
 }
 
 - (instancetype)init
@@ -120,21 +118,21 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
         switch (key) {
         case Key::LeftArrow:
         case Key::RightArrow:
-            return ScrollingIncrement::Line;
+            return WebKit::ScrollingIncrement::Line;
         case Key::UpArrow:
         case Key::DownArrow:
             if (altPressed)
-                return ScrollingIncrement::Page;
+                return WebKit::ScrollingIncrement::Page;
             if (cmdPressed)
-                return ScrollingIncrement::Document;
-            return ScrollingIncrement::Line;
+                return WebKit::ScrollingIncrement::Document;
+            return WebKit::ScrollingIncrement::Line;
         case Key::PageUp:
         case Key::PageDown:
         case Key::Space:
-            return ScrollingIncrement::Page;
+            return WebKit::ScrollingIncrement::Page;
         case Key::Other:
             ASSERT_NOT_REACHED();
-            return ScrollingIncrement::Line;
+            return WebKit::ScrollingIncrement::Line;
         };
     }();
 
@@ -169,7 +167,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
 
 - (BOOL)beginWithEvent:(::WebEvent *)event
 {
-    if (_state != KeyboardScrollingAnimatorState::WaitingForFirstEvent)
+    if (_state != WebKit::KeyboardScrollingAnimatorState::WaitingForFirstEvent)
         return NO;
     
     if (event.type != WebEventKeyDown)
@@ -179,7 +177,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
     if (!offset)
         return NO;
 
-    _state = KeyboardScrollingAnimatorState::WaitingForRepeat;
+    _state = WebKit::KeyboardScrollingAnimatorState::WaitingForRepeat;
     _scrollOffsetPerIncrement = offset.value();
 
     // The first keyboard event that starts scrolling performs its own
@@ -192,7 +190,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
 
 - (BOOL)handleKeyEvent:(::WebEvent *)event
 {
-    if (_state == KeyboardScrollingAnimatorState::WaitingForFirstEvent)
+    if (_state == WebKit::KeyboardScrollingAnimatorState::WaitingForFirstEvent)
         return NO;
 
     auto offset = [self _scrollOffsetForEvent:event];
@@ -201,7 +199,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
         return NO;
     }
 
-    if (_state == KeyboardScrollingAnimatorState::WaitingForRepeat)
+    if (_state == WebKit::KeyboardScrollingAnimatorState::WaitingForRepeat)
         [self startAnimatedScroll];
 
     return YES;
@@ -211,7 +209,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
 {
     ASSERT(!_displayLink);
 
-    _state = KeyboardScrollingAnimatorState::Animating;
+    _state = WebKit::KeyboardScrollingAnimatorState::Animating;
     _startTime = CACurrentMediaTime();
     _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkFired:)];
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
@@ -219,7 +217,7 @@ enum class KeyboardScrollingAnimatorState : uint8_t {
 
 - (void)stopAnimatedScroll
 {
-    _state = KeyboardScrollingAnimatorState::WaitingForFirstEvent;
+    _state = WebKit::KeyboardScrollingAnimatorState::WaitingForFirstEvent;
     [_displayLink invalidate];
     _displayLink = nil;
 }
index 39e6458..0b5d9d6 100644 (file)
@@ -54,9 +54,6 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
-using namespace WebCore;
-using namespace WebKit;
-
 const CGFloat pdfPageMargin = 8;
 const CGFloat pdfMinimumZoomScale = 1;
 const CGFloat pdfMaximumZoomScale = 5;
@@ -730,7 +727,7 @@ static NSStringCompareOptions stringCompareOptions(_WKFindOptions options)
     RetainPtr<WKWebView> retainedWebView = _webView;
 
     [self _highlightLinkAnnotation:linkAnnotation forDuration:.2 completionHandler:^{
-        retainedWebView->_page->navigateToPDFLinkWithSimulatedClick([url absoluteString], roundedIntPoint(documentPoint), roundedIntPoint(screenPoint));
+        retainedWebView->_page->navigateToPDFLinkWithSimulatedClick([url absoluteString], WebCore::roundedIntPoint(documentPoint), WebCore::roundedIntPoint(screenPoint));
     }];
 }
 
@@ -744,10 +741,10 @@ static NSStringCompareOptions stringCompareOptions(_WKFindOptions options)
     if (!url)
         return;
 
-    _positionInformation.request.point = roundedIntPoint([controller.pageView convertPoint:point toView:self]);
+    _positionInformation.request.point = WebCore::roundedIntPoint([controller.pageView convertPoint:point toView:self]);
 
     _positionInformation.url = url;
-    _positionInformation.bounds = roundedIntRect([self convertRect:[controller.pageView convertRectFromPDFPageSpace:annotation.Rect] fromView:controller.pageView]);
+    _positionInformation.bounds = WebCore::roundedIntRect([self convertRect:[controller.pageView convertRectFromPDFPageSpace:annotation.Rect] fromView:controller.pageView]);
 
     [self _highlightLinkAnnotation:linkAnnotation forDuration:.75 completionHandler:^{
         [_actionSheetAssistant showLinkSheet];
@@ -777,13 +774,13 @@ static NSStringCompareOptions stringCompareOptions(_WKFindOptions options)
 - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant openElementAtLocation:(CGPoint)location
 {
     CGPoint screenPoint = [self.window convertPoint:[self convertPoint:location toView:nil] toWindow:nil];
-    _webView->_page->navigateToPDFLinkWithSimulatedClick(_positionInformation.url, roundedIntPoint(location), roundedIntPoint(screenPoint));
+    _webView->_page->navigateToPDFLinkWithSimulatedClick(_positionInformation.url, WebCore::roundedIntPoint(location), WebCore::roundedIntPoint(screenPoint));
 }
 
 - (void)actionSheetAssistant:(WKActionSheetAssistant *)assistant shareElementWithURL:(NSURL *)url rect:(CGRect)boundingRect
 {
     _webSelectionAssistant = adoptNS([[UIWKSelectionAssistant alloc] initWithView:self]);
-    [_webSelectionAssistant showShareSheetFor:userVisibleString(url) fromRect:boundingRect];
+    [_webSelectionAssistant showShareSheetFor:WebCore::userVisibleString(url) fromRect:boundingRect];
     _webSelectionAssistant = nil;
 }
 
index f19741c..dff4c6c 100644 (file)
     _data = adoptNS([data copy]);
     _suggestedFilename = adoptNS([filename copy]);
 
-    [PDFHostViewController createHostView:[self, weakSelf = WeakObjCPtr<WKPDFView>(self)](PDFHostViewController * _Nullable hostViewController) {
+    [PDFHostViewController createHostView:[self, weakSelf = WeakObjCPtr<WKPDFView>(self)](PDFHostViewController *hostViewController) {
         ASSERT(isMainThread());
 
         WKPDFView *autoreleasedSelf = weakSelf.getAutoreleased();
index 8cef69d..16fc430 100644 (file)
@@ -38,8 +38,6 @@
 #import <PepperUICore/UIScrollView+PUICAdditionsPrivate.h>
 #endif
 
-using namespace WebKit;
-
 @interface WKScrollViewDelegateForwarder : NSObject <UIScrollViewDelegate>
 
 - (instancetype)initWithInternalDelegate:(WKWebView *)internalDelegate externalDelegate:(id <UIScrollViewDelegate>)externalDelegate;
@@ -350,7 +348,7 @@ static inline bool valuesAreWithinOnePixel(CGFloat a, CGFloat b)
     // to include keyboard insets in the systemContentInset. We always want
     // keyboard insets applied, even when web content has chosen to disable automatic
     // safe area inset adjustment.
-    if (linkedOnOrAfter(SDKVersion::FirstWhereUIScrollViewDoesNotApplyKeyboardInsetsUnconditionally) && self.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentNever)
+    if (linkedOnOrAfter(WebKit::SDKVersion::FirstWhereUIScrollViewDoesNotApplyKeyboardInsetsUnconditionally) && self.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentNever)
         systemContentInset.bottom += _keyboardBottomInsetAdjustment;
 
     return systemContentInset;
index 88a7782..94d6264 100644 (file)
@@ -45,9 +45,6 @@
 #import <WebKitAdditions/SystemPreviewTypes.cpp>
 #endif
 
-using namespace WebCore;
-using namespace WebKit;
-
 SOFT_LINK_FRAMEWORK(QuickLook);
 SOFT_LINK_CLASS(QuickLook, QLItem);
 
index 2fb74c3..c12754c 100644 (file)
@@ -61,9 +61,8 @@
 #import <wtf/text/WTFString.h>
 #endif
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebPageProxy::platformInitialize()
 {
index 1766d35..fe4e846 100644 (file)
 #import "WebPageProxy.h"
 #import "WebViewImpl.h"
 
-using namespace WebCore;
-
-static inline NSCorrectionIndicatorType correctionIndicatorType(AlternativeTextType alternativeTextType)
+static inline NSCorrectionIndicatorType correctionIndicatorType(WebCore::AlternativeTextType alternativeTextType)
 {
     switch (alternativeTextType) {
-    case AlternativeTextTypeCorrection:
+    case WebCore::AlternativeTextTypeCorrection:
         return NSCorrectionIndicatorTypeDefault;
-    case AlternativeTextTypeReversion:
+    case WebCore::AlternativeTextTypeReversion:
         return NSCorrectionIndicatorTypeReversion;
-    case AlternativeTextTypeSpellingSuggestions:
+    case WebCore::AlternativeTextTypeSpellingSuggestions:
         return NSCorrectionIndicatorTypeGuesses;
-    case AlternativeTextTypeDictationAlternatives:
+    case WebCore::AlternativeTextTypeDictationAlternatives:
         ASSERT_NOT_REACHED();
         break;
     }
@@ -51,6 +49,7 @@ static inline NSCorrectionIndicatorType correctionIndicatorType(AlternativeTextT
 }
 
 namespace WebKit {
+using namespace WebCore;
 
 CorrectionPanel::CorrectionPanel()
     : m_wasDismissedExternally(false)
index 0857f14..a0bc9eb 100644 (file)
 @end
 #endif
 
-using namespace WebCore;
-using namespace WebKit;
-
 namespace WebKit {
+using namespace WebCore;
 
 PageClientImpl::PageClientImpl(NSView* view, WKWebView *webView)
     : PageClientImplCocoa(webView)
index 6f2a8d5..9422e01 100644 (file)
 #import "WebPageProxy.h"
 #import <wtf/text/Base64.h>
 
-using namespace WebKit;
-
 @interface WKRemoteWebInspectorProxyObjCAdapter : NSObject <WKInspectorViewControllerDelegate> {
-    RemoteWebInspectorProxy* _inspectorProxy;
+    WebKit::RemoteWebInspectorProxy* _inspectorProxy;
 }
-- (instancetype)initWithRemoteWebInspectorProxy:(RemoteWebInspectorProxy*)inspectorProxy;
+- (instancetype)initWithRemoteWebInspectorProxy:(WebKit::RemoteWebInspectorProxy*)inspectorProxy;
 @end
 
 @implementation WKRemoteWebInspectorProxyObjCAdapter
 
-- (instancetype)initWithRemoteWebInspectorProxy:(RemoteWebInspectorProxy*)inspectorProxy
+- (instancetype)initWithRemoteWebInspectorProxy:(WebKit::RemoteWebInspectorProxy*)inspectorProxy
 {
     if (!(self = [super init]))
         return nil;
index 2f7b477..70c332e 100644 (file)
@@ -52,9 +52,8 @@ static NSString* const WebAutomaticTextReplacementEnabled = @"WebAutomaticTextRe
 
 static NSString* const WebTextCheckingSuppressInitialCapitalizationKey = @"SuppressInitialCapitalization";
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 TextCheckerState textCheckerState;
 
index c54da84..eb6bdbf 100644 (file)
 #import <wtf/BlockPtr.h>
 #import <wtf/MachSendRight.h>
 
+namespace WebKit {
 using namespace IPC;
 using namespace WebCore;
 
-namespace WebKit {
-
 TiledCoreAnimationDrawingAreaProxy::TiledCoreAnimationDrawingAreaProxy(WebPageProxy& webPageProxy)
     : DrawingAreaProxy(DrawingAreaTypeTiledCoreAnimation, webPageProxy)
     , m_isWaitingForDidUpdateGeometry(false)
index 4b533ab..28bc4e8 100644 (file)
@@ -49,8 +49,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <pal/spi/mac/NSEventSPI.h>
 
-using namespace WebCore;
-
 static const double minMagnification = 1;
 static const double maxMagnification = 3;
 
@@ -86,6 +84,7 @@ static const float swipeSnapshotRemovalRenderTreeSizeTargetFraction = 0.5;
 @end
 
 namespace WebKit {
+using namespace WebCore;
 
 void ViewGestureController::platformTeardown()
 {
index 8e9f424..9f7c16b 100644 (file)
@@ -35,8 +35,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #endif
 
-using namespace WebCore;
-
 #if PLATFORM(IOS)
 static const size_t maximumSnapshotCacheSize = 50 * (1024 * 1024);
 #else
@@ -44,6 +42,7 @@ static const size_t maximumSnapshotCacheSize = 400 * (1024 * 1024);
 #endif
 
 namespace WebKit {
+using namespace WebCore;
 
 ViewSnapshotStore::ViewSnapshotStore()
 {
index 61d67ad..03ff73f 100644 (file)
 NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange";
 const CFStringRef AppleKeyboardUIMode = CFSTR("AppleKeyboardUIMode");
 
-using namespace WebKit;
-
 @implementation WKFullKeyboardAccessWatcher
 
 - (void)notifyAllProcessPools
 {
-    for (auto* processPool : WebProcessPool::allProcessPools())
+    for (auto* processPool : WebKit::WebProcessPool::allProcessPools())
         processPool->fullKeyboardAccessModeChanged(fullKeyboardAccessEnabled);
 }
 
index 47251d8..5a6bfc3 100644 (file)
 #import <pal/system/SleepDisabler.h>
 #import <wtf/BlockObjCExceptions.h>
 
-using namespace WebCore;
-
 static const NSTimeInterval DefaultWatchdogTimerInterval = 1;
 
 namespace WebKit {
 
-class WKFullScreenWindowControllerVideoFullscreenModelClient : VideoFullscreenModelClient {
+class WKFullScreenWindowControllerVideoFullscreenModelClient : WebCore::VideoFullscreenModelClient {
 public:
     void setParent(WKFullScreenWindowController *parent) { m_parent = parent; }
 
-    void setInterface(VideoFullscreenInterfaceMac* interface)
+    void setInterface(WebCore::VideoFullscreenInterfaceMac* interface)
     {
         if (m_interface == interface)
             return;
@@ -70,7 +68,7 @@ public:
             m_interface->videoFullscreenModel()->addClient(*this);
     }
 
-    VideoFullscreenInterfaceMac* interface() const { return m_interface.get(); }
+    WebCore::VideoFullscreenInterfaceMac* interface() const { return m_interface.get(); }
 
     void didEnterPictureInPicture() final
     {
@@ -79,13 +77,11 @@ public:
 
 private:
     WKFullScreenWindowController *m_parent { nullptr };
-    RefPtr<VideoFullscreenInterfaceMac> m_interface;
+    RefPtr<WebCore::VideoFullscreenInterfaceMac> m_interface;
 };
 
 }
 
-using namespace WebKit;
-
 enum FullScreenState : NSInteger {
     NotInFullScreen,
     WaitingToEnterFullScreen,
@@ -101,8 +97,8 @@ enum FullScreenState : NSInteger {
 @end
 
 @interface WKFullScreenWindowController (Private) <NSAnimationDelegate>
-- (void)_replaceView:(NSView*)view with:(NSView*)otherView;
-- (WebFullScreenManagerProxy*)_manager;
+- (void)_replaceView:(NSView *)view with:(NSView *)otherView;
+- (WebKit::WebFullScreenManagerProxy *)_manager;
 - (void)_startEnterFullScreenAnimationWithDuration:(NSTimeInterval)duration;
 - (void)_startExitFullScreenAnimationWithDuration:(NSTimeInterval)duration;
 @end
@@ -122,7 +118,7 @@ static void makeResponderFirstResponderIfDescendantOfView(NSWindow *window, NSRe
 
 #pragma mark -
 #pragma mark Initialization
-- (id)initWithWindow:(NSWindow *)window webView:(NSView *)webView page:(WebPageProxy&)page
+- (id)initWithWindow:(NSWindow *)window webView:(NSView *)webView page:(WebKit::WebPageProxy&)page
 {
     self = [super initWithWindow:window];
     if (!self)
@@ -150,7 +146,7 @@ static void makeResponderFirstResponderIfDescendantOfView(NSWindow *window, NSRe
     _webView = webView;
     _page = &page;
 
-    _videoFullscreenClient = std::make_unique<WKFullScreenWindowControllerVideoFullscreenModelClient>();
+    _videoFullscreenClient = std::make_unique<WebKit::WKFullScreenWindowControllerVideoFullscreenModelClient>();
     _videoFullscreenClient->setParent(self);
 
     [self videoControlsManagerDidChange];
@@ -301,7 +297,7 @@ static RetainPtr<CGImageRef> createImageWithCopiedData(CGImageRef sourceImage)
     _webView.frame = NSInsetRect(contentView.bounds, 0, -_page->topContentInset());
 
     _savedScale = _page->pageScaleFactor();
-    _page->scalePage(1, IntPoint());
+    _page->scalePage(1, WebCore::IntPoint());
     [self _manager]->setAnimatingFullScreen(true);
     [self _manager]->willEnterFullScreen();
 }
@@ -366,7 +362,7 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
         makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
         [[_webView window] makeKeyAndOrderFront:self];
 
-        _page->scalePage(_savedScale, IntPoint());
+        _page->scalePage(_savedScale, WebCore::IntPoint());
         [self _manager]->restoreScrollPosition();
         _page->setTopContentInset(_savedTopContentInset);
         [self _manager]->didExitFullScreen();
@@ -494,7 +490,7 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
     // These messages must be sent after the swap or flashing will occur during forceRepaint:
     [self _manager]->didExitFullScreen();
     [self _manager]->setAnimatingFullScreen(false);
-    _page->scalePage(_savedScale, IntPoint());
+    _page->scalePage(_savedScale, WebCore::IntPoint());
     [self _manager]->restoreScrollPosition();
     _page->setTopContentInset(_savedTopContentInset);
 
@@ -504,7 +500,7 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
         // clears _repaintCallback.
         ASSERT(!_repaintCallback);
     }
-    _repaintCallback = VoidCallback::create([self](WebKit::CallbackBase::Error) {
+    _repaintCallback = WebKit::VoidCallback::create([self](WebKit::CallbackBase::Error) {
         [self completeFinishExitFullScreenAnimationAfterRepaint];
     });
     _page->forceRepaint(_repaintCallback.copyRef());
@@ -589,7 +585,7 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
     [self finishedEnterFullScreenAnimation:NO];
 }
 
-- (void)windowDidEnterFullScreen:(NSNotification*)notification
+- (void)windowDidEnterFullScreen:(NSNotification *)notification
 {
     [self finishedEnterFullScreenAnimation:YES];
 }
@@ -599,7 +595,7 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
     [self finishedExitFullScreenAnimation:NO];
 }
 
-- (void)windowDidExitFullScreen:(NSNotification*)notification
+- (void)windowDidExitFullScreen:(NSNotification *)notification
 {
     [self finishedExitFullScreenAnimation:YES];
 }
@@ -612,14 +608,14 @@ static const float minVideoWidth = 480 + 20 + 20; // Note: Keep in sync with med
 #pragma mark -
 #pragma mark Internal Interface
 
-- (WebFullScreenManagerProxy*)_manager
+- (WebKit::WebFullScreenManagerProxy*)_manager
 {
     if (!_page)
         return nullptr;
     return _page->fullScreenManager();
 }
 
-- (void)_replaceView:(NSView*)view with:(NSView*)otherView
+- (void)_replaceView:(NSView *)view with:(NSView *)otherView
 {
     [CATransaction begin];
     [CATransaction setDisableActions:YES];
@@ -639,10 +635,10 @@ static CAMediaTimingFunction *timingFunctionForDuration(CFTimeInterval duration)
 }
 
 enum AnimationDirection { AnimateIn, AnimateOut };
-static CAAnimation *zoomAnimation(const FloatRect& initialFrame, const FloatRect& finalFrame, const FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
+static CAAnimation *zoomAnimation(const WebCore::FloatRect& initialFrame, const WebCore::FloatRect& finalFrame, const WebCore::FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
 {
     CABasicAnimation *scaleAnimation = [CABasicAnimation animationWithKeyPath:@"transform"];
-    FloatRect scaleRect = smallestRectWithAspectRatioAroundRect(finalFrame.size().aspectRatio(), initialFrame);
+    WebCore::FloatRect scaleRect = smallestRectWithAspectRatioAroundRect(finalFrame.size().aspectRatio(), initialFrame);
     CGAffineTransform resetOriginTransform = CGAffineTransformMakeTranslation(screenFrame.x() - finalFrame.x(), screenFrame.y() - finalFrame.y());
     CGAffineTransform scaleTransform = CGAffineTransformMakeScale(scaleRect.width() / finalFrame.width(), scaleRect.height() / finalFrame.height());
     CGAffineTransform translateTransform = CGAffineTransformMakeTranslation(scaleRect.x() - screenFrame.x(), scaleRect.y() - screenFrame.y());
@@ -661,7 +657,7 @@ static CAAnimation *zoomAnimation(const FloatRect& initialFrame, const FloatRect
     return scaleAnimation;
 }
 
-static CALayer *createMask(const FloatRect& bounds)
+static CALayer *createMask(const WebCore::FloatRect& bounds)
 {
     CALayer *maskLayer = [CALayer layer];
     maskLayer.anchorPoint = CGPointZero;
@@ -671,18 +667,18 @@ static CALayer *createMask(const FloatRect& bounds)
     return maskLayer;
 }
 
-static CAAnimation *maskAnimation(const FloatRect& initialFrame, const FloatRect& finalFrame, const FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
+static CAAnimation *maskAnimation(const WebCore::FloatRect& initialFrame, const WebCore::FloatRect& finalFrame, const WebCore::FloatRect& screenFrame, CFTimeInterval duration, AnimationDirection direction)
 {
     CABasicAnimation *boundsAnimation = [CABasicAnimation animationWithKeyPath:@"bounds"];
-    FloatRect boundsRect = largestRectWithAspectRatioInsideRect(initialFrame.size().aspectRatio(), finalFrame);
-    NSValue *boundsValue = [NSValue valueWithRect:FloatRect(FloatPoint(), boundsRect.size())];
+    WebCore::FloatRect boundsRect = largestRectWithAspectRatioInsideRect(initialFrame.size().aspectRatio(), finalFrame);
+    NSValue *boundsValue = [NSValue valueWithRect:WebCore::FloatRect(WebCore::FloatPoint(), boundsRect.size())];
     if (direction == AnimateIn)
         boundsAnimation.fromValue = boundsValue;
     else
         boundsAnimation.toValue = boundsValue;
 
     CABasicAnimation *positionAnimation = [CABasicAnimation animationWithKeyPath:@"position"];
-    NSValue *positionValue = [NSValue valueWithPoint:FloatPoint(boundsRect.location() - screenFrame.location())];
+    NSValue *positionValue = [NSValue valueWithPoint:WebCore::FloatPoint(boundsRect.location() - screenFrame.location())];
     if (direction == AnimateIn)
         positionAnimation.fromValue = positionValue;
     else
index 8e467d6..8ceadc1 100644 (file)
@@ -49,9 +49,6 @@
 SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, QuickLookUI)
 SOFT_LINK_CLASS(QuickLookUI, QLPreviewMenuItem)
 
-using namespace WebCore;
-using namespace WebKit;
-
 @interface WKImmediateActionController () <QLPreviewMenuItemDelegate>
 @end
 
@@ -63,7 +60,7 @@ using namespace WebKit;
 
 @implementation WKImmediateActionController
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)viewImpl recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)viewImpl recognizer:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
 {
     self = [super init];
 
@@ -85,7 +82,7 @@ using namespace WebKit;
     _page = nullptr;
     _view = nil;
     _viewImpl = nullptr;
-    _hitTestResultData = WebHitTestResultData();
+    _hitTestResultData = WebKit::WebHitTestResultData();
     _contentPreventsDefault = NO;
     
     id animationController = [_immediateActionRecognizer animationController];
@@ -125,8 +122,8 @@ using namespace WebKit;
             [getDDActionsManagerClass() didUseActions];
     }
 
-    _state = ImmediateActionState::None;
-    _hitTestResultData = WebHitTestResultData();
+    _state = WebKit::ImmediateActionState::None;
+    _hitTestResultData = WebKit::WebHitTestResultData();
     _contentPreventsDefault = NO;
     _type = kWKImmediateActionNone;
     _currentActionContext = nil;
@@ -135,15 +132,15 @@ using namespace WebKit;
     _hasActiveImmediateAction = NO;
 }
 
-- (void)didPerformImmediateActionHitTest:(const WebHitTestResultData&)hitTestResult contentPreventsDefault:(BOOL)contentPreventsDefault userData:(API::Object*)userData
+- (void)didPerformImmediateActionHitTest:(const WebKit::WebHitTestResultData&)hitTestResult contentPreventsDefault:(BOOL)contentPreventsDefault userData:(API::Object*)userData
 {
     // If we've already given up on this gesture (either because it was canceled or the
     // willBeginAnimation timeout expired), we shouldn't build a new animationController for it.
-    if (_state != ImmediateActionState::Pending)
+    if (_state != WebKit::ImmediateActionState::Pending)
         return;
 
     // FIXME: This needs to use the WebKit2 callback mechanism to avoid out-of-order replies.
-    _state = ImmediateActionState::Ready;
+    _state = WebKit::ImmediateActionState::Ready;
     _hitTestResultData = hitTestResult;
     _contentPreventsDefault = contentPreventsDefault;
     _userData = userData;
@@ -176,7 +173,7 @@ using namespace WebKit;
 
     _page->setMaintainsInactiveSelection(true);
 
-    _state = ImmediateActionState::Pending;
+    _state = WebKit::ImmediateActionState::Pending;
     immediateActionRecognizer.animationController = nil;
 
     _page->performImmediateActionHitTestAtLocation([immediateActionRecognizer locationInView:immediateActionRecognizer.view]);
@@ -187,22 +184,22 @@ using namespace WebKit;
     if (immediateActionRecognizer != _immediateActionRecognizer)
         return;
 
-    if (_state == ImmediateActionState::None)
+    if (_state == WebKit::ImmediateActionState::None)
         return;
 
     _hasActiveImmediateAction = YES;
 
     // FIXME: We need to be able to cancel this if the gesture recognizer is cancelled.
     // FIXME: Connection can be null if the process is closed; we should clean up better in that case.
-    if (_state == ImmediateActionState::Pending) {
+    if (_state == WebKit::ImmediateActionState::Pending) {
         if (auto* connection = _page->process().connection()) {
             bool receivedReply = connection->waitForAndDispatchImmediately<Messages::WebPageProxy::DidPerformImmediateActionHitTest>(_page->pageID(), Seconds::fromMilliseconds(500));
             if (!receivedReply)
-                _state = ImmediateActionState::TimedOut;
+                _state = WebKit::ImmediateActionState::TimedOut;
         }
     }
 
-    if (_state != ImmediateActionState::Ready) {
+    if (_state != WebKit::ImmediateActionState::Ready) {
         [self _updateImmediateActionItem];
         [self _cancelImmediateActionIfNeeded];
     }
@@ -257,7 +254,7 @@ using namespace WebKit;
 - (RefPtr<API::HitTestResult>)_webHitTestResult
 {
     RefPtr<API::HitTestResult> hitTestResult;
-    if (_state == ImmediateActionState::Ready)
+    if (_state == WebKit::ImmediateActionState::Ready)
         hitTestResult = API::HitTestResult::create(_hitTestResultData);
     else
         hitTestResult = _page->lastMouseMoveHitTestResult();
@@ -279,12 +276,12 @@ using namespace WebKit;
 
     String absoluteLinkURL = hitTestResult->absoluteLinkURL();
     if (!absoluteLinkURL.isEmpty()) {
-        if (protocolIs(absoluteLinkURL, "mailto")) {
+        if (WebCore::protocolIs(absoluteLinkURL, "mailto")) {
             _type = kWKImmediateActionMailtoLink;
             return [self _animationControllerForDataDetectedLink];
         }
 
-        if (protocolIs(absoluteLinkURL, "tel")) {
+        if (WebCore::protocolIs(absoluteLinkURL, "tel")) {
             _type = kWKImmediateActionTelLink;
             return [self _animationControllerForDataDetectedLink];
         }
@@ -297,7 +294,7 @@ using namespace WebKit;
             item.delegate = self;
             _currentQLPreviewMenuItem = item;
 
-            if (TextIndicator *textIndicator = _hitTestResultData.linkTextIndicator.get())
+            if (auto textIndicator = _hitTestResultData.linkTextIndicator.get())
                 _page->setTextIndicator(textIndicator->data());
 
             return (id<NSImmediateActionAnimationController>)item;
@@ -384,7 +381,7 @@ using namespace WebKit;
         return NSZeroSize;
 
     NSSize screenSize = _view.window.screen.frame.size;
-    FloatRect largestRect = largestRectWithAspectRatioInsideRect(screenSize.width / screenSize.height, _view.bounds);
+    WebCore::FloatRect largestRect = WebCore::largestRectWithAspectRatioInsideRect(screenSize.width / screenSize.height, _view.bounds);
     return NSMakeSize(largestRect.width() * 0.75, largestRect.height() * 0.75);
 }
 
@@ -404,8 +401,8 @@ using namespace WebKit;
     if (![[getDDActionsManagerClass() sharedManager] hasActionsForResult:actionContext.mainResult actionContext:actionContext])
         return nil;
 
-    RefPtr<WebPageProxy> page = _page;
-    PageOverlay::PageOverlayID overlayID = _hitTestResultData.detectedDataOriginatingPageOverlay;
+    RefPtr<WebKit::WebPageProxy> page = _page;
+    WebCore::PageOverlay::PageOverlayID overlayID = _hitTestResultData.detectedDataOriginatingPageOverlay;
     _currentActionContext = [actionContext contextForView:_view altMode:YES interactionStartedHandler:^() {
         page->send(Messages::WebPage::DataDetectorsDidPresentUI(overlayID));
     } interactionChangedHandler:^() {
@@ -440,7 +437,7 @@ using namespace WebKit;
     [actionContext setAltMode:YES];
     [actionContext setImmediate:YES];
 
-    RefPtr<WebPageProxy> page = _page;
+    RefPtr<WebKit::WebPageProxy> page = _page;
     _currentActionContext = [actionContext contextForView:_view altMode:YES interactionStartedHandler:^() {
     } interactionChangedHandler:^() {
         if (_hitTestResultData.linkTextIndicator)
@@ -464,17 +461,17 @@ using namespace WebKit;
 
 - (id<NSImmediateActionAnimationController>)_animationControllerForText
 {
-    if (_state != ImmediateActionState::Ready)
+    if (_state != WebKit::ImmediateActionState::Ready)
         return nil;
 
-    DictionaryPopupInfo dictionaryPopupInfo = _hitTestResultData.dictionaryPopupInfo;
+    WebCore::DictionaryPopupInfo dictionaryPopupInfo = _hitTestResultData.dictionaryPopupInfo;
     if (!dictionaryPopupInfo.attributedString)
         return nil;
 
     _viewImpl->prepareForDictionaryLookup();
 
-    return DictionaryLookup::animationControllerForPopup(dictionaryPopupInfo, _view, [self](TextIndicator& textIndicator) {
-        _viewImpl->setTextIndicator(textIndicator, TextIndicatorWindowLifetime::Permanent);
+    return WebCore::DictionaryLookup::animationControllerForPopup(dictionaryPopupInfo, _view, [self](WebCore::TextIndicator& textIndicator) {
+        _viewImpl->setTextIndicator(textIndicator, WebCore::TextIndicatorWindowLifetime::Permanent);
     });
 }
 
index b701412..8b88a23 100644 (file)
 #import "WebPageProxy.h"
 #import <wtf/WeakObjCPtr.h>
 
-using namespace WebKit;
-
 @interface WKInspectorViewController () <WKUIDelegate, WKNavigationDelegate, WKInspectorWKWebViewDelegate>
 @end
 
 @implementation WKInspectorViewController {
-    WebPageProxy* _inspectedPage;
+    WebKit::WebPageProxy* _inspectedPage;
     RetainPtr<WKInspectorWKWebView> _webView;
     WeakObjCPtr<id <WKInspectorViewControllerDelegate>> _delegate;
 }
 
-- (instancetype)initWithInspectedPage:(WebKit::WebPageProxy* _Nullable)inspectedPage
+- (instancetype)initWithInspectedPage:(WebKit::WebPageProxy*)inspectedPage
 {
     if (!(self = [super init]))
         return nil;
@@ -88,7 +86,7 @@ using namespace WebKit;
 {
     // Construct lazily so the client can set the delegate before the WebView is created.
     if (!_webView) {
-        NSRect initialFrame = NSMakeRect(0, 0, WebInspectorProxy::initialWindowWidth, WebInspectorProxy::initialWindowHeight);
+        NSRect initialFrame = NSMakeRect(0, 0, WebKit::WebInspectorProxy::initialWindowWidth, WebKit::WebInspectorProxy::initialWindowHeight);
         _webView = adoptNS([[WKInspectorWKWebView alloc] initWithFrame:initialFrame configuration:[self configuration]]);
         [_webView setUIDelegate:self];
         [_webView setNavigationDelegate:self];
@@ -129,8 +127,8 @@ using namespace WebKit;
         }
     }
 
-    [configuration setProcessPool:wrapper(inspectorProcessPool(inspectorLevelForPage(_inspectedPage)))];
-    [configuration _setGroupIdentifier:inspectorPageGroupIdentifierForPage(_inspectedPage)];
+    [configuration setProcessPool:wrapper(WebKit::inspectorProcessPool(WebKit::inspectorLevelForPage(_inspectedPage)))];
+    [configuration _setGroupIdentifier:WebKit::inspectorPageGroupIdentifierForPage(_inspectedPage)];
 
     return configuration.autorelease();
 }
@@ -158,7 +156,7 @@ using namespace WebKit;
     [_webView.get().window setFrame:NSRectFromCGRect(frame) display:YES];
 }
 
-- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> * _Nullable URLs))completionHandler
+- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> *URLs))completionHandler
 {
     NSOpenPanel *openPanel = [NSOpenPanel openPanel];
     openPanel.allowsMultipleSelection = parameters.allowsMultipleSelection;
@@ -219,7 +217,7 @@ using namespace WebKit;
     }
 
     // Allow loading of the main inspector file.
-    if (WebInspectorProxy::isMainOrTestInspectorPage(navigationAction.request.URL)) {
+    if (WebKit::WebInspectorProxy::isMainOrTestInspectorPage(navigationAction.request.URL)) {
         decisionHandler(WKNavigationActionPolicyAllow);
         return;
     }
@@ -239,7 +237,7 @@ using namespace WebKit;
         return;
 
     OptionSet<WebCore::ReloadOption> reloadOptions;
-    if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
+    if (WebKit::linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
         reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
 
     _inspectedPage->reload(reloadOptions);
index 9b18af9..7b0b38b 100644 (file)
@@ -40,9 +40,6 @@
 #import <WebCore/WebCoreObjCExtras.h>
 #import <wtf/RunLoop.h>
 
-using namespace WebKit;
-using namespace WebCore;
-
 NSString * const WebKitOriginalTopPrintingMarginKey = @"WebKitOriginalTopMargin";
 NSString * const WebKitOriginalBottomPrintingMarginKey = @"WebKitOriginalBottomMargin";
 
@@ -202,7 +199,7 @@ static BOOL isForcingPreviewUpdate;
     return lastPage;
 }
 
-- (uint64_t)_expectedPreviewCallbackForRect:(const IntRect&)rect
+- (uint64_t)_expectedPreviewCallbackForRect:(const WebCore::IntRect&)rect
 {
     for (HashMap<uint64_t, WebCore::IntRect>::iterator iter = _expectedPreviewCallbacks.begin(); iter != _expectedPreviewCallbacks.end(); ++iter) {
         if (iter->value  == rect)
@@ -216,7 +213,7 @@ struct IPCCallbackContext {
     uint64_t callbackID;
 };
 
-static void pageDidDrawToImage(const ShareableBitmap::Handle& imageHandle, IPCCallbackContext* context)
+static void pageDidDrawToImage(const WebKit::ShareableBitmap::Handle& imageHandle, IPCCallbackContext* context)
 {
     ASSERT(RunLoop::isMain());
 
@@ -229,7 +226,7 @@ static void pageDidDrawToImage(const ShareableBitmap::Handle& imageHandle, IPCCa
         ASSERT([view _isPrintingPreview]);
 
         if (!imageHandle.isNull()) {
-            RefPtr<ShareableBitmap> image = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
+            auto image = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::Protection::ReadOnly);
 
             if (image)
                 view->_pagePreviews.add(iter->value, image);
@@ -267,12 +264,12 @@ static void pageDidDrawToImage(const ShareableBitmap::Handle& imageHandle, IPCCa
     ASSERT(firstPage <= lastPage);
     LOG(Printing, "WKPrintingView requesting PDF data for pages %u...%u", firstPage, lastPage);
 
-    PrintInfo printInfo([_printOperation printInfo]);
+    WebKit::PrintInfo printInfo([_printOperation printInfo]);
     // Return to printing mode if we're already back to screen (e.g. due to window resizing).
     _webFrame->page()->beginPrinting(_webFrame.get(), printInfo);
 
     IPCCallbackContext* context = new IPCCallbackContext;
-    auto callback = DataCallback::create([context](API::Data* data, WebKit::CallbackBase::Error) {
+    auto callback = WebKit::DataCallback::create([context](API::Data* data, WebKit::CallbackBase::Error) {
         ASSERT(RunLoop::isMain());
 
         std::unique_ptr<IPCCallbackContext> contextDeleter(context);
@@ -316,11 +313,11 @@ static void pageDidComputePageRects(const Vector<WebCore::IntRect>& pageRects, d
 
         // Sanitize a response coming from the Web process.
         if (view->_printingPageRects.isEmpty())
-            view->_printingPageRects.append(IntRect(0, 0, 1, 1));
+            view->_printingPageRects.append(WebCore::IntRect(0, 0, 1, 1));
         if (view->_totalScaleFactorForPrinting <= 0)
             view->_totalScaleFactorForPrinting = 1;
 
-        const IntRect& lastPrintingPageRect = view->_printingPageRects[view->_printingPageRects.size() - 1];
+        const WebCore::IntRect& lastPrintingPageRect = view->_printingPageRects[view->_printingPageRects.size() - 1];
         NSRect newFrameSize = NSMakeRect(0, 0, 
             ceil(lastPrintingPageRect.maxX() * view->_totalScaleFactorForPrinting), 
             ceil(lastPrintingPageRect.maxY() * view->_totalScaleFactorForPrinting));
@@ -347,7 +344,7 @@ static void pageDidComputePageRects(const Vector<WebCore::IntRect>& pageRects, d
     ASSERT(!_expectedComputedPagesCallback);
 
     IPCCallbackContext* context = new IPCCallbackContext;
-    auto callback = ComputedPagesCallback::create([context](const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, WebKit::CallbackBase::Error) {
+    auto callback = WebKit::ComputedPagesCallback::create([context](const Vector<WebCore::IntRect>& pageRects, double totalScaleFactorForPrinting, WebKit::CallbackBase::Error) {
         std::unique_ptr<IPCCallbackContext> contextDeleter(context);
         pageDidComputePageRects(pageRects, totalScaleFactorForPrinting, context);
     });
@@ -355,7 +352,7 @@ static void pageDidComputePageRects(const Vector<WebCore::IntRect>& pageRects, d
     context->view = self;
     context->callbackID = _expectedComputedPagesCallback;
 
-    _webFrame->page()->computePagesForPrinting(_webFrame.get(), PrintInfo([_printOperation printInfo]), WTFMove(callback));
+    _webFrame->page()->computePagesForPrinting(_webFrame.get(), WebKit::PrintInfo([_printOperation printInfo]), WTFMove(callback));
     return YES;
 }
 
@@ -425,7 +422,7 @@ static void prepareDataForPrintingOnSecondaryThread(WKPrintingView *view)
 {
     // Assuming that rect exactly matches one of the pages.
     for (size_t i = 0; i < _printingPageRects.size(); ++i) {
-        IntRect currentRect(_printingPageRects[i]);
+        WebCore::IntRect currentRect(_printingPageRects[i]);
         currentRect.scale(_totalScaleFactorForPrinting);
         if (rect.origin.y == currentRect.y() && rect.origin.x == currentRect.x())
             return i + 1;
@@ -477,7 +474,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
     }
 
     for (PDFAnnotation *annotation in [pdfPage annotations]) {
-        if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
+        if (![annotation isKindOfClass:WebKit::pdfAnnotationLinkClass()])
             continue;
 
 #pragma clang diagnostic push
@@ -506,11 +503,11 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
 {
     ASSERT(RunLoop::isMain());
 
-    IntRect scaledPrintingRect(nsRect);
+    WebCore::IntRect scaledPrintingRect(nsRect);
     scaledPrintingRect.scale(1 / _totalScaleFactorForPrinting);
-    IntSize imageSize(nsRect.size);
+    WebCore::IntSize imageSize(nsRect.size);
     imageSize.scale(_webFrame->page()->deviceScaleFactor());
-    HashMap<WebCore::IntRect, RefPtr<ShareableBitmap>>::iterator pagePreviewIterator = _pagePreviews.find(scaledPrintingRect);
+    HashMap<WebCore::IntRect, RefPtr<WebKit::ShareableBitmap>>::iterator pagePreviewIterator = _pagePreviews.find(scaledPrintingRect);
     if (pagePreviewIterator == _pagePreviews.end())  {
         // It's too early to ask for page preview if we don't even know page size and scale.
         if ([self _hasPageRects]) {
@@ -524,10 +521,10 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
                     return;
 
                 // Return to printing mode if we're already back to screen (e.g. due to window resizing).
-                _webFrame->page()->beginPrinting(_webFrame.get(), PrintInfo([_printOperation printInfo]));
+                _webFrame->page()->beginPrinting(_webFrame.get(), WebKit::PrintInfo([_printOperation printInfo]));
 
                 IPCCallbackContext* context = new IPCCallbackContext;
-                auto callback = ImageCallback::create([context](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
+                auto callback = WebKit::ImageCallback::create([context](const WebKit::ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
                     std::unique_ptr<IPCCallbackContext> contextDeleter(context);
                     pageDidDrawToImage(imageHandle, context);
                 });
@@ -537,7 +534,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
                 context->view = self;
                 context->callbackID = callback->callbackID().toInteger();
 
-                _webFrame->page()->drawRectToImage(_webFrame.get(), PrintInfo([_printOperation printInfo]), scaledPrintingRect, imageSize, WTFMove(callback));
+                _webFrame->page()->drawRectToImage(_webFrame.get(), WebKit::PrintInfo([_printOperation printInfo]), scaledPrintingRect, imageSize, WTFMove(callback));
                 return;
             }
         }
@@ -546,16 +543,16 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
         return;
     }
 
-    RefPtr<ShareableBitmap> bitmap = pagePreviewIterator->value;
+    RefPtr<WebKit::ShareableBitmap> bitmap = pagePreviewIterator->value;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     CGContextRef cgContext = static_cast<CGContextRef>([[NSGraphicsContext currentContext] graphicsPort]);
 #pragma clang diagnostic pop
 
-    GraphicsContext context(cgContext);
-    GraphicsContextStateSaver stateSaver(context);
+    WebCore::GraphicsContext context(cgContext);
+    WebCore::GraphicsContextStateSaver stateSaver(context);
 
-    bitmap->paint(context, _webFrame->page()->deviceScaleFactor(), IntPoint(nsRect.origin), bitmap->bounds());
+    bitmap->paint(context, _webFrame->page()->deviceScaleFactor(), WebCore::IntPoint(nsRect.origin), bitmap->bounds());
 }
 
 - (void)drawRect:(NSRect)nsRect
@@ -568,7 +565,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
     if (!page)
         return;
 
-    LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->useDarkAppearance());
+    WebCore::LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->useDarkAppearance());
 
     if ([self _isPrintingPreview]) {
         [self _drawPreview:nsRect];
@@ -580,7 +577,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
 
     if (!_printedPagesPDFDocument) {
         RetainPtr<NSData> pdfData = adoptNS([[NSData alloc] initWithBytes:_printedPagesData.data() length:_printedPagesData.size()]);
-        _printedPagesPDFDocument = adoptNS([[pdfDocumentClass() alloc] initWithData:pdfData.get()]);
+        _printedPagesPDFDocument = adoptNS([[WebKit::pdfDocumentClass() alloc] initWithData:pdfData.get()]);
 
         unsigned pageCount = [_printedPagesPDFDocument pageCount];
         _linkDestinationsPerPage.clear();
@@ -588,7 +585,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
         for (unsigned i = 0; i < pageCount; i++) {
             PDFPage *page = [_printedPagesPDFDocument pageAtIndex:i];
             for (PDFAnnotation *annotation in page.annotations) {
-                if (![annotation isKindOfClass:pdfAnnotationLinkClass()])
+                if (![annotation isKindOfClass:WebKit::pdfAnnotationLinkClass()])
                     continue;
 
 #pragma clang diagnostic push
@@ -689,7 +686,7 @@ static CFStringRef linkDestinationName(PDFDocument *document, PDFDestination *de
         return NSMakeRect(0, 0, 0, 0);
     }
 
-    IntRect rect = _printingPageRects[page - 1];
+    WebCore::IntRect rect = _printingPageRects[page - 1];
     rect.scale(_totalScaleFactorForPrinting);
     LOG(Printing, "-[WKPrintingView %p rectForPage:%d] -> x %d, y %d, width %d, height %d", self, (int)page, rect.x(), rect.y(), rect.width(), rect.height());
     return rect;
index f0dd5e4..23fc4a6 100644 (file)
 // FIXME: Implement scrollFindMatchToVisible.
 // FIXME: The NSTextFinder overlay doesn't move with scrolling; we should have a mode where we manage the overlay.
 
-using namespace WebCore;
-using namespace WebKit;
-
 static const NSUInteger maximumFindMatches = 1000;
 
 @interface WKTextFinderClient ()
 
-- (void)didFindStringMatchesWithRects:(const Vector<Vector<IntRect>>&)rects didWrapAround:(BOOL)didWrapAround;
+- (void)didFindStringMatchesWithRects:(const Vector<Vector<WebCore::IntRect>>&)rects didWrapAround:(BOOL)didWrapAround;
 
 - (void)getImageForMatchResult:(id <NSTextFinderAsynchronousDocumentFindMatch>)findMatch completionHandler:(void (^)(NSImage *generatedImage))completionHandler;
-- (void)didGetImageForMatchResult:(WebImage *)string;
+- (void)didGetImageForMatchResult:(WebKit::WebImage *)string;
 
 @end
 
 namespace WebKit {
+using namespace WebCore;
 
 class TextFinderFindClient : public API::FindMatchesClient, public API::FindClient {
 public:
@@ -64,7 +62,7 @@ public:
     }
 
 private:
-    void didFindStringMatches(WebPageProxy* page, const String&, const Vector<Vector<IntRect>>& matchRects, int32_t) override
+    void didFindStringMatches(WebPageProxy* page, const String&, const Vector<Vector<WebCore::IntRect>>& matchRects, int32_t) override
     {
         [m_textFinderClient didFindStringMatchesWithRects:matchRects didWrapAround:NO];
     }
@@ -74,7 +72,7 @@ private:
         [m_textFinderClient didGetImageForMatchResult:image];
     }
 
-    void didFindString(WebPageProxy*, const String&, const Vector<IntRect>& matchRects, uint32_t, int32_t, bool didWrapAround) override
+    void didFindString(WebPageProxy*, const String&, const Vector<WebCore::IntRect>& matchRects, uint32_t, int32_t, bool didWrapAround) override
     {
         [m_textFinderClient didFindStringMatchesWithRects:{ matchRects } didWrapAround:didWrapAround];
     }
@@ -140,13 +138,13 @@ private:
 @end
 
 @implementation WKTextFinderClient {
-    WebPageProxy *_page;
+    WebKit::WebPageProxy *_page;
     NSView *_view;
     Deque<WTF::Function<void(NSArray *, bool didWrap)>> _findReplyCallbacks;
     Deque<WTF::Function<void(NSImage *)>> _imageReplyCallbacks;
 }
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view
 {
     self = [super init];
 
@@ -156,8 +154,8 @@ private:
     _page = &page;
     _view = view;
     
-    _page->setFindMatchesClient(std::make_unique<TextFinderFindClient>(self));
-    _page->setFindClient(std::make_unique<TextFinderFindClient>(self));
+    _page->setFindMatchesClient(std::make_unique<WebKit::TextFinderFindClient>(self));
+    _page->setFindClient(std::make_unique<WebKit::TextFinderFindClient>(self));
 
     return self;
 }
@@ -183,13 +181,13 @@ private:
     unsigned kitFindOptions = 0;
 
     if (findOptions & NSTextFinderAsynchronousDocumentFindOptionsBackwards)
-        kitFindOptions |= FindOptionsBackwards;
+        kitFindOptions |= WebKit::FindOptionsBackwards;
     if (findOptions & NSTextFinderAsynchronousDocumentFindOptionsWrap)
-        kitFindOptions |= FindOptionsWrapAround;
+        kitFindOptions |= WebKit::FindOptionsWrapAround;
     if (findOptions & NSTextFinderAsynchronousDocumentFindOptionsCaseInsensitive)
-        kitFindOptions |= FindOptionsCaseInsensitive;
+        kitFindOptions |= WebKit::FindOptionsCaseInsensitive;
     if (findOptions & NSTextFinderAsynchronousDocumentFindOptionsStartsWith)
-        kitFindOptions |= FindOptionsAtWordStarts;
+        kitFindOptions |= WebKit::FindOptionsAtWordStarts;
 
     RetainPtr<NSProgress> progress = [NSProgress progressWithTotalUnitCount:1];
     auto copiedResultCollector = Block_copy(resultCollector);
@@ -209,7 +207,7 @@ private:
 {
     void (^copiedCompletionHandler)(NSString *) = Block_copy(completionHandler);
 
-    _page->getSelectionOrContentsAsString([copiedCompletionHandler] (const String& string, CallbackBase::Error) {
+    _page->getSelectionOrContentsAsString([copiedCompletionHandler] (const String& string, WebKit::CallbackBase::Error) {
         copiedCompletionHandler(string);
         Block_release(copiedCompletionHandler);
     });
@@ -226,7 +224,7 @@ private:
 
 #pragma mark - FindMatchesClient
 
-static RetainPtr<NSArray> arrayFromRects(const Vector<IntRect>& matchRects)
+static RetainPtr<NSArray> arrayFromRects(const Vector<WebCore::IntRect>& matchRects)
 {
     RetainPtr<NSMutableArray> nsMatchRects = adoptNS([[NSMutableArray alloc] initWithCapacity:matchRects.size()]);
     for (auto& rect : matchRects)
@@ -234,7 +232,7 @@ static RetainPtr<NSArray> arrayFromRects(const Vector<IntRect>& matchRects)
     return nsMatchRects;
 }
 
-- (void)didFindStringMatchesWithRects:(const Vector<Vector<IntRect>>&)rectsForMatches didWrapAround:(BOOL)didWrapAround
+- (void)didFindStringMatchesWithRects:(const Vector<Vector<WebCore::IntRect>>&)rectsForMatches didWrapAround:(BOOL)didWrapAround
 {
     if (_findReplyCallbacks.isEmpty())
         return;
@@ -251,12 +249,12 @@ static RetainPtr<NSArray> arrayFromRects(const Vector<IntRect>& matchRects)
     replyCallback(matchObjects.get(), didWrapAround);
 }
 
-- (void)didGetImageForMatchResult:(WebImage *)image
+- (void)didGetImageForMatchResult:(WebKit::WebImage *)image
 {
     if (_imageReplyCallbacks.isEmpty())
         return;
 
-    IntSize size = image->bitmap().size();
+    WebCore::IntSize size = image->bitmap().size();
     size.scale(1 / _page->deviceScaleFactor());
 
     auto imageCallback = _imageReplyCallbacks.takeFirst();
index f6f1511..ae3641e 100644 (file)
@@ -32,8 +32,7 @@
 #import <pal/spi/mac/HIToolboxSPI.h>
 #import <pal/system/mac/WebPanel.h>
 
-@interface WKTextInputView : NSTextView {
-}
+@interface WKTextInputView : NSTextView
 @end
 
 @implementation WKTextInputView
index 08fcc96..639d599 100644 (file)
@@ -33,9 +33,6 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/MachSendRight.h>
 
-using namespace WebCore;
-using namespace WebKit;
-
 @interface WKViewViewSizeLayoutStrategy : WKViewLayoutStrategy
 @end
 
@@ -50,7 +47,7 @@ using namespace WebKit;
 
 @implementation WKViewLayoutStrategy
 
-+ (instancetype)layoutStrategyWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
++ (instancetype)layoutStrategyWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     WKViewLayoutStrategy *strategy;
 
@@ -75,7 +72,7 @@ using namespace WebKit;
     return [strategy autorelease];
 }
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     self = [super init];
 
@@ -155,7 +152,7 @@ using namespace WebKit;
 
 @implementation WKViewViewSizeLayoutStrategy
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     self = [super initWithPage:page view:view viewImpl:webViewImpl mode:mode];
 
@@ -175,7 +172,7 @@ using namespace WebKit;
 
 @implementation WKViewFixedSizeLayoutStrategy
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     self = [super initWithPage:page view:view viewImpl:webViewImpl mode:mode];
 
@@ -195,7 +192,7 @@ using namespace WebKit;
 
 @implementation WKViewDynamicSizeComputedFromViewScaleLayoutStrategy
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     self = [super initWithPage:page view:view viewImpl:webViewImpl mode:mode];
 
@@ -234,7 +231,7 @@ using namespace WebKit;
 
 @implementation WKViewDynamicSizeComputedFromMinimumDocumentSizeLayoutStrategy
 
-- (instancetype)initWithPage:(WebPageProxy&)page view:(NSView *)view viewImpl:(WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
+- (instancetype)initWithPage:(WebKit::WebPageProxy&)page view:(NSView *)view viewImpl:(WebKit::WebViewImpl&)webViewImpl mode:(WKLayoutMode)mode
 {
     self = [super initWithPage:page view:view viewImpl:webViewImpl mode:mode];
 
index 60792f0..0d1163b 100644 (file)
@@ -39,8 +39,6 @@
 #import <WebCore/Color.h>
 #import <WebCore/ColorMac.h>
 
-using namespace WebKit;
-
 #if ENABLE(INPUT_TYPE_COLOR_POPOVER)
 
 #import <pal/spi/mac/NSColorWellSPI.h>
index 80fa79b..b0c07ae 100644 (file)
@@ -49,8 +49,6 @@
 #import <pal/spi/mac/NSSharingServiceSPI.h>
 #import <wtf/RetainPtr.h>
 
-using namespace WebCore;
-
 @interface WKUserDataWrapper : NSObject {
     RefPtr<API::Object> _webUserData;
 }
@@ -140,7 +138,7 @@ using namespace WebCore;
         return;
     }
 
-    WebKit::WebContextMenuItemData item(ActionType, static_cast<ContextMenuAction>([sender tag]), [sender title], [sender isEnabled], [sender state] == NSControlStateValueOn);
+    WebKit::WebContextMenuItemData item(WebCore::ActionType, static_cast<WebCore::ContextMenuAction>([sender tag]), [sender title], [sender isEnabled], [sender state] == NSControlStateValueOn);
     if (representedObject) {
         ASSERT([representedObject isKindOfClass:[WKUserDataWrapper class]]);
         item.setUserData([static_cast<WKUserDataWrapper *>(representedObject) userData]);
@@ -152,6 +150,7 @@ using namespace WebCore;
 @end
 
 namespace WebKit {
+using namespace WebCore;
 
 WebContextMenuProxyMac::WebContextMenuProxyMac(NSView* webView, WebPageProxy& page, ContextMenuContextData&& context, const UserData& userData)
     : WebContextMenuProxy(WTFMove(context), userData)
@@ -342,7 +341,7 @@ RetainPtr<NSMenu> WebContextMenuProxyMac::createContextMenuFromItems(const Vecto
     return menu;
 }
 
-static NSString *menuItemIdentifier(const ContextMenuAction action)
+static NSString *menuItemIdentifier(const WebCore::ContextMenuAction action)
 {
     switch (action) {
 #if WK_API_ENABLED
@@ -432,8 +431,8 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createContextMenuItem(const WebCon
 #endif
 
     switch (item.type()) {
-    case ActionType:
-    case CheckableActionType: {
+    case WebCore::ActionType:
+    case WebCore::CheckableActionType: {
         auto menuItem = adoptNS([[NSMenuItem alloc] initWithTitle:item.title() action:@selector(forwardContextMenuAction:) keyEquivalent:@""]);
 
         [menuItem setTag:item.action()];
@@ -450,10 +449,10 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createContextMenuItem(const WebCon
         return menuItem;
     }
 
-    case SeparatorType:
+    case WebCore::SeparatorType:
         return [NSMenuItem separatorItem];
 
-    case SubmenuType: {
+    case WebCore::SubmenuType: {
         auto menuItem = adoptNS([[NSMenuItem alloc] initWithTitle:item.title() action:nullptr keyEquivalent:@""]);
         [menuItem setEnabled:item.enabled()];
         [menuItem setSubmenu:createContextMenuFromItems(item.submenu()).get()];
index 6c8d07a..05caa22 100644 (file)
 #import <wtf/SoftLinking.h>
 #import <wtf/text/Base64.h>
 
-
 SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
 
-using namespace WebCore;
-using namespace WebKit;
-
 static const NSUInteger windowStyleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable | NSWindowStyleMaskFullSizeContentView;
 
 // The time we keep our WebView alive before closing it and its process.
@@ -55,13 +51,13 @@ static const Seconds webViewCloseTimeout { 1_min };
 
 @interface WKWebInspectorProxyObjCAdapter () <WKInspectorViewControllerDelegate>
 
-- (instancetype)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy;
+- (instancetype)initWithWebInspectorProxy:(WebKit::WebInspectorProxy*)inspectorProxy;
 - (void)invalidate;
 
 @end
 
 @implementation WKWebInspectorProxyObjCAdapter {
-    WebInspectorProxy* _inspectorProxy;
+    WebKit::WebInspectorProxy* _inspectorProxy;
 }
 
 - (WKInspectorRef)inspectorRef
@@ -69,7 +65,7 @@ static const Seconds webViewCloseTimeout { 1_min };
     return toAPI(_inspectorProxy);
 }
 
-- (instancetype)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy
+- (instancetype)initWithWebInspectorProxy:(WebKit::WebInspectorProxy*)inspectorProxy
 {
     ASSERT_ARG(inspectorProxy, inspectorProxy);
 
@@ -146,6 +142,7 @@ static const Seconds webViewCloseTimeout { 1_min };
 @end
 
 namespace WebKit {
+using namespace WebCore;
 
 void WebInspectorProxy::attachmentViewDidChange(NSView *oldView, NSView *newView)
 {
index 1a86587..d30afc8 100644 (file)
@@ -708,3 +708,6 @@ void WebPageProxy::stopDisplayLink(unsigned observerID)
 } // namespace WebKit
 
 #endif // PLATFORM(MAC)
+
+#undef MESSAGE_CHECK
+#undef MESSAGE_CHECK_URL
index 4234741..8b5db15 100644 (file)
@@ -36,9 +36,8 @@
 #import <pal/system/mac/PopupMenu.h>
 #import <wtf/ProcessPrivilege.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 WebPopupMenuProxyMac::WebPopupMenuProxyMac(NSView *webView, WebPopupMenuProxy::Client& client)
     : WebPopupMenuProxy(client)
index aa4ae18..80e2c2d 100644 (file)
@@ -34,9 +34,8 @@
 #include "WebPopupMenuProxyWin.h"
 #include "WebView.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 PageClientImpl::PageClientImpl(WebView& view)
     : m_view(view)
index 0cabe64..54d3383 100644 (file)
@@ -30,9 +30,8 @@
 #include "TextCheckerState.h"
 #include <WebCore/NotImplemented.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 TextCheckerState& checkerState()
 {
index 18ef730..af435c1 100644 (file)
@@ -35,9 +35,8 @@
 #include "WebPageProxy.h"
 #include "WebProcessProxy.h"
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 void WebContextMenuProxyWin::show()
 {
index 522454c..2243dfd 100644 (file)
@@ -42,9 +42,8 @@
 #include <WebCore/WebCoreInstanceHandle.h>
 #include <windowsx.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const LPCWSTR kWebKit2WebPopupMenuProxyWindowClassName = L"WebKit2WebPopupMenuProxyWindowClass";
 
index 7b614f0..ed1d4ec 100644 (file)
@@ -60,9 +60,8 @@
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static const LPCWSTR kWebKit2WebViewWindowClassName = L"WebKit2WebViewWindowClass";
 
index cdaac71..f9eaedd 100644 (file)
@@ -29,9 +29,8 @@
 #include "TextCheckerState.h"
 #include <WebCore/NotImplemented.h>
 
-using namespace WebCore;
-
 namespace WebKit {
+using namespace WebCore;
 
 static TextCheckerState textCheckerState;
 
index 8d3d0eb..0a8d44a 100644 (file)
@@ -29,9 +29,9 @@
 #include <WebCore/PlatformPasteboard.h>
 #include <wtf/text/WTFString.h>
 
+namespace WebKit {
 using namespace WebCore;
 
-namespace WebKit {
 void WebPasteboardProxy::getPasteboardTypes(Vector<String>& pasteboardTypes)
 {
     PlatformPasteboard().getTypes(pasteboardTypes);
index b3e2fc9..133ee6b 100644 (file)
 /* Begin PBXBuildFile section */
                005D158F18E4C4EB00734619 /* _WKFindDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 005D158E18E4C4EB00734619 /* _WKFindDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661518E24CBA00CE1F88 /* APIFindClient.h */; };
-               00B9661918E25AE100CE1F88 /* FindClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 00B9661718E25AE100CE1F88 /* FindClient.mm */; };
                00B9661A18E25AE100CE1F88 /* FindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661818E25AE100CE1F88 /* FindClient.h */; };
-               07297F9E1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297F9C1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp */; };
                07297F9F1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */; };
                07297FA21C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297FA01C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp */; };
                07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297FA11C186ADB003F0735 /* WKUserMediaPermissionCheck.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               074E75FD1DF2211500D318EC /* UserMediaProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 074E75FC1DF2002400D318EC /* UserMediaProcessManager.cpp */; };
                074E75FE1DF2211900D318EC /* UserMediaProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 074E75FB1DF1FD1300D318EC /* UserMediaProcessManager.h */; };
                076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */; };
                0772811D21234FF600C8EF2E /* UserMediaPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F4319AF7B27002EBAB5 /* UserMediaPermissionRequestManager.h */; };
                0EDE85032004E75D00030560 /* WebsitePopUpPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EDE85022004E74900030560 /* WebsitePopUpPolicy.h */; };
                0F08CF521D63C13A00B48DF1 /* WKFormSelectPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F08CF511D63C13A00B48DF1 /* WKFormSelectPicker.h */; };
                0F08CF541D63C14000B48DF1 /* WKFormSelectPopover.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F08CF531D63C14000B48DF1 /* WKFormSelectPopover.h */; };
-               0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */; };
                0F0C365A18C0555800F607D7 /* LayerRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F0C365918C0555800F607D7 /* LayerRepresentation.h */; };
-               0F0C365C18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365B18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm */; };
-               0F0C365E18C110A500F607D7 /* LayerRepresentation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365D18C110A500F607D7 /* LayerRepresentation.mm */; };
                0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* APIGeometry.h */; };
                0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F174AA6142AAC610039250F /* WKGeometry.cpp */; };
                0F3C725B196F604E00AEDD0C /* WKInspectorHighlightView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F3C7259196F5F6800AEDD0C /* WKInspectorHighlightView.h */; };
-               0F3C725C196F605200AEDD0C /* WKInspectorHighlightView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F3C7257196F5F5000AEDD0C /* WKInspectorHighlightView.mm */; };
                0F594790187B3B3A00437857 /* RemoteScrollingCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F59478D187B3B3A00437857 /* RemoteScrollingCoordinator.h */; };
-               0F59479A187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F594794187B3B6000437857 /* RemoteScrollingCoordinatorProxy.cpp */; };
                0F59479B187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F594795187B3B6000437857 /* RemoteScrollingCoordinatorProxy.h */; };
-               0F59479C187B3B6000437857 /* RemoteScrollingTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F594796187B3B6000437857 /* RemoteScrollingTree.cpp */; };
                0F59479D187B3B6000437857 /* RemoteScrollingTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F594797187B3B6000437857 /* RemoteScrollingTree.h */; };
                0F5947A4187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */; };
                0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */; };
                0F850FE71ED7C39F00FB77A7 /* WebPerformanceLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F850FE51ED7C39F00FB77A7 /* WebPerformanceLoggingClient.h */; };
                0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */; };
                0F931C1C18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F931C1A18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.h */; };
-               0F931C1D18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */; };
-               0F931C1D18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F931C1B18C5711900DBB8D4 /* ScrollingTreeScrollingNodeDelegateIOS.mm */; };
                0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
                0FCB4E4618BBE044000FCFC9 /* PageClientImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3618BBE044000FCFC9 /* PageClientImplIOS.h */; };
-               0FCB4E4718BBE044000FCFC9 /* PageClientImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3718BBE044000FCFC9 /* PageClientImplIOS.mm */; };
                0FCB4E4818BBE044000FCFC9 /* WKActionSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3818BBE044000FCFC9 /* WKActionSheet.h */; };
-               0FCB4E4918BBE044000FCFC9 /* WKActionSheet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3918BBE044000FCFC9 /* WKActionSheet.mm */; };
                0FCB4E4A18BBE044000FCFC9 /* WKActionSheetAssistant.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3A18BBE044000FCFC9 /* WKActionSheetAssistant.h */; };
-               0FCB4E4B18BBE044000FCFC9 /* WKActionSheetAssistant.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3B18BBE044000FCFC9 /* WKActionSheetAssistant.mm */; };
                0FCB4E4C18BBE044000FCFC9 /* WKContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3C18BBE044000FCFC9 /* WKContentView.h */; };
-               0FCB4E4D18BBE044000FCFC9 /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */; };
                0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E3F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h */; };
-               0FCB4E5018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4018BBE044000FCFC9 /* WKGeolocationProviderIOS.mm */; };
-               0FCB4E5118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4118BBE044000FCFC9 /* WKGeolocationProviderIOSObjCSecurityOrigin.mm */; };
                0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E4418BBE044000FCFC9 /* WKScrollView.h */; };
-               0FCB4E5518BBE044000FCFC9 /* WKScrollView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E4518BBE044000FCFC9 /* WKScrollView.mm */; };
                0FCB4E6218BBE3D9000FCFC9 /* PageClientImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */; };
-               0FCB4E6318BBE3D9000FCFC9 /* PageClientImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */; };
                0FCB4E6618BBE3D9000FCFC9 /* WKPrintingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5C18BBE3D9000FCFC9 /* WKPrintingView.h */; };
-               0FCB4E6718BBE3D9000FCFC9 /* WKPrintingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5D18BBE3D9000FCFC9 /* WKPrintingView.mm */; };
                0FCB4E6818BBE3D9000FCFC9 /* WKTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E5E18BBE3D9000FCFC9 /* WKTextInputWindowController.h */; };
-               0FCB4E6918BBE3D9000FCFC9 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */; };
                0FCB4E6C18BBF26A000FCFC9 /* WKContentViewInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */; };
-               0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
                0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */; };
                0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
                0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
-               0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */; };
                0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */; };
                15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F4919AF7B80002EBAB5 /* WebUserMediaClient.h */; };
                1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */; };
                1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D3F196B329400B9AD44 /* _WKSessionState.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */; };
-               1A002D48196B345D00B9AD44 /* SessionStateCoding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */; };
                1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */; };
                1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043974124D034800FFBFB5 /* PluginProcess.h */; };
                1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043975124D034800FFBFB5 /* PluginProcess.cpp */; };
                1A043DC1124FF87500FFBFB5 /* PluginProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043DBF124FF87500FFBFB5 /* PluginProxy.h */; };
                1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */; };
                1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */; };
-               1A04F6191A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */; };
                1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
                1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
                1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
                1A07D2FB1919B3A900ECDA16 /* parser.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08571187CE0A900780D86 /* parser.py */; };
                1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */; };
-               1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */; };
                1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC6BE124BBD9B007EF4A5 /* PluginProcessMessages.h */; };
                1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC75C124BC7B2007EF4A5 /* PluginProcessProxy.h */; };
-               1A0EC75F124BC7B2007EF4A5 /* PluginProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC75D124BC7B2007EF4A5 /* PluginProcessProxy.cpp */; };
                1A0EC906124C0AB8007EF4A5 /* PluginProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC904124C0AB8007EF4A5 /* PluginProcessConnection.h */; };
                1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC90D124C0AF5007EF4A5 /* PluginProcessConnectionManager.h */; };
-               1A0F29E3120B44420053D1B9 /* VisitedLinkStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */; };
                1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */; };
                1A14F8E21D74C834006CBEC6 /* FrameInfoData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A14F8E01D74C834006CBEC6 /* FrameInfoData.h */; };
                1A158419189044F50017616C /* WKProcessPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A158417189044F50017616C /* WKProcessPool.mm */; };
                1A1B0EB518A424950038481A /* WKNavigationResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1B0EB318A424950038481A /* WKNavigationResponse.mm */; };
                1A1B0EB618A424950038481A /* WKNavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB418A424950038481A /* WKNavigationResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A1B0EB818A424CD0038481A /* WKNavigationResponseInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */; };
-               1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */; };
                1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */; };
                1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 31607F3819627002009B87DA /* LegacySessionStateCoding.h */; };
                1A1E093418861D3800D2DC49 /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1E093218861D3800D2DC49 /* WebProgressTrackerClient.h */; };
                1A2D843A127F65D5001EB962 /* NPObjectMessageReceiverMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */; };
                1A2D848B127F6A49001EB962 /* NPIdentifierData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D8489127F6A49001EB962 /* NPIdentifierData.h */; };
                1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D84A1127F6AD1001EB962 /* NPVariantData.h */; };
-               1A2D90BB1281C931001EB962 /* PluginProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D90BA1281C931001EB962 /* PluginProcessProxyMac.mm */; };
                1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D90D01281C966001EB962 /* PluginProcessCreationParameters.h */; };
                1A2D91A61281D739001EB962 /* PluginControllerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2D91A51281D739001EB962 /* PluginControllerProxyMac.mm */; };
                1A2D956F12848564001EB962 /* ChildProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2D956D12848564001EB962 /* ChildProcess.h */; };
                1A445BA1184D5FC1004B3414 /* WKContextHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445BA0184D5FC1004B3414 /* WKContextHistoryClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A445BA3184D5FCF004B3414 /* WKContextDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445BA2184D5FCF004B3414 /* WKContextDownloadClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A445BA5184D5FDA004B3414 /* WKContextConnectionClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445BA4184D5FDA004B3414 /* WKContextConnectionClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */; };
                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
-               1A4832C31A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832C11A965A3C008B4DFE /* WebsiteDataStoreCocoa.mm */; };
                1A4832CB1A9BC465008B4DFE /* WKWebsiteDataRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832C91A9BC465008B4DFE /* WKWebsiteDataRecord.mm */; };
                1A4832CC1A9BC465008B4DFE /* WKWebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832CA1A9BC465008B4DFE /* WKWebsiteDataRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A4832CE1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832CD1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h */; };
                1A4832D11A9BDC2F008B4DFE /* WebsiteDataRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832CF1A9BD821008B4DFE /* WebsiteDataRecord.h */; };
                1A4832D71A9CDF96008B4DFE /* WebsiteData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4832D51A9CDF96008B4DFE /* WebsiteData.h */; };
-               1A4832D91A9D1FD2008B4DFE /* WebsiteDataRecord.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4832D81A9D1FD2008B4DFE /* WebsiteDataRecord.cpp */; };
                1A4A93B71AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A93B61AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h */; };
                1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9C5412B816CF008FE984 /* NetscapePluginModule.h */; };
                1A4A9F3312B844E2008FE984 /* PluginQuirks.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9F3112B844E2008FE984 /* PluginQuirks.h */; };
                1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */; };
                1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A52C0F61A38CDC70016160A /* WebStorageNamespaceProvider.h */; };
-               1A53C2A91A32572B004E8C70 /* WebsiteDataStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A53C2A41A32569F004E8C70 /* WebsiteDataStore.cpp */; };
                1A53C2AA1A325730004E8C70 /* WebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A53C2A51A32569F004E8C70 /* WebsiteDataStore.h */; };
                1A5704F71BE01FF400874AF1 /* _WKContextMenuElementInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A5704F51BE01FF400874AF1 /* _WKContextMenuElementInfo.mm */; };
                1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5704F61BE01FF400874AF1 /* _WKContextMenuElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A85E4721E303F3700914599 /* WebKit.apinotes in Headers */ = {isa = PBXBuildFile; fileRef = 1A85E4701E303F2400914599 /* WebKit.apinotes */; settings = {ATTRIBUTES = (Public, ); }; };
                1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */; };
                1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66B21BC45B010082DF77 /* WKBundleMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */; };
                1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */; };
                1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */; };
                1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */; };
                1AA20D5118AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA20D5018AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */; };
                1AA2E56718D77508003814BD /* WKWebProcessBundleParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E56518D77508003814BD /* WKWebProcessBundleParameters.h */; };
-               1AA3D75B1651B44F008713D0 /* RemoteLayerTreeHost.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA3D7591651B44F008713D0 /* RemoteLayerTreeHost.mm */; };
                1AA3D75C1651B44F008713D0 /* RemoteLayerTreeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA3D75A1651B44F008713D0 /* RemoteLayerTreeHost.h */; };
                1AA417CB12C00CCA002BE67B /* TextChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA417C912C00CCA002BE67B /* TextChecker.h */; };
-               1AA417EF12C00D87002BE67B /* TextCheckerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA417ED12C00D87002BE67B /* TextCheckerMac.mm */; };
                1AA41AB512C02EC4002BE67B /* EditorState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA41AB412C02EC4002BE67B /* EditorState.h */; };
                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA4792212A59FD9008236C3 /* PluginProcessMac.mm */; };
                1AA56F2911E92BC80061B882 /* PluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA56F2811E92BC80061B882 /* PluginController.h */; };
                1AAF089A19267EE500B6390C /* WKUserScript.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF089819267EE500B6390C /* WKUserScript.mm */; };
                1AAF089B19267EE500B6390C /* WKUserScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF089919267EE500B6390C /* WKUserScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1AAF089D19267FC800B6390C /* WKUserScriptInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF089C19267FC800B6390C /* WKUserScriptInternal.h */; };
-               1AAF08A1192681D100B6390C /* WebUserContentControllerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF089F192681D100B6390C /* WebUserContentControllerProxy.cpp */; };
                1AAF08A2192681D100B6390C /* WebUserContentControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF08A0192681D100B6390C /* WebUserContentControllerProxy.h */; };
                1AAF08A4192682DA00B6390C /* WKUserContentControllerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF08A3192682DA00B6390C /* WKUserContentControllerInternal.h */; };
                1AAF08AE1926936700B6390C /* WebUserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF08AC1926936700B6390C /* WebUserContentController.h */; };
                1AAF0C4A12B16334008E49E2 /* ArgumentCodersCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */; };
                1AAF263914687C39004A1E8A /* TiledCoreAnimationDrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF263714687C39004A1E8A /* TiledCoreAnimationDrawingArea.h */; };
                1AB16ADE1648598400290D62 /* RemoteLayerTreeDrawingArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16ADC1648598400290D62 /* RemoteLayerTreeDrawingArea.h */; };
-               1AB16AE11648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB16ADF1648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.mm */; };
                1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AE01648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h */; };
                1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AE8164B3A8800290D62 /* RemoteLayerTreeContext.h */; };
                1AB1F77E1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7781D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyCocoa.h */; };
-               1AB1F77F1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7791D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyCocoa.mm */; };
-               1AB1F7801D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77B1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyIOS.mm */; };
-               1AB1F7811D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77D1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyMac.mm */; };
-               1AB1F78B1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7881D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.cpp */; };
                1AB1F78C1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7891D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h */; };
                1AB1F7961D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7921D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp */; };
                1AB1F7971D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7931D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h */; };
                1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB474EA184D45130051B622 /* WKBundlePagePolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E9184D45130051B622 /* WKBundlePagePolicyClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; };
-               1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; };
                1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */; };
                1AB7D61A1288B9D900CFD08C /* DownloadProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */; };
                1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D78B1288CD9A00CFD08C /* WKDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AB8A1F818400BB800E9AE69 /* WKPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DF01899C6B6004F0626 /* WKNavigationInternal.h */; };
-               1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ABC3DF31899E437004F0626 /* NavigationState.mm */; };
                1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DF41899E437004F0626 /* NavigationState.h */; };
                1ABC3DFC1899F51C004F0626 /* WKNavigationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABC3DFB1899F51C004F0626 /* WKNavigationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1AC0273F196622D600C12B75 /* WebPageProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */; };
                1AC1336818565B5700F3EC05 /* UserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336618565B5700F3EC05 /* UserData.h */; };
                1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */; };
                1AC1336E18565D2B00F3EC05 /* APIPageHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */; };
                1AC25FC212A48F6000BD2671 /* PluginProcessShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */; };
                1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC4C82816B876A90069DCCD /* MessageFlags.h */; };
                1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC5FFC1174BFD1B0001483D /* PluginProcessAttributes.h */; };
-               1AC7537B183A9FDB0072CB15 /* PageLoadState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC75379183A9FDA0072CB15 /* PageLoadState.cpp */; };
                1AC7537C183A9FDB0072CB15 /* PageLoadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7537A183A9FDB0072CB15 /* PageLoadState.h */; };
                1AC75380183BE50F0072CB15 /* DataReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7537E183BE50F0072CB15 /* DataReference.h */; };
                1AC75A1B1B3368270056745B /* HangDetectionDisabler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC75A1A1B3368270056745B /* HangDetectionDisabler.h */; };
                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */; };
                1AD01BC81905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD01BC61905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm */; };
                1AD01BC91905D37E00C9C45F /* _WKErrorRecoveryAttempting.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BC71905D37E00C9C45F /* _WKErrorRecoveryAttempting.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1AD01BCC1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */; };
                1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */; };
-               1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
                1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
                1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */; };
-               1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD4C1901B39F33200ABC28E /* ApplicationStateTracker.mm */; };
                1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD4C1911B39F33200ABC28E /* ApplicationStateTracker.h */; };
                1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD60F5B18E20F4C0020C034 /* WKWindowFeatures.mm */; };
                1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1AE00D4C182D6EB000087DD7 /* WKBrowsingContextHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D4A182D6EB000087DD7 /* WKBrowsingContextHandle.mm */; };
                1AE00D4D182D6EB000087DD7 /* WKBrowsingContextHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D4B182D6EB000087DD7 /* WKBrowsingContextHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AE00D4F182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D4E182D6F5000087DD7 /* WKBrowsingContextHandleInternal.h */; };
-               1AE00D601831792100087DD7 /* FrameLoadState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE00D5E1831792100087DD7 /* FrameLoadState.cpp */; };
                1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5F1831792100087DD7 /* FrameLoadState.h */; };
                1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D6A18327C1200087DD7 /* StringReference.h */; };
-               1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
                1AE286771C7E76510069AC4F /* _WKWebsiteDataSize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AE286751C7E76510069AC4F /* _WKWebsiteDataSize.mm */; };
                1AE286781C7E76510069AC4F /* _WKWebsiteDataSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE286761C7E76510069AC4F /* _WKWebsiteDataSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AE2867A1C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE286791C7F7BA60069AC4F /* WKWebsiteDataStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AE52F971920263300A1FA37 /* WKContextConfigurationRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */; };
                1AE52F981920267200A1FA37 /* WKContextConfigurationRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE52F9419201F6B00A1FA37 /* WKContextConfigurationRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */; };
-               1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */; };
-               1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFCCBC11D02C5E008219D3 /* PluginInfoStoreMac.mm */; };
                1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD27811D16C81008219D3 /* ArgumentCoder.h */; };
                1AEFD2F711D1807B008219D3 /* ArgumentCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFD2F611D1807B008219D3 /* ArgumentCoders.h */; };
-               1AF05D8614688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF05D8414688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.mm */; };
                1AF05D8714688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF05D8514688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h */; };
                1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF1AC6A1651759E00C17D7F /* RemoteLayerTreeTransaction.h */; };
                1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */; };
                1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */; };
                1AFA3AC918E61C61003CCBAE /* WKUserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA3AC718E61C61003CCBAE /* WKUserContentController.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1AFA4B8B1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA4B891A65A1D0006C4AB4 /* WebProcessLifetimeTracker.cpp */; };
                1AFA4B8C1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA4B8A1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h */; };
-               1AFA4B8F1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA4B8D1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.cpp */; };
                1AFA4B901A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA4B8E1A65A9E2006C4AB4 /* WebProcessLifetimeObserver.h */; };
                1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */; };
                1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD3181891CA1200153970 /* WKPreferences.mm */; };
                1AFDE64519510B5500C48FFA /* LegacyBundleForClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */; };
                1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDE6581954A42B00C48FFA /* SessionState.h */; };
-               1AFDE65D1954E8D500C48FFA /* LegacySessionStateCoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */; };
                1AFDE6611954E9B100C48FFA /* APISessionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDE65F1954E9B100C48FFA /* APISessionState.cpp */; };
                1AFDE6621954E9B100C48FFA /* APISessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDE6601954E9B100C48FFA /* APISessionState.h */; };
-               1AFE436518B6C081009C7A48 /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFE436318B6C081009C7A48 /* UIDelegate.mm */; };
                1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE436418B6C081009C7A48 /* UIDelegate.h */; };
                1AFF49001833DE78009AB15A /* WKDeprecatedFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */; };
                1BBBE4A019B66C53006B7D81 /* RemoteWebInspectorUIMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BBBE49E19B66C53006B7D81 /* RemoteWebInspectorUIMessageReceiver.cpp */; };
                1C891D6619B124FF00BA79DD /* WebInspectorUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C891D6319B124FF00BA79DD /* WebInspectorUI.h */; };
                1C8E28201275D15400BC7BD0 /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E281E1275D15400BC7BD0 /* WebInspector.h */; };
                1C8E28341275D73800BC7BD0 /* WebInspectorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E28321275D73800BC7BD0 /* WebInspectorProxy.h */; };
-               1C8E28351275D73800BC7BD0 /* WebInspectorProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E28331275D73800BC7BD0 /* WebInspectorProxy.cpp */; };
                1C8E293912761E5B00BC7BD0 /* WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E293712761E5B00BC7BD0 /* WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1C8E293A12761E5B00BC7BD0 /* WKInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E293812761E5B00BC7BD0 /* WKInspector.cpp */; };
                1C8E2A351277852400BC7BD0 /* WebInspectorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C8E2A311277852400BC7BD0 /* WebInspectorMessageReceiver.cpp */; };
                1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C8E2A321277852400BC7BD0 /* WebInspectorMessages.h */; };
-               1CA8B936127C774E00576C2B /* WebInspectorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CA8B935127C774E00576C2B /* WebInspectorProxyMac.mm */; };
                1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */; };
                1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */; };
                1CBBE4A019B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBBE49E19B66C53006B7D81 /* WebInspectorUIMessageReceiver.cpp */; };
                1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC4185F76460019142E /* WKWebProcessPlugInPageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */; };
                1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */; };
-               1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB417C912C00CCA002BE67B /* TextCheckerCompletion.cpp */; };
                263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 263172CE18B469490065B9C3 /* NativeWebTouchEvent.h */; };
                2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */; };
                2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */; };
                2D11B7DB2126A283006F8878 /* UnifiedSource78.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DED0A21269E4C00B9F73C /* UnifiedSource78.cpp */; };
                2D11B7DC2126A283006F8878 /* UnifiedSource79.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DED1A21269E4C00B9F73C /* UnifiedSource79.cpp */; };
                2D11B7DD2126A283006F8878 /* UnifiedSource80.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D7DECCD21269E4C00B9F73C /* UnifiedSource80.cpp */; };
-               2D11BD1F21125BE8009D99E3 /* WKKeyboardScrollingAnimator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD5E126210ADC7A00DB6012 /* WKKeyboardScrollingAnimator.mm */; };
                2D125C5E1857EA05003BA3CB /* ViewGestureController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D125C5C1857EA05003BA3CB /* ViewGestureController.h */; };
-               2D125C5F1857EA05003BA3CB /* ViewGestureControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D125C5D1857EA05003BA3CB /* ViewGestureControllerMac.mm */; };
                2D12DAB520662C73006F00FB /* WKAnimationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D12DAB420662C73006F00FB /* WKAnimationDelegate.h */; };
                2D1B5D5D185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D1B5D5B185869C8006C6596 /* ViewGestureControllerMessageReceiver.cpp */; };
                2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D1B5D5C185869C8006C6596 /* ViewGestureControllerMessages.h */; };
                2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */; };
-               2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */; };
                2D29ECD0192F2C2E00984B78 /* RemoteLayerTreeDisplayRefreshMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D29ECCE192F2C2E00984B78 /* RemoteLayerTreeDisplayRefreshMonitor.h */; };
                2D3A65DA1A7C3A1F00CAC637 /* WKNavigationActionRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D3A65D81A7C3A1F00CAC637 /* WKNavigationActionRef.cpp */; };
                2D3A65DB1A7C3A1F00CAC637 /* WKNavigationActionRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3A65D91A7C3A1F00CAC637 /* WKNavigationActionRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D3A65E31A7C3A9300CAC637 /* WKNavigationRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3A65E11A7C3A9300CAC637 /* WKNavigationRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D3A65E61A7C3AA700CAC637 /* WKFrameInfoRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D3A65E41A7C3AA700CAC637 /* WKFrameInfoRef.cpp */; };
                2D3A65E71A7C3AA700CAC637 /* WKFrameInfoRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3A65E51A7C3AA700CAC637 /* WKFrameInfoRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               2D3EF4421917646300034184 /* WebMemoryPressureHandlerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D3EF4401917646300034184 /* WebMemoryPressureHandlerIOS.mm */; };
                2D3EF4431917646300034184 /* WebMemoryPressureHandlerIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3EF4411917646300034184 /* WebMemoryPressureHandlerIOS.h */; };
                2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D47B56B1810714E003A3AEE /* RemoteLayerBackingStore.h */; };
                2D4AF0892044C3C4006C8817 /* FrontBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4AF0882044C3C4006C8817 /* FrontBoardServicesSPI.h */; };
                2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D4D2C7F1DF60BF3002EB10C /* InteractionInformationRequest.h */; };
                2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D50366A1BCDE17900E20BB3 /* NativeWebGestureEvent.h */; };
                2D5036761BCED19F00E20BB3 /* WebGestureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5036741BCED19F00E20BB3 /* WebGestureEvent.h */; };
+               2D54C307212F3B330049C174 /* UnifiedSource65-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F3212F3B2F0049C174 /* UnifiedSource65-mm.mm */; };
+               2D54C308212F3B330049C174 /* UnifiedSource63-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F4212F3B2F0049C174 /* UnifiedSource63-mm.mm */; };
+               2D54C309212F3B330049C174 /* UnifiedSource68-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F5212F3B300049C174 /* UnifiedSource68-mm.mm */; };
+               2D54C30A212F3B330049C174 /* UnifiedSource76-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F6212F3B300049C174 /* UnifiedSource76-mm.mm */; };
+               2D54C30B212F3B330049C174 /* UnifiedSource78-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F7212F3B300049C174 /* UnifiedSource78-mm.mm */; };
+               2D54C30C212F3B330049C174 /* UnifiedSource64-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F8212F3B300049C174 /* UnifiedSource64-mm.mm */; };
+               2D54C30D212F3B330049C174 /* UnifiedSource70-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2F9212F3B300049C174 /* UnifiedSource70-mm.mm */; };
+               2D54C30E212F3B330049C174 /* UnifiedSource80-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FA212F3B310049C174 /* UnifiedSource80-mm.mm */; };
+               2D54C30F212F3B330049C174 /* UnifiedSource79-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FB212F3B310049C174 /* UnifiedSource79-mm.mm */; };
+               2D54C310212F3B330049C174 /* UnifiedSource73-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FC212F3B310049C174 /* UnifiedSource73-mm.mm */; };
+               2D54C311212F3B330049C174 /* UnifiedSource72-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FD212F3B310049C174 /* UnifiedSource72-mm.mm */; };
+               2D54C312212F3B330049C174 /* UnifiedSource75-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FE212F3B310049C174 /* UnifiedSource75-mm.mm */; };
+               2D54C313212F3B330049C174 /* UnifiedSource67-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C2FF212F3B320049C174 /* UnifiedSource67-mm.mm */; };
+               2D54C314212F3B330049C174 /* UnifiedSource66-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C300212F3B320049C174 /* UnifiedSource66-mm.mm */; };
+               2D54C315212F3B330049C174 /* UnifiedSource74-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C301212F3B320049C174 /* UnifiedSource74-mm.mm */; };
+               2D54C316212F3B330049C174 /* UnifiedSource77-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C302212F3B320049C174 /* UnifiedSource77-mm.mm */; };
+               2D54C317212F3B330049C174 /* UnifiedSource69-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C303212F3B320049C174 /* UnifiedSource69-mm.mm */; };
+               2D54C318212F3B330049C174 /* UnifiedSource71-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C304212F3B330049C174 /* UnifiedSource71-mm.mm */; };
+               2D54C319212F3B330049C174 /* UnifiedSource62-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C305212F3B330049C174 /* UnifiedSource62-mm.mm */; };
+               2D54C31A212F3B330049C174 /* UnifiedSource61-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D54C306212F3B330049C174 /* UnifiedSource61-mm.mm */; };
+               2D54C31B212F4DA60049C174 /* ProcessLauncher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE117F511DBB30900981615 /* ProcessLauncher.cpp */; };
                2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5C9D0419C81D8F00B3C5C1 /* WebPageOverlay.h */; };
                2D6AB541192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */; };
-               2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6AB540192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm */; };
                2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */; };
                2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6CD117189058A500E5A4A0 /* ViewSnapshotStore.h */; };
-               2D6CD11A189058A500E5A4A0 /* ViewSnapshotStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D6CD118189058A500E5A4A0 /* ViewSnapshotStore.mm */; };
                2D72A1FA212BF46E00517A20 /* RemoteLayerTreeDrawingArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB16ADB1648598400290D62 /* RemoteLayerTreeDrawingArea.mm */; };
                2D7303791A7C2B7500F8F487 /* WKPageNavigationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7303781A7C2B7500F8F487 /* WKPageNavigationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D7AAFD618C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D7AAFD518C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h */; };
                2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D819B9F1862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp */; };
                2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */; };
+               2D8508C5212E33ED000EF46C /* UnifiedSource99.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B1212E33E9000EF46C /* UnifiedSource99.cpp */; };
+               2D8508C6212E33ED000EF46C /* UnifiedSource97.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B2212E33E9000EF46C /* UnifiedSource97.cpp */; };
+               2D8508C7212E33ED000EF46C /* UnifiedSource87.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B3212E33E9000EF46C /* UnifiedSource87.cpp */; };
+               2D8508C8212E33ED000EF46C /* UnifiedSource90.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B4212E33E9000EF46C /* UnifiedSource90.cpp */; };
+               2D8508C9212E33ED000EF46C /* UnifiedSource81.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B5212E33E9000EF46C /* UnifiedSource81.cpp */; };
+               2D8508CA212E33ED000EF46C /* UnifiedSource84.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B6212E33EA000EF46C /* UnifiedSource84.cpp */; };
+               2D8508CB212E33ED000EF46C /* UnifiedSource95.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B7212E33EA000EF46C /* UnifiedSource95.cpp */; };
+               2D8508CC212E33ED000EF46C /* UnifiedSource88.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B8212E33EA000EF46C /* UnifiedSource88.cpp */; };
+               2D8508CD212E33ED000EF46C /* UnifiedSource86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508B9212E33EA000EF46C /* UnifiedSource86.cpp */; };
+               2D8508CE212E33ED000EF46C /* UnifiedSource82.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BA212E33EA000EF46C /* UnifiedSource82.cpp */; };
+               2D8508CF212E33ED000EF46C /* UnifiedSource92.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BB212E33EB000EF46C /* UnifiedSource92.cpp */; };
+               2D8508D0212E33ED000EF46C /* UnifiedSource89.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BC212E33EB000EF46C /* UnifiedSource89.cpp */; };
+               2D8508D1212E33ED000EF46C /* UnifiedSource93.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BD212E33EB000EF46C /* UnifiedSource93.cpp */; };
+               2D8508D2212E33ED000EF46C /* UnifiedSource100.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BE212E33EB000EF46C /* UnifiedSource100.cpp */; };
+               2D8508D3212E33ED000EF46C /* UnifiedSource91.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508BF212E33EB000EF46C /* UnifiedSource91.cpp */; };
+               2D8508D4212E33ED000EF46C /* UnifiedSource85.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508C0212E33EC000EF46C /* UnifiedSource85.cpp */; };
+               2D8508D5212E33ED000EF46C /* UnifiedSource83.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508C1212E33EC000EF46C /* UnifiedSource83.cpp */; };
+               2D8508D6212E33ED000EF46C /* UnifiedSource94.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508C2212E33EC000EF46C /* UnifiedSource94.cpp */; };
+               2D8508D7212E33ED000EF46C /* UnifiedSource96.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508C3212E33EC000EF46C /* UnifiedSource96.cpp */; };
+               2D8508D8212E33ED000EF46C /* UnifiedSource98.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D8508C4212E33EC000EF46C /* UnifiedSource98.cpp */; };
                2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8710151828415D0018FA01 /* PlatformCALayerRemoteCustom.h */; };
                2D87861D1BDB54BF00D02ABB /* _WKUserStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D87861B1BDB54BF00D02ABB /* _WKUserStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2D87861E1BDB54BF00D02ABB /* _WKUserStyleSheet.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D87861C1BDB54BF00D02ABB /* _WKUserStyleSheet.mm */; };
                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 */; };
+               2D931169212F61B200044BFE /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */; };
+               2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
                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 */; };
                2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B2180CCCD300AAFA9E /* PlatformCALayerRemote.h */; };
                2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA049B6180CCD0A00AAFA9E /* GraphicsLayerCARemote.h */; };
                2DA1E4FE18C02B6A00DBC929 /* WKLegacyPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA1E4FC18C02B6A00DBC929 /* WKLegacyPDFView.h */; };
-               2DA1E4FF18C02B6A00DBC929 /* WKLegacyPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA1E4FD18C02B6A00DBC929 /* WKLegacyPDFView.mm */; };
                2DA6731A20C754B1003CB401 /* DynamicViewportSizeUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA6731920C754B1003CB401 /* DynamicViewportSizeUpdate.h */; };
                2DA944A01884E4F000ED86DB /* WebIOSEventFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA944991884E4F000ED86DB /* WebIOSEventFactory.h */; };
                2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9449D1884E4F000ED86DB /* GestureTypes.h */; };
-               2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */; };
-               2DA944AF1884E9BA00ED86DB /* WebPageProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */; };
-               2DA944B01884E9BA00ED86DB /* WebProcessProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */; };
                2DABA7721A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7711A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h */; };
                2DABA7741A817EE600EF0F1A /* WKPluginLoadPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7731A817EE600EF0F1A /* WKPluginLoadPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DABA7761A82B42100EF0F1A /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7751A82B42100EF0F1A /* APIHistoryClient.h */; };
                2DACE64E18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */; };
                2DAF06D618BD1A470081CEB1 /* SmartMagnificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DAF06D418BD1A470081CEB1 /* SmartMagnificationController.h */; };
-               2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF06D518BD1A470081CEB1 /* SmartMagnificationController.mm */; };
-               2DAF4FFB1B636181006013D6 /* ViewGestureController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAF4FFA1B636181006013D6 /* ViewGestureController.cpp */; };
                2DC6D9C318C44A610043BAD4 /* WKWebViewContentProviderRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DC6D9C118C44A610043BAD4 /* WKWebViewContentProviderRegistry.h */; };
-               2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC6D9C218C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm */; };
                2DD12A081A8177F3002C74E6 /* WKPageRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD12A071A8177F3002C74E6 /* WKPageRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DD45ADE1E5F8972006C355F /* InputViewUpdateDeferrer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD45ADC1E5F8972006C355F /* InputViewUpdateDeferrer.h */; };
-               2DD45ADF1E5F8972006C355F /* InputViewUpdateDeferrer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD45ADD1E5F8972006C355F /* InputViewUpdateDeferrer.mm */; };
                2DD5A7291EBF08D5009BA597 /* VisibleWebPageCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD5A7281EBF08D5009BA597 /* VisibleWebPageCounter.h */; };
                2DD5A72B1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */; };
                2DD5E129210ADC7B00DB6012 /* WKKeyboardScrollingAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD5E127210ADC7A00DB6012 /* WKKeyboardScrollingAnimator.h */; };
                2DD67A2E1BD819730053B251 /* APIFindMatchesClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD67A2D1BD819730053B251 /* APIFindMatchesClient.h */; };
                2DD67A351BD861060053B251 /* WKTextFinderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD67A331BD861060053B251 /* WKTextFinderClient.h */; };
-               2DD67A361BD861060053B251 /* WKTextFinderClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DD67A341BD861060053B251 /* WKTextFinderClient.mm */; };
                2DD9EB2D1A6F012500BB1267 /* APINavigationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DD9EB2C1A6F012500BB1267 /* APINavigationClient.h */; };
                2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDE0AF818298CC900F97EAA /* RemoteLayerTreePropertyApplier.h */; };
                2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DDF731318E95060004F5A66 /* RemoteLayerBackingStoreCollection.h */; };
                2DEAC5CF1AC368BB00A195D8 /* _WKFindOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DEAC5CE1AC368BB00A195D8 /* _WKFindOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF0C4912B16334008E49E2 /* ArgumentCodersCF.cpp */; };
                2DF6FE52212E110900469030 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
-               2DF9593B18A42412009785A1 /* ViewGestureControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF9593418A42412009785A1 /* ViewGestureControllerIOS.mm */; };
                2DF9EEE51A781FB400B6CFBE /* APIFrameInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */; };
                2DF9EEE61A781FB400B6CFBE /* APIFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */; };
                2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */; };
                2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */; };
                2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */; };
                2DFC7DBB1BCCC19500C1548C /* WebViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */; };
-               2DFC7DBC1BCCC19500C1548C /* WebViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */; };
                2DFF7B6F1DA4CFAF00814614 /* WKBackForwardListItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DFF7B6E1DA4CFAF00814614 /* WKBackForwardListItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               2E16B6CE2017B7AD008996D6 /* WKFocusedFormControlView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E16B6CC2017B7AB008996D6 /* WKFocusedFormControlView.mm */; };
                2E16B6CF2017B7AD008996D6 /* WKFocusedFormControlView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E16B6CD2017B7AC008996D6 /* WKFocusedFormControlView.h */; };
                2E5C770E1FA7D429005932C3 /* APIAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E5C770C1FA7D429005932C3 /* APIAttachment.h */; };
                2E5C770F1FA7D429005932C3 /* APIAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E5C770D1FA7D429005932C3 /* APIAttachment.cpp */; };
                2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
                2E94FC1620351A6D00974BA0 /* WKDatePickerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E94FC1420351A6D00974BA0 /* WKDatePickerViewController.h */; };
-               2E94FC1720351A6D00974BA0 /* WKDatePickerViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E94FC1520351A6D00974BA0 /* WKDatePickerViewController.mm */; };
                2EA7B3D12026CEF8009CE5AC /* WKNumberPadViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EA7B3CF2026CEF8009CE5AC /* WKNumberPadViewController.h */; };
-               2EA7B3D22026CEF8009CE5AC /* WKNumberPadViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EA7B3D02026CEF8009CE5AC /* WKNumberPadViewController.mm */; };
                2EA7B3D52026CF23009CE5AC /* WKNumberPadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EA7B3D32026CF23009CE5AC /* WKNumberPadView.h */; };
-               2EA7B3D62026CF23009CE5AC /* WKNumberPadView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EA7B3D42026CF23009CE5AC /* WKNumberPadView.mm */; };
                2EB6FC01203021960017E619 /* WKTimePickerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2EB6FBFF203021960017E619 /* WKTimePickerViewController.h */; };
-               2EB6FC02203021960017E619 /* WKTimePickerViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EB6FC00203021960017E619 /* WKTimePickerViewController.mm */; };
                2F8336861FA139DF00C6E080 /* TouchBarMenuData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FD43B911FA006A10083F51C /* TouchBarMenuData.h */; };
                310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
                312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */; };
                31312621148FF82C00BA2A39 /* WebNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261C148FF82B00BA2A39 /* WebNotificationManager.h */; };
-               3157135E2040A9B20084F9CF /* SystemPreviewControllerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3157135C2040A9B20084F9CF /* SystemPreviewControllerCocoa.mm */; };
                3157135F2040A9B20084F9CF /* SystemPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3157135D2040A9B20084F9CF /* SystemPreviewController.h */; };
-               316B8B632054B55800BD4A62 /* WKSystemPreviewView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316B8B612054B55800BD4A62 /* WKSystemPreviewView.mm */; };
                316B8B642054B55800BD4A62 /* WKSystemPreviewView.h in Headers */ = {isa = PBXBuildFile; fileRef = 316B8B622054B55800BD4A62 /* WKSystemPreviewView.h */; };
                317FE7C51C487A6C00A0CA89 /* APIExperimentalFeature.h in Headers */ = {isa = PBXBuildFile; fileRef = 317FE7C21C487A6600A0CA89 /* APIExperimentalFeature.h */; };
                317FE7C61C487A7100A0CA89 /* APIExperimentalFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 317FE7C11C487A6600A0CA89 /* APIExperimentalFeature.cpp */; };
                317FE7CD1C487DAE00A0CA89 /* _WKExperimentalFeatureInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 317FE7C91C487D9D00A0CA89 /* _WKExperimentalFeatureInternal.h */; };
                317FE7CE1C487DB800A0CA89 /* _WKExperimentalFeature.mm in Sources */ = {isa = PBXBuildFile; fileRef = 317FE7C81C487D9D00A0CA89 /* _WKExperimentalFeature.mm */; };
                317FE7CF1C487DBD00A0CA89 /* _WKExperimentalFeature.h in Headers */ = {isa = PBXBuildFile; fileRef = 317FE7C71C487D9D00A0CA89 /* _WKExperimentalFeature.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               318A1F05204F4764003480BC /* SystemPreviewController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318A1F04204F4764003480BC /* SystemPreviewController.cpp */; };
                318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17014743DB100A8FBB2 /* WKNotificationManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                318BE17514743DD700A8FBB2 /* WKNotificationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE17414743DD600A8FBB2 /* WKNotificationManager.cpp */; };
                318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE17614743E6000A8FBB2 /* WKNotification.cpp */; };
                318BE17914743E6F00A8FBB2 /* WKNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17814743E6A00A8FBB2 /* WKNotification.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC41148997BE00810D71 /* WebNotification.cpp */; };
                31A2EC49148997C200810D71 /* WebNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC42148997BE00810D71 /* WebNotification.h */; };
-               31A2EC4A148997C200810D71 /* WebNotificationManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC43148997BE00810D71 /* WebNotificationManagerProxy.cpp */; };
                31A2EC4B148997C200810D71 /* WebNotificationManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC44148997BF00810D71 /* WebNotificationManagerProxy.h */; };
-               31A2EC4D148997C200810D71 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC46148997C000810D71 /* WebNotificationProvider.cpp */; };
                31A2EC4E148997C200810D71 /* WebNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC47148997C100810D71 /* WebNotificationProvider.h */; };
-               31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC4F1489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp */; };
                31A2EC521489981900810D71 /* NotificationPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC511489981500810D71 /* NotificationPermissionRequestManagerProxy.h */; };
                31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC531489982500810D71 /* NotificationPermissionRequest.h */; };
                31A2EC74148D59CA00810D71 /* WKNotificationPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A2EC72148D59BB00810D71 /* WKNotificationPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
                31A2EC77148D662E00810D71 /* WKNotificationPermissionRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A2EC75148D65BB00810D71 /* WKNotificationPermissionRequest.cpp */; };
-               31A505F91680025500A930EB /* WebContextClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A505F71680025500A930EB /* WebContextClient.cpp */; };
                31A505FA1680025500A930EB /* WebContextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A505F81680025500A930EB /* WebContextClient.h */; };
-               31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31A67E0A165B2A99006CBA66 /* PlugInAutoStartProvider.cpp */; };
                31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 31A67E0B165B2A99006CBA66 /* PlugInAutoStartProvider.h */; };
                31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31BA9248148830810062EDB5 /* WebNotificationManagerMessageReceiver.cpp */; };
                31BA924E148831260062EDB5 /* WebNotificationManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BA9249148830810062EDB5 /* WebNotificationManagerMessages.h */; };
                330934491315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934451315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp */; };
                3309344A1315B9220097A7BC /* WebCookieManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934461315B9220097A7BC /* WebCookieManagerProxyMessages.h */; };
                330934501315B94D0097A7BC /* WebCookieManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3309344D1315B94D0097A7BC /* WebCookieManager.h */; };
-               330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934521315B9750097A7BC /* WebCookieManagerProxy.cpp */; };
                330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934531315B9750097A7BC /* WebCookieManagerProxy.h */; };
                3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934581315B9980097A7BC /* WKCookieManager.cpp */; };
                3309345B1315B9980097A7BC /* WKCookieManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934591315B9980097A7BC /* WKCookieManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3336763A130C99DC006C9DE2 /* WKResourceCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33367638130C99DC006C9DE2 /* WKResourceCacheManager.cpp */; };
                3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */; };
                33AA1067131F060000D4A575 /* WebCookieManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 33AA1065131F060000D4A575 /* WebCookieManagerProxyClient.h */; };
                370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 370F34A01829BE1E009027C8 /* WKNavigationData.mm */; };
                370F34A31829BE1E009027C8 /* WKNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = 370F34A11829BE1E009027C8 /* WKNavigationData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079818F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h */; };
                3769079E18F340A2001DFF04 /* APIInjectedBundleFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3769079C18F340A2001DFF04 /* APIInjectedBundleFormClient.h */; };
                37694525184FC6B600CDE21F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
-               37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
                377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
                3775122F1DF0DC8B008A351C /* WKWebProcessPlugInEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3775122E1DF0DC8B008A351C /* WKWebProcessPlugInEditingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                377512311DF0DEE2008A351C /* APIInjectedBundleEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 377512301DF0DEE2008A351C /* APIInjectedBundleEditorClient.h */; };
                3F418EFB1887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF71887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp */; };
                3F87B9BE158940190090FF62 /* WebColorChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F87B9BB15893F630090FF62 /* WebColorChooser.h */; };
                3F87B9C0158940D80090FF62 /* WebColorPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F87B9BF158940D80090FF62 /* WebColorPicker.h */; };
-               3F915C101F564DEE00183CE9 /* WKFullScreenWindowControllerIOS.mm in Headers */ = {isa = PBXBuildFile; fileRef = 3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */; };
                3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FB08E421F60B240005E5312 /* iOS.xcassets */; };
                3FFDDB961F577F480050E593 /* WKFullScreenWindowControllerIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F915C0F1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.h */; };
-               3FFDDB971F5780E10050E593 /* WKFullScreenWindowControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */; };
                410482CE1DDD324F00F006D0 /* RTCNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 410482CC1DDD2FB500F006D0 /* RTCNetwork.h */; };
                4112EDDB20E407A500BEA92A /* com.apple.BocomSubmitCtrl.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4112EDD920E4077500BEA92A /* com.apple.BocomSubmitCtrl.sb */; };
                4112EDDC20E407A500BEA92A /* com.apple.NPSafeInput.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4112EDD820E4077500BEA92A /* com.apple.NPSafeInput.sb */; };
                414DD37920BF43F5006959FB /* com.cisco.webex.plugin.gpc64.sb in Resources */ = {isa = PBXBuildFile; fileRef = 414DD37820BF43EA006959FB /* com.cisco.webex.plugin.gpc64.sb */; };
                414DD37A20BF49A5006959FB /* com.cisco.webex.plugin.gpc64.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 414DD37820BF43EA006959FB /* com.cisco.webex.plugin.gpc64.sb */; };
                414DEDD71F9EDDE50047C40D /* ServiceWorkerProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 414DEDD51F9EDDDF0047C40D /* ServiceWorkerProcessProxy.h */; };
-               414DEDD81F9EDDE50047C40D /* ServiceWorkerProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 414DEDD61F9EDDE00047C40D /* ServiceWorkerProcessProxy.cpp */; };
                4157E4B020E2ECDF00A6C0D7 /* com.google.o1dbrowserplugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4157E4AF20E2EC9800A6C0D7 /* com.google.o1dbrowserplugin.sb */; };
                41897ED11F415D680016FA42 /* WebCacheStorageConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 41897ECD1F415D5C0016FA42 /* WebCacheStorageConnection.h */; };
                41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 41897ED21F415D850016FA42 /* CacheStorageEngine.h */; };
                463FD4801EB9459600A2982C /* WKProcessTerminationReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 463FD47F1EB9458400A2982C /* WKProcessTerminationReason.h */; settings = {ATTRIBUTES = (Private, ); }; };
                463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 463FD4811EB94EAD00A2982C /* ProcessTerminationReason.h */; };
                466BC03C1FA266DA002FA9C1 /* WebSWContextManagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 466BC0391FA266C9002FA9C1 /* WebSWContextManagerConnection.h */; };
-               46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */; };
                46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */; };
                46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */; };
-               4A3CC18A19B063E700D14AEF /* UserMediaPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */; };
                4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
-               4A3CC18C19B0641500D14AEF /* UserMediaPermissionRequestProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3B19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.cpp */; };
                4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */; };
                4A3CC18E19B07B8500D14AEF /* WKUserMediaPermissionRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */; };
                4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
                511F7D411EB1BCF500E47B83 /* WebsiteDataStoreParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F7D401EB1BCEE00E47B83 /* WebsiteDataStoreParameters.h */; };
                511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
                511F8A81138B485D00A95F44 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
-               5120C8311E54EDDE0025B250 /* LocalStorageDatabaseTrackerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5120C8301E54E2650025B250 /* LocalStorageDatabaseTrackerIOS.mm */; };
                5120C8351E5B74B90025B250 /* _WKWebsiteDataStoreConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 5120C8331E5B71570025B250 /* _WKWebsiteDataStoreConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5120C8361E5B74BE0025B250 /* _WKWebsiteDataStoreConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5120C8341E5B71570025B250 /* _WKWebsiteDataStoreConfiguration.mm */; };
                512127C41908239A00DAF35C /* WebPasteboardOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 512127C21908239A00DAF35C /* WebPasteboardOverrides.h */; };
                512935E41288D97800A4B695 /* InjectedBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */; };
                512E34E4130B4D0500ABD19A /* WKApplicationCacheManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */; };
                512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F588E12A8838800629530 /* AuthenticationChallengeProxy.cpp */; };
                512F589712A8838800629530 /* AuthenticationChallengeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F588F12A8838800629530 /* AuthenticationChallengeProxy.h */; };
-               512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F589012A8838800629530 /* AuthenticationDecisionListener.cpp */; };
                512F589912A8838800629530 /* AuthenticationDecisionListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F589112A8838800629530 /* AuthenticationDecisionListener.h */; };
-               512F589A12A8838800629530 /* WebCredential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F589212A8838800629530 /* WebCredential.cpp */; };
                512F589B12A8838800629530 /* WebCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F589312A8838800629530 /* WebCredential.h */; };
-               512F589C12A8838800629530 /* WebProtectionSpace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F589412A8838800629530 /* WebProtectionSpace.cpp */; };
                512F589D12A8838800629530 /* WebProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F589512A8838800629530 /* WebProtectionSpace.h */; };
                512F58A212A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512F58A012A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp */; };
                512F58A312A883AD00629530 /* AuthenticationManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58A112A883AD00629530 /* AuthenticationManagerMessages.h */; };
                513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; };
                513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */; };
                513E462D1AD837560016234A /* WKSharingServicePickerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */; };
-               513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */; };
-               513FFB8C201459B0002596EA /* UIMessagePortChannelProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513FFB8A201459A7002596EA /* UIMessagePortChannelProvider.cpp */; };
                513FFB8D201459B0002596EA /* UIMessagePortChannelProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 513FFB8B201459A7002596EA /* UIMessagePortChannelProvider.h */; };
                513FFB91201459C6002596EA /* WebMessagePortChannelProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 513FFB8F201459C2002596EA /* WebMessagePortChannelProvider.h */; };
                514129941C6428BB0059E714 /* WebIDBConnectionToServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 514129921C6428100059E714 /* WebIDBConnectionToServer.h */; };
                514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */; };
                514D9F5719119D35000063A7 /* ServicesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 514D9F5519119D35000063A7 /* ServicesController.h */; };
-               514D9F5819119D35000063A7 /* ServicesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514D9F5619119D35000063A7 /* ServicesController.mm */; };
                515262BC1FB9515D0070E579 /* WebSWServerToContextConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 515262BB1FB951310070E579 /* WebSWServerToContextConnectionMessages.h */; };
                515262BD1FB951610070E579 /* WebSWServerToContextConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515262BA1FB951310070E579 /* WebSWServerToContextConnectionMessageReceiver.cpp */; };
                51578B831209ECEF00A37C4A /* APIData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* APIData.h */; };
                515BE1791D53FE8F00DD7C68 /* WebGamepadProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1741D53FDDC00DD7C68 /* WebGamepadProvider.h */; };
-               515BE1A81D55293400DD7C68 /* UIGamepadProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1A41D55292800DD7C68 /* UIGamepadProvider.cpp */; };
                515BE1A91D55293400DD7C68 /* UIGamepadProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1A51D55292800DD7C68 /* UIGamepadProvider.h */; };
                515BE1AB1D555AA000DD7C68 /* WebGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1A01D550AB000DD7C68 /* WebGamepad.h */; };
                515BE1B31D5902DD00DD7C68 /* GamepadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1B01D59006900DD7C68 /* GamepadData.h */; };
-               515BE1B41D5917FF00DD7C68 /* UIGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1AC1D555C5100DD7C68 /* UIGamepad.cpp */; };
                515BE1B51D5917FF00DD7C68 /* UIGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1AD1D555C5100DD7C68 /* UIGamepad.h */; };
-               515BE1B71D5A94FD00DD7C68 /* UIGamepadProviderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 515BE1B61D5A94F900DD7C68 /* UIGamepadProviderMac.mm */; };
-               515C415C207D7CAE00726E02 /* SuspendedPageProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515C415A207D74E000726E02 /* SuspendedPageProxy.cpp */; };
                515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; };
                5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
                5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
                516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* APIError.h */; };
                5179556A162876F300FA43B6 /* NetworkProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7E016138E2900D03ED3 /* NetworkProcess.h */; };
-               5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7EA16138E7200D03ED3 /* NetworkProcessProxy.cpp */; };
                5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7EB16138E7200D03ED3 /* NetworkProcessProxy.h */; };
                517A52D81F43A9DA00DCDC0A /* WebSWServerConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517A52D71F43A9B600DCDC0A /* WebSWServerConnectionMessageReceiver.cpp */; };
                517A52D91F43A9DA00DCDC0A /* WebSWServerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A52D61F43A9B600DCDC0A /* WebSWServerConnectionMessages.h */; };
                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
                517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
                517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
-               517DD5BE180DA7D30081660B /* StorageProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* StorageProcessProxy.cpp */; };
                517DD5BF180DA7D30081660B /* StorageProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* StorageProcessProxy.h */; };
                5185430E1FB6816100478F95 /* WebSWServerToContextConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5185430D1FB680FA00478F95 /* WebSWServerToContextConnection.cpp */; };
                51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 51871B5A127CB89D00F76232 /* WebContextMenu.h */; };
                518D2CAE12D5153B003BB93B /* WebBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */; };
                518E8EF916B2091C00E91429 /* AuthenticationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8EF416B2091C00E91429 /* AuthenticationManager.h */; };
                51933DEF1965EB31008AC3EA /* MenuUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51933DEB1965EB24008AC3EA /* MenuUtilities.h */; };
-               51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */; };
                51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */; };
                51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A55600128C6D92009ABCEC /* WKContextMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51A728DE1B1BAD3800102EEE /* WKBundleNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A728DC1B1BAD2D00102EEE /* WKBundleNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
-               51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */; };
                51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */; };
                51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */; };
                51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */; };
-               51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */; };
                51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B15A8313843A3900321AD8 /* EnvironmentUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51BEB62C1F3A5AD7005029B9 /* WebServiceWorkerProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BEB62A1F3A5ACD005029B9 /* WebServiceWorkerProvider.h */; };
                51C0C9741DDD76000032CAD3 /* IconLoadingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9721DDD74F00032CAD3 /* IconLoadingDelegate.h */; };
-               51C0C9751DDD76030032CAD3 /* IconLoadingDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51C0C9731DDD74F00032CAD3 /* IconLoadingDelegate.mm */; };
                51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
                51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5F1B34B9C900142CA5 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Public, ); }; };
                51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C601B34B9C900142CA5 /* WKSecurityOrigin.mm */; };
                51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C611B34B9C900142CA5 /* WKSecurityOriginInternal.h */; };
-               51D124281E6D3F5D002B2820 /* WebURLSchemeHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D124241E6D3CC3002B2820 /* WebURLSchemeHandler.cpp */; };
-               51D124331E6DE6CA002B2820 /* WebURLSchemeHandlerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124321E6DE521002B2820 /* WebURLSchemeHandlerCocoa.mm */; };
                51D124341E6DF643002B2820 /* WKURLSchemeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D1242D1E6DDDD7002B2820 /* WKURLSchemeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
                51D124351E6DF652002B2820 /* WKURLSchemeTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D1242F1E6DDDD7002B2820 /* WKURLSchemeTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
                51D124361E6DFB39002B2820 /* WKURLSchemeTask.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124301E6DDDD7002B2820 /* WKURLSchemeTask.mm */; };
                51D124991E763C01002B2820 /* WKHTTPCookieStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D124841E734AE3002B2820 /* WKHTTPCookieStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
                51D130541382EAC000351EDD /* SecItemRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D130501382EAC000351EDD /* SecItemRequestData.h */; };
                51D130561382EAC000351EDD /* SecItemResponseData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D130521382EAC000351EDD /* SecItemResponseData.h */; };
-               51D130581382F10500351EDD /* WebProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D130571382F10500351EDD /* WebProcessProxyMac.mm */; };
                51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */; };
                51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */; };
                51E351CB180F2CCC00E53BE9 /* IDBUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E351C9180F2CCC00E53BE9 /* IDBUtilities.h */; };
                51E35200180F5D0F00E53BE9 /* StorageToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* StorageToWebProcessConnection.cpp */; };
                51E35202180F5D1E00E53BE9 /* StorageProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */; };
                51E35209180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* StorageServiceEntryPoint.mm */; };
-               51E399061D6F54C7009C8831 /* UIGamepadProviderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */; };
-               51E6C1601F29356000FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C15F1F29355100FD3437 /* ResourceLoadStatisticsPersistentStorageIOS.mm */; };
-               51E6C1631F2935D800FD3437 /* ResourceLoadStatisticsPersistentStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E6C1621F2935CD00FD3437 /* ResourceLoadStatisticsPersistentStorage.cpp */; };
                51E6C1641F2935DD00FD3437 /* ResourceLoadStatisticsPersistentStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E6C1611F2935CD00FD3437 /* ResourceLoadStatisticsPersistentStorage.h */; };
-               51E8B68E1E712877001B7132 /* WebURLSchemeTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E8B68D1E712873001B7132 /* WebURLSchemeTask.cpp */; };
-               51E949971D76211300EC9EB9 /* UIGamepadProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */; };
                51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */; };
                51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
                5272D4CA1E735F0900EB4290 /* WKProtectionSpaceNS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5272D4C81E735F0900EB4290 /* WKProtectionSpaceNS.mm */; };
                528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                52D5A1B01C57495A00DE34A3 /* VideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 52D5A1AA1C57494E00DE34A3 /* VideoFullscreenManagerProxy.h */; };
-               52D5A1B11C57496200DE34A3 /* VideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1AC1C57494E00DE34A3 /* VideoFullscreenManagerProxy.mm */; };
                52F060E11654318500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */; };
                5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */; };
                5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */; };
                53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */; };
                53DEA3661DDE423100E82648 /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 53DEA3651DDE422E00E82648 /* json.hpp */; };
                570AB8F320AE3BD700B8BE87 /* SecKeyProxyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */; };
-               570AB90220B2517400B8BE87 /* AuthenticationChallengeProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 570AB90020B2517400B8BE87 /* AuthenticationChallengeProxyCocoa.mm */; };
-               570AB90420B2541D00B8BE87 /* SecKeyProxyStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 570AB90320B2541C00B8BE87 /* SecKeyProxyStore.mm */; };
-               575075A820AB8DE100693EA9 /* WebCredentialMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 575075A720AB763600693EA9 /* WebCredentialMac.mm */; };
-               57608298202BD8BA00116678 /* WebCredentialsMessengerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57608296202BD8BA00116678 /* WebCredentialsMessengerProxy.cpp */; };
                5760829C202D2C3C00116678 /* WebCredentialsMessengerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5760829020298FBD00116678 /* WebCredentialsMessengerMessageReceiver.cpp */; };
                5760829D202D2C4000116678 /* WebCredentialsMessengerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 5760828F20298FBD00116678 /* WebCredentialsMessengerMessages.h */; };
                5760829E202D2C4300116678 /* WebCredentialsMessengerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5760829A202BEE5A00116678 /* WebCredentialsMessengerProxyMessageReceiver.cpp */; };
                5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
                5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */; };
                5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               5C6CE6D11F59BC7A0007C6CB /* PageClientImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */; };
                5C8DD37E1FE4502000F2A556 /* APIWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */; };
                5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */; };
                5C9E56821DF7F1AB00C9EE33 /* WKWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9E56801DF7F05500C9EE33 /* WKWebsitePolicies.cpp */; };
                5C9E56831DF7F1B300C9EE33 /* WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5CA9854A210BEB640057EB6B /* SafeBrowsingResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA98549210BEB5A0057EB6B /* SafeBrowsingResult.h */; };
-               5CA9854C210BEB7D0057EB6B /* SafeBrowsingResultCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CA9854B210BEB730057EB6B /* SafeBrowsingResultCocoa.mm */; };
                5CB2378B1DF0DE5300117AA3 /* _WKWebsitePolicies.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB2378A1DF0DD4300117AA3 /* _WKWebsitePolicies.mm */; };
                5CB2378C1DF0DE6E00117AA3 /* _WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB237891DF0DD4300117AA3 /* _WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5CB2378E1DF0E0D300117AA3 /* _WKWebsitePoliciesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB2378D1DF0E0C200117AA3 /* _WKWebsitePoliciesInternal.h */; };
                65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6A5080BF1F0EDAAA00E617C5 /* WKWindowFeaturesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A5080BE1F0EDAAA00E617C5 /* WKWindowFeaturesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6B821DDC1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B821DDA1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.h */; };
-               6B821DDD1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B821DDB1EEF05DD00D7AF4A /* WebResourceLoadStatisticsTelemetry.cpp */; };
                6BE969C11E54D452008B7483 /* corePrediction_model in Resources */ = {isa = PBXBuildFile; fileRef = 6BE969C01E54D452008B7483 /* corePrediction_model */; };
                6BE969CB1E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE969C91E54D4CF008B7483 /* ResourceLoadStatisticsClassifierCocoa.h */; };
                6BE969CD1E54E054008B7483 /* ResourceLoadStatisticsClassifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BE969CC1E54E054008B7483 /* ResourceLoadStatisticsClassifier.h */; };
                6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
-               728E86F21795188C0087879E /* WebColorPickerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 728E86F01795188C0087879E /* WebColorPickerMac.mm */; };
                753E3E0E1887398900188496 /* SessionTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 753E3E091887394B00188496 /* SessionTracker.h */; };
                75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
                75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */; };
                7A772C8D1DDD4A25000F34F1 /* com.apple.WebKit.plugin-common.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */; };
                7A791EFA1C7CFCF100C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A791EF91C7CFB3700C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp */; };
                7A791EFB1C7CFD0100C4C52B /* WebResourceLoadStatisticsStoreMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A791EF81C7CFB1000C4C52B /* WebResourceLoadStatisticsStoreMessages.h */; };
-               7A791EFC1C7D08C500C4C52B /* WebResourceLoadStatisticsStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */; };
-               7A821F4A1E2F65E900604577 /* LegacyCustomProtocolManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F491E2F65DD00604577 /* LegacyCustomProtocolManagerProxy.cpp */; };
                7A821F4C1E2F673900604577 /* LegacyCustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4B1E2F664800604577 /* LegacyCustomProtocolManagerClient.h */; };
-               7A821F4E1E2F67A800604577 /* LegacyCustomProtocolManagerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F4D1E2F679E00604577 /* LegacyCustomProtocolManagerClient.mm */; };
                7A821F501E2F7A7500604577 /* APICustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */; };
                7A8A9D581EF119B0009801AE /* APIInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A8A9D571EF119AA009801AE /* APIInjectedBundleClient.h */; };
                7A8A9D5A1EF13029009801AE /* APIInjectedBundleBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A8A9D591EF13020009801AE /* APIInjectedBundleBundleClient.h */; };
                7C2413051AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413041AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h */; };
                7C2413081AACFCB400A58C15 /* WKUserContentExtensionStoreRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C2413061AACFCB400A58C15 /* WKUserContentExtensionStoreRef.cpp */; };
                7C2413091AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413071AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7C361D721927FA360036A59D /* WebScriptMessageHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C361D6F1927FA360036A59D /* WebScriptMessageHandler.cpp */; };
                7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C361D701927FA360036A59D /* WebScriptMessageHandler.h */; };
                7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C361D76192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp */; };
                7C361D79192803BD0036A59D /* WebUserContentControllerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C361D77192803BD0036A59D /* WebUserContentControllerProxyMessages.h */; };
                7C3F8C91173AF52D007B7F39 /* PluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C3F8C8F173AF52D007B7F39 /* PluginInformation.h */; };
                7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694C71A4B4EA000AD5845 /* WebPasteboardProxyMessageReceiver.cpp */; };
                7C4694CA1A4B4EA100AD5845 /* WebPasteboardProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694C81A4B4EA100AD5845 /* WebPasteboardProxyMessages.h */; };
-               7C4694CC1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694CB1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm */; };
-               7C4694D01A51E36800AD5845 /* WebPasteboardProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4694CD1A51E36800AD5845 /* WebPasteboardProxy.cpp */; };
                7C4694D11A51E36800AD5845 /* WebPasteboardProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4694CE1A51E36800AD5845 /* WebPasteboardProxy.h */; };
                7C4ABED11AA8E9F00088AA37 /* WebCompiledContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ABECF1AA8E9F00088AA37 /* WebCompiledContentRuleList.h */; };
                7C4ABED51AA8FCB80088AA37 /* WebCompiledContentRuleListData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ABED31AA8FCB80088AA37 /* WebCompiledContentRuleListData.h */; };
                7CBB81201AA0F970006B1942 /* WKBundleFileHandleRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CBB811E1AA0F970006B1942 /* WKBundleFileHandleRef.cpp */; };
                7CBB81211AA0F970006B1942 /* WKBundleFileHandleRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811F1AA0F970006B1942 /* WKBundleFileHandleRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC99A3518EF7CBC0048C8B4 /* WKScriptMessageInternal.h */; };
-               7CCCC8FA1A5F50FD008FB0DA /* WebNavigationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CCCC8F81A5F50FD008FB0DA /* WebNavigationState.cpp */; };
                7CCCC8FB1A5F50FD008FB0DA /* WebNavigationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CCCC8F91A5F50FD008FB0DA /* WebNavigationState.h */; };
                7CD102DA1866770600ED429D /* AutoCorrectionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD102D91866770600ED429D /* AutoCorrectionCallback.h */; };
                7CD3A4821A5D02FA009623B8 /* APINavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD3A4801A5D02FA009623B8 /* APINavigation.cpp */; };
                7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBD1746B04C000C1C45 /* WKTypeRefWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7CD622781739D863005BD7FF /* PluginSandboxProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD622761739D863005BD7FF /* PluginSandboxProfile.h */; };
                7CE4D2071A46776100C7F152 /* APILegacyContextHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE4D2061A46775700C7F152 /* APILegacyContextHistoryClient.h */; };
-               7CE4D2161A49148400C7F152 /* WebProcessPoolCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CE4D2151A49148400C7F152 /* WebProcessPoolCocoa.mm */; };
-               7CE4D21A1A4914A300C7F152 /* WebProcessPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE4D2171A4914A300C7F152 /* WebProcessPool.cpp */; };
                7CE4D21B1A4914A300C7F152 /* WebProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE4D2181A4914A300C7F152 /* WebProcessPool.h */; };
                7CE4D21F1A4914CA00C7F152 /* APIProcessPoolConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE4D21D1A4914CA00C7F152 /* APIProcessPoolConfiguration.cpp */; };
                7CE4D2201A4914CA00C7F152 /* APIProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE4D21E1A4914CA00C7F152 /* APIProcessPoolConfiguration.h */; };
                832994A71F96F50200AC57B1 /* WebSWOriginStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832994A51F96F4FD00AC57B1 /* WebSWOriginStore.cpp */; };
                832994A81F96F50200AC57B1 /* WebSWOriginStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 832994A61F96F4FE00AC57B1 /* WebSWOriginStore.h */; };
                832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */; };
-               832ED18B1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832ED1891E2FE13B006BA64A /* PerActivityStateCPUUsageSampler.cpp */; };
                832ED18C1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 832ED18A1E2FE13B006BA64A /* PerActivityStateCPUUsageSampler.h */; };
                834B250F1A831A8D00CFB150 /* NetworkCacheFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */; };
                834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */; };
                836034A01ACB34D600626549 /* WebSQLiteDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360349E1ACB34D600626549 /* WebSQLiteDatabaseTracker.h */; };
                8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */; };
                8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */; };
                8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               837A660120E2AD8500A9DBD8 /* ResourceLoadStatisticsMemoryStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 837A660020E2AD8400A9DBD8 /* ResourceLoadStatisticsMemoryStoreCocoa.mm */; };
                83891B631A68B3420030F386 /* APIDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */; };
                83891B691A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B681A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */; };
-               83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83891B6B1A68C30B0030F386 /* DiagnosticLoggingClient.mm */; };
                839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 839149631BEA838500D2D953 /* NetworkLoadParameters.h */; };
                839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 839901FE1BE9A01B000F3653 /* NetworkLoad.h */; };
-               839A2F311E2067450039057E /* HighPerformanceGraphicsUsageSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */; };
                839A2F321E2067450039057E /* HighPerformanceGraphicsUsageSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */; };
                83A0ED351F747CCF003299EB /* PreconnectTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A0ED321F747CC6003299EB /* PreconnectTask.h */; };
-               83B3CB0F20E2AAFE00441E9B /* ResourceLoadStatisticsMemoryStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83681DCB20E2904B00C249CD /* ResourceLoadStatisticsMemoryStore.cpp */; };
                83B3CB1020E2AB0100441E9B /* ResourceLoadStatisticsMemoryStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 83681DCA20E2904A00C249CD /* ResourceLoadStatisticsMemoryStore.h */; };
                83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D454D61BE9D3C4006C93BD /* NetworkLoadClient.h */; };
                83EE575C1DB7D61100C74C50 /* WebValidationMessageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83EE575A1DB7D60600C74C50 /* WebValidationMessageClient.h */; };
                83F1A07A1F96E7790045B94E /* WebSWOriginTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F1A0781F96E7710045B94E /* WebSWOriginTable.h */; };
                83F9644E1FA0F76E00C47750 /* SharedStringHashTableReadOnly.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F9644C1FA0F76300C47750 /* SharedStringHashTableReadOnly.h */; };
                84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */ = {isa = PBXBuildFile; fileRef = 84477851176FCAC100CDC7BB /* InjectedBundleHitTestResultMediaType.h */; };
-               868160D0187645570021E79D /* WindowServerConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 868160CF187645370021E79D /* WindowServerConnection.mm */; };
                86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E67A21190F411800004AB7 /* ProcessThrottler.h */; };
-               86E67A261910B9D900004AB7 /* ProcessThrottler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86E67A22190F411800004AB7 /* ProcessThrottler.cpp */; };
-               86F9536418FF583C001DB2EF /* ProcessAssertionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 86F9536218FF550B001DB2EF /* ProcessAssertionIOS.mm */; };
                86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F9536018FF4FD4001DB2EF /* ProcessAssertion.h */; };
                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
                909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 905620E912BC248B000799B6 /* WebMemorySampler.h */; };
                9321D5861A38EE3C008052BE /* WKImmediateActionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D5851A38EE3C008052BE /* WKImmediateActionController.h */; };
-               9321D5881A38EE74008052BE /* WKImmediateActionController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9321D5871A38EE74008052BE /* WKImmediateActionController.mm */; };
                9321D58A1A38F196008052BE /* WKImmediateActionTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 9321D5891A38F196008052BE /* WKImmediateActionTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                933DF82E1B3BC09000AEA9E3 /* WKImagePreviewViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 933DF82D1B3BC09000AEA9E3 /* WKImagePreviewViewController.h */; };
-               933DF8301B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933DF82F1B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm */; };
                934B724419F5B9BE00AE96D6 /* WKActionMenuItemTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 934B724319F5B9BE00AE96D6 /* WKActionMenuItemTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                935EEB9E127761AC003322B8 /* WKBundleBackForwardList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935EEB951277616D003322B8 /* WKBundleBackForwardList.cpp */; };
                990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */; };
                990D28B21C65209400986977 /* _WKAutomationSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = 990D28AD1C65190400986977 /* _WKAutomationSession.mm */; };
                990D28BB1C6539D300986977 /* AutomationSessionClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28B71C6539A000986977 /* AutomationSessionClient.h */; };
-               990D28BC1C6539DA00986977 /* AutomationSessionClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 990D28B81C6539A000986977 /* AutomationSessionClient.mm */; };
                990D28C01C6553F100986977 /* APIAutomationSessionClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28B31C6526D400986977 /* APIAutomationSessionClient.h */; };
                99249AD51F1F1E5600B62FBB /* AutomationFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99249AD31F1F1E3300B62FBB /* AutomationFrontendDispatchers.cpp */; };
                99249AD61F1F1E5F00B62FBB /* AutomationFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 99249AD41F1F1E3300B62FBB /* AutomationFrontendDispatchers.h */; };
-               9946EF861E7B027000541E79 /* WebAutomationSessionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9946EF851E7B026600541E79 /* WebAutomationSessionIOS.mm */; };
-               994BADF31F7D781100B571E7 /* WKInspectorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 994BADF21F7D77EB00B571E7 /* WKInspectorViewController.mm */; };
                994BADF41F7D781400B571E7 /* WKInspectorViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 994BADF11F7D77EA00B571E7 /* WKInspectorViewController.h */; };
                995226D6207D184600F78420 /* SimulatedInputDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 995226D4207D184500F78420 /* SimulatedInputDispatcher.h */; };
-               995226D7207D184600F78420 /* SimulatedInputDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 995226D5207D184600F78420 /* SimulatedInputDispatcher.cpp */; };
                9955A6EC1C7980C200EB6A93 /* WebAutomationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6EB1C7980BB00EB6A93 /* WebAutomationSession.h */; };
-               9955A6ED1C7980CA00EB6A93 /* WebAutomationSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6EA1C7980BB00EB6A93 /* WebAutomationSession.cpp */; };
                9955A6EF1C79810800EB6A93 /* Automation.json in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6E91C7980BB00EB6A93 /* Automation.json */; settings = {ATTRIBUTES = (Private, ); }; };
                9955A6F41C7986DC00EB6A93 /* AutomationBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F01C79866400EB6A93 /* AutomationBackendDispatchers.cpp */; };
                9955A6F51C7986E000EB6A93 /* AutomationBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F11C79866400EB6A93 /* AutomationBackendDispatchers.h */; };
                9955A6F71C7986E500EB6A93 /* AutomationProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F31C79866400EB6A93 /* AutomationProtocolObjects.h */; };
                99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 99788AC91F421DCA00C08000 /* _WKAutomationSessionConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
                99788ACC1F421DE200C08000 /* _WKAutomationSessionConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */; };
-               99C3AE241DAD8E3700AF5C16 /* WebAutomationSessionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99C3AE231DAD8E3400AF5C16 /* WebAutomationSessionMac.mm */; };
-               99C3AE271DAD948900AF5C16 /* WebAutomationSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99C3AE261DAD948500AF5C16 /* WebAutomationSessionCocoa.mm */; };
                99C3AE2D1DADA6AD00AF5C16 /* WebAutomationSessionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C3AE2C1DADA6A700AF5C16 /* WebAutomationSessionMacros.h */; };
-               99C81D591C20E1E5005C4C82 /* AutomationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99C81D561C20DFBE005C4C82 /* AutomationClient.mm */; };
                99C81D5A1C20E7E2005C4C82 /* AutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D551C20DFBE005C4C82 /* AutomationClient.h */; };
                99C81D5D1C21F38B005C4C82 /* APIAutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D5B1C20E817005C4C82 /* APIAutomationClient.h */; };
                99E714C51C124A0400665B3A /* _WKAutomationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 99E714C11C1249E600665B3A /* _WKAutomationDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */; };
                9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */; };
                9FB5F395169E6A80002C25BF /* WKContextPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A102A7081EC0EEE900D81D82 /* com.macromedia.Flash Player ESR.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */; };
                A1046EA12079263100F0C5D8 /* WKPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = A1046E9F2079263100F0C5D8 /* WKPDFView.h */; };
-               A1046EA22079263100F0C5D8 /* WKPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1046EA02079263100F0C5D8 /* WKPDFView.mm */; };
                A105D0D1212734B20034F6C7 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = A105D0D0212734B10034F6C7 /* NetworkBlobRegistry.h */; };
                A11455AC211FCFCA00CA935B /* NetworkProximityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AA211FCFCA00CA935B /* NetworkProximityAssertion.h */; };
                A11455B0211FD25200CA935B /* NetworkProximityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AE211FD25200CA935B /* NetworkProximityManager.h */; };
-               A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */; };
                A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A118A9EF1907AD6F00F7C92B /* QuickLookDocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9ED1907AD6F00F7C92B /* QuickLookDocumentData.h */; };
                A118A9F21908B8EA00F7C92B /* _WKNSFileManagerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = A118A9F01908B8EA00F7C92B /* _WKNSFileManagerExtras.mm */; };
                A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9F11908B8EA00F7C92B /* _WKNSFileManagerExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A13B3DA2207F39DE0090C58D /* MobileWiFiSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A13B3DA1207F39DE0090C58D /* MobileWiFiSPI.h */; };
                A13DC682207AA6B20066EF72 /* WKApplicationStateTrackingView.h in Headers */ = {isa = PBXBuildFile; fileRef = A13DC680207AA6B20066EF72 /* WKApplicationStateTrackingView.h */; };
-               A13DC683207AA6B20066EF72 /* WKApplicationStateTrackingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A13DC681207AA6B20066EF72 /* WKApplicationStateTrackingView.mm */; };
-               A15EEDE51E301CEE000069B0 /* WKPasswordView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A15EEDE31E301CEE000069B0 /* WKPasswordView.mm */; };
                A15EEDE61E301CEE000069B0 /* WKPasswordView.h in Headers */ = {isa = PBXBuildFile; fileRef = A15EEDE41E301CEE000069B0 /* WKPasswordView.h */; };
                A182D5B51BE6BD250087A7CC /* AccessibilityIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */; };
                A19DD3C01D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = A19DD3BF1D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h */; };
                A1A4FE6118DD54A400B5EA8A /* _WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = A1A4FE6018DD54A400B5EA8A /* _WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A1C512C9190656E500448914 /* WebPreviewLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */; };
                A1D420471DB5578500BB6B0D /* WKContextMenuListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1EA02351DABFF7E0096021F /* WKContextMenuListener.cpp */; };
-               A1DF631218E0B7C8003A3E2A /* DownloadClient.mm in Sources */ = {isa = PBXBui