Attachment 349243 Details for Bug 189447 – Patch

[patch] Patch

bug-189447-20180907222555.patch (text/plain), 197.02 KB, created by Tim Horton on 2018-09-07 22:25:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-09-07 22:25:56 PDT

Size: 197.02 KB

patch

obsolete

>Subversion Revision: 235826
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f1393b29fbfb90dd8554a058eb726ef269dfcf08..13f5511030c89cd2da88042cd7c244c630abf3b0 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,42 @@
>+2018-09-07  Tim Horton  <timothy_horton@apple.com>
>+
>+        Unify most of the WebKit Objective-C API sources
>+        https://bugs.webkit.org/show_bug.cgi?id=189447
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Unify and fix errors.
>+
>+        * Shared/API/Cocoa/_WKFrameHandle.mm:
>+        * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
>+        * SourcesCocoa.txt:
>+        * UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm:
>+        * UIProcess/API/Cocoa/WKBackForwardList.mm:
>+        * UIProcess/API/Cocoa/WKBackForwardListItem.mm:
>+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
>+        * UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
>+        * UIProcess/API/Cocoa/WKConnection.mm:
>+        * UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm:
>+        * UIProcess/API/Cocoa/WKNavigationData.mm:
>+        * UIProcess/API/Cocoa/WKProcessGroup.mm:
>+        * UIProcess/API/Cocoa/WKURLSchemeTask.mm:
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
>+        * UIProcess/API/Cocoa/_WKAttachment.mm:
>+        * UIProcess/API/Cocoa/_WKGeolocationPosition.mm:
>+        * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm:
>+        * UIProcess/API/Cocoa/_WKThumbnailView.mm:
>+        * UIProcess/API/mac/WKView.mm:
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm:
>+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm:
>+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
>+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
>+
> 2018-09-07  Tim Horton  <timothy_horton@apple.com>
> 
>         Try to fix the build
>diff --git a/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.mm b/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.mm
>index 0a72fef2810721f8321ad9667a5db0d8f891ada5..c48031ceb891f798fb497573a7bd3abb82a1016a 100644
>--- a/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.mm
>+++ b/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.mm
>@@ -28,8 +28,6 @@
> 
> #if WK_API_ENABLED
> 
>-using namespace WebKit;
>-
> @implementation _WKFrameHandle {
>     API::ObjectStorage<API::FrameHandle> _frameHandle;
> }
>diff --git a/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm b/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
>index b64a33bd1bd16a37c8610ea22955d56ffb439cd8..ba65f79051193242868cf432a838a395cde51cff 100644
>--- a/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
>+++ b/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
>@@ -51,8 +51,6 @@ static const void* replyBlockKey = &replyBlockKey;
> 
> NSString * const invocationKey = @"invocation";
> 
>-using namespace WebKit;
>-
> struct PendingReply {
>     PendingReply() = default;
> 
>@@ -69,7 +67,7 @@ struct PendingReply {
> };
> 
> @implementation _WKRemoteObjectRegistry {
>-    std::unique_ptr<RemoteObjectRegistry> _remoteObjectRegistry;
>+    std::unique_ptr<WebKit::RemoteObjectRegistry> _remoteObjectRegistry;
> 
>     RetainPtr<NSMapTable> _remoteObjectProxies;
>     HashMap<String, std::pair<RetainPtr<id>, RetainPtr<_WKRemoteObjectInterface>>> _exportedObjects;
>@@ -111,7 +109,7 @@ struct PendingReply {
>     if (!(self = [super init]))
>         return nil;
> 
>-    _remoteObjectRegistry = std::make_unique<RemoteObjectRegistry>(self, page);
>+    _remoteObjectRegistry = std::make_unique<WebKit::RemoteObjectRegistry>(self, page);
> 
>     return self;
> }
>@@ -121,7 +119,7 @@ struct PendingReply {
>     if (!(self = [super init]))
>         return nil;
> 
>-    _remoteObjectRegistry = std::make_unique<RemoteObjectRegistry>(self, page);
>+    _remoteObjectRegistry = std::make_unique<WebKit::RemoteObjectRegistry>(self, page);
> 
>     return self;
> }
>@@ -140,7 +138,7 @@ static uint64_t generateReplyIdentifier()
> 
> - (void)_sendInvocation:(NSInvocation *)invocation interface:(_WKRemoteObjectInterface *)interface
> {
>-    std::unique_ptr<RemoteObjectInvocation::ReplyInfo> replyInfo;
>+    std::unique_ptr<WebKit::RemoteObjectInvocation::ReplyInfo> replyInfo;
> 
>     NSMethodSignature *methodSignature = invocation.methodSignature;
>     for (NSUInteger i = 0, count = methodSignature.numberOfArguments; i < count; ++i) {
>@@ -162,7 +160,7 @@ static uint64_t generateReplyIdentifier()
>         if (strcmp([NSMethodSignature signatureWithObjCTypes:replyBlockSignature].methodReturnType, "v"))
>             [NSException raise:NSInvalidArgumentException format:@"Return value of block argument must be 'void'. (%s)", sel_getName(invocation.selector)];
> 
>-        replyInfo = std::make_unique<RemoteObjectInvocation::ReplyInfo>(generateReplyIdentifier(), replyBlockSignature);
>+        replyInfo = std::make_unique<WebKit::RemoteObjectInvocation::ReplyInfo>(generateReplyIdentifier(), replyBlockSignature);
> 
>         // Replace the block object so we won't try to encode it.
>         id null = nullptr;
>@@ -179,7 +177,7 @@ static uint64_t generateReplyIdentifier()
>     if (!_remoteObjectRegistry)
>         return;
> 
>-    _remoteObjectRegistry->sendInvocation(RemoteObjectInvocation(interface.identifier, [encoder rootObjectDictionary], WTFMove(replyInfo)));
>+    _remoteObjectRegistry->sendInvocation(WebKit::RemoteObjectInvocation(interface.identifier, [encoder rootObjectDictionary], WTFMove(replyInfo)));
> }
> 
> - (WebKit::RemoteObjectRegistry&)remoteObjectRegistry
>@@ -187,7 +185,7 @@ static uint64_t generateReplyIdentifier()
>     return *_remoteObjectRegistry;
> }
> 
>-- (void)_invokeMethod:(const RemoteObjectInvocation&)remoteObjectInvocation
>+- (void)_invokeMethod:(const WebKit::RemoteObjectInvocation&)remoteObjectInvocation
> {
>     auto& interfaceIdentifier = remoteObjectInvocation.interfaceIdentifier();
>     auto* encodedInvocation = remoteObjectInvocation.encodedInvocation();
>@@ -264,7 +262,7 @@ static uint64_t generateReplyIdentifier()
>                 auto encoder = adoptNS([[WKRemoteObjectEncoder alloc] init]);
>                 [encoder encodeObject:invocation forKey:invocationKey];
> 
>-                remoteObjectRegistry->_remoteObjectRegistry->sendReplyBlock(replyID, UserData([encoder rootObjectDictionary]));
>+                remoteObjectRegistry->_remoteObjectRegistry->sendReplyBlock(replyID, WebKit::UserData([encoder rootObjectDictionary]));
>                 checker->didCallReplyBlock();
>             });
> 
>diff --git a/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp b/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
>index b2881b29e52bceaca21089313e0ea44b7de7871d..97072b03ccbe168e3f481c3981e81dd12d1acae2 100644
>--- a/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
>+++ b/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
>@@ -38,9 +38,8 @@
> #include "WebPageProxyMessages.h"
> #include <WebCore/AuthenticationChallenge.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> static uint64_t generateAuthenticationChallengeID()
> {
>diff --git a/Source/WebKit/Shared/cg/ShareableBitmapCG.cpp b/Source/WebKit/Shared/cg/ShareableBitmapCG.cpp
>index 41b2fea32b153f3bf4fef6592e29e23542e6545f..8626157f4075987556ad5279473f6cae0a1e6e9a 100644
>--- a/Source/WebKit/Shared/cg/ShareableBitmapCG.cpp
>+++ b/Source/WebKit/Shared/cg/ShareableBitmapCG.cpp
>@@ -34,9 +34,8 @@
> #include <wtf/RetainPtr.h>
> #include "CGUtilities.h"
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
>     
> static CGColorSpaceRef colorSpace(const ShareableBitmap::Configuration& configuration)
> {
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index 58b4ca1fed9d82e93336c27bc33a85a93f4f15b8..026da52e9ed83c4a8dbd4a8ce217f388d312998b 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -96,17 +96,17 @@ Shared/API/c/mac/WKURLResponseNS.mm
> Shared/API/c/mac/WKWebArchive.cpp
> Shared/API/c/mac/WKWebArchiveResource.cpp
> 
>-Shared/API/Cocoa/_WKFrameHandle.mm @no-unify
>-Shared/API/Cocoa/_WKHitTestResult.mm @no-unify
>-Shared/API/Cocoa/_WKNSFileManagerExtras.mm @no-unify
>-Shared/API/Cocoa/_WKNSWindowExtras.mm @no-unify
>-Shared/API/Cocoa/_WKRemoteObjectInterface.mm @no-unify
>-Shared/API/Cocoa/_WKRemoteObjectRegistry.mm @no-unify
>-Shared/API/Cocoa/RemoteObjectInvocation.mm @no-unify
>-Shared/API/Cocoa/RemoteObjectRegistry.mm @no-unify
>-Shared/API/Cocoa/WKBrowsingContextHandle.mm @no-unify
>-Shared/API/Cocoa/WKRemoteObject.mm @no-unify
>-Shared/API/Cocoa/WKRemoteObjectCoder.mm @no-unify
>+Shared/API/Cocoa/_WKFrameHandle.mm
>+Shared/API/Cocoa/_WKHitTestResult.mm
>+Shared/API/Cocoa/_WKNSFileManagerExtras.mm
>+Shared/API/Cocoa/_WKNSWindowExtras.mm
>+Shared/API/Cocoa/_WKRemoteObjectInterface.mm
>+Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
>+Shared/API/Cocoa/RemoteObjectInvocation.mm
>+Shared/API/Cocoa/RemoteObjectRegistry.mm
>+Shared/API/Cocoa/WKBrowsingContextHandle.mm
>+Shared/API/Cocoa/WKRemoteObject.mm
>+Shared/API/Cocoa/WKRemoteObjectCoder.mm
> 
> Shared/APIWebArchive.mm
> Shared/APIWebArchiveResource.mm
>@@ -228,73 +228,75 @@ UIProcess/API/C/mac/WKContextPrivateMac.mm
> UIProcess/API/C/mac/WKPagePrivateMac.mm
> UIProcess/API/C/mac/WKProtectionSpaceNS.mm
> 
>-UIProcess/API/Cocoa/_WKActivatedElementInfo.mm @no-unify
>-UIProcess/API/Cocoa/_WKApplicationManifest.mm @no-unify
>-UIProcess/API/Cocoa/_WKAttachment.mm @no-unify
>-UIProcess/API/Cocoa/_WKAutomationSession.mm @no-unify
>-UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm @no-unify
>-UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm @no-unify
>-UIProcess/API/Cocoa/_WKDownload.mm @no-unify
>-UIProcess/API/Cocoa/_WKElementAction.mm @no-unify
>-UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm @no-unify
>-UIProcess/API/Cocoa/_WKExperimentalFeature.mm @no-unify
>-UIProcess/API/Cocoa/_WKGeolocationPosition.mm @no-unify
>-UIProcess/API/Cocoa/_WKLinkIconParameters.mm @no-unify
>-UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm @no-unify
>-UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm @no-unify
>-UIProcess/API/Cocoa/_WKSessionState.mm @no-unify
>-UIProcess/API/Cocoa/_WKThumbnailView.mm @no-unify
>-UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm @no-unify
>-UIProcess/API/Cocoa/_WKUserContentFilter.mm @no-unify
>-UIProcess/API/Cocoa/_WKUserContentWorld.mm @no-unify
>-UIProcess/API/Cocoa/_WKUserInitiatedAction.mm @no-unify
>-UIProcess/API/Cocoa/_WKUserStyleSheet.mm @no-unify
>-UIProcess/API/Cocoa/_WKVisitedLinkStore.mm @no-unify
>-UIProcess/API/Cocoa/_WKWebsiteDataSize.mm @no-unify
>-UIProcess/API/Cocoa/_WKWebsiteDataStore.mm @no-unify
>-UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm @no-unify
>-UIProcess/API/Cocoa/_WKWebsitePolicies.mm @no-unify
>-UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm @no-unify
>-UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm @no-unify
>-UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm @no-unify
>-UIProcess/API/Cocoa/LegacyBundleForClass.mm @no-unify
>-UIProcess/API/Cocoa/WKBackForwardList.mm @no-unify
>-UIProcess/API/Cocoa/WKBackForwardListItem.mm @no-unify
>-UIProcess/API/Cocoa/WKBrowsingContextController.mm @no-unify
>-UIProcess/API/Cocoa/WKBrowsingContextGroup.mm @no-unify
>-UIProcess/API/Cocoa/WKConnection.mm @no-unify
>-UIProcess/API/Cocoa/WKContentRuleList.mm @no-unify
>-UIProcess/API/Cocoa/WKContentRuleListStore.mm @no-unify
>-UIProcess/API/Cocoa/WKError.mm @no-unify
>-UIProcess/API/Cocoa/WKFrameInfo.mm @no-unify
>-UIProcess/API/Cocoa/WKHTTPCookieStore.mm @no-unify
>-UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm @no-unify
>-UIProcess/API/Cocoa/WKNavigation.mm @no-unify
>-UIProcess/API/Cocoa/WKNavigationAction.mm @no-unify
>-UIProcess/API/Cocoa/WKNavigationData.mm @no-unify
>-UIProcess/API/Cocoa/WKNavigationResponse.mm @no-unify
>-UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm @no-unify
>-UIProcess/API/Cocoa/WKOpenPanelParameters.mm @no-unify
>-UIProcess/API/Cocoa/WKPreferences.mm @no-unify
>-UIProcess/API/Cocoa/WKPreviewActionItem.mm @no-unify
>-UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm @no-unify
>-UIProcess/API/Cocoa/WKPreviewElementInfo.mm @no-unify
>-UIProcess/API/Cocoa/WKProcessGroup.mm @no-unify
>-UIProcess/API/Cocoa/WKProcessPool.mm @no-unify
>-UIProcess/API/Cocoa/WKScriptMessage.mm @no-unify
>-UIProcess/API/Cocoa/WKSecurityOrigin.mm @no-unify
>-UIProcess/API/Cocoa/WKSnapshotConfiguration.mm @no-unify
>-UIProcess/API/Cocoa/WKTypeRefWrapper.mm @no-unify
>-UIProcess/API/Cocoa/WKURLSchemeTask.mm @no-unify
>-UIProcess/API/Cocoa/WKUserContentController.mm @no-unify
>-UIProcess/API/Cocoa/WKUserScript.mm @no-unify
>-UIProcess/API/Cocoa/WKWebsiteDataRecord.mm @no-unify
>-UIProcess/API/Cocoa/WKWebsiteDataStore.mm @no-unify
>-UIProcess/API/Cocoa/WKWebView.mm @no-unify
>-UIProcess/API/Cocoa/WKWebViewConfiguration.mm @no-unify
>-UIProcess/API/Cocoa/WKWindowFeatures.mm @no-unify
>-
>-UIProcess/API/mac/WKView.mm @no-unify
>+UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
>+UIProcess/API/Cocoa/_WKApplicationManifest.mm
>+UIProcess/API/Cocoa/_WKAttachment.mm
>+UIProcess/API/Cocoa/_WKAutomationSession.mm
>+UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
>+UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
>+UIProcess/API/Cocoa/_WKDownload.mm
>+UIProcess/API/Cocoa/_WKElementAction.mm
>+UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
>+UIProcess/API/Cocoa/_WKExperimentalFeature.mm
>+UIProcess/API/Cocoa/_WKGeolocationPosition.mm
>+UIProcess/API/Cocoa/_WKInspector.mm
>+UIProcess/API/Cocoa/_WKLinkIconParameters.mm
>+UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>+UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
>+UIProcess/API/Cocoa/_WKSessionState.mm
>+UIProcess/API/Cocoa/_WKThumbnailView.mm
>+UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
>+UIProcess/API/Cocoa/_WKUserContentFilter.mm
>+UIProcess/API/Cocoa/_WKUserContentWorld.mm
>+UIProcess/API/Cocoa/_WKUserInitiatedAction.mm
>+UIProcess/API/Cocoa/_WKUserStyleSheet.mm
>+UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
>+UIProcess/API/Cocoa/_WKWebsiteDataSize.mm
>+UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
>+UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm
>+UIProcess/API/Cocoa/_WKWebsitePolicies.mm
>+UIProcess/API/Cocoa/APIAttachmentCocoa.mm
>+UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
>+UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
>+UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
>+UIProcess/API/Cocoa/LegacyBundleForClass.mm
>+UIProcess/API/Cocoa/WKBackForwardList.mm
>+UIProcess/API/Cocoa/WKBackForwardListItem.mm
>+UIProcess/API/Cocoa/WKBrowsingContextController.mm
>+UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
>+UIProcess/API/Cocoa/WKConnection.mm
>+UIProcess/API/Cocoa/WKContentRuleList.mm
>+UIProcess/API/Cocoa/WKContentRuleListStore.mm
>+UIProcess/API/Cocoa/WKError.mm
>+UIProcess/API/Cocoa/WKFrameInfo.mm
>+UIProcess/API/Cocoa/WKHTTPCookieStore.mm
>+UIProcess/API/Cocoa/WKMenuItemIdentifiers.mm
>+UIProcess/API/Cocoa/WKNavigation.mm
>+UIProcess/API/Cocoa/WKNavigationAction.mm
>+UIProcess/API/Cocoa/WKNavigationData.mm
>+UIProcess/API/Cocoa/WKNavigationResponse.mm
>+UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
>+UIProcess/API/Cocoa/WKOpenPanelParameters.mm
>+UIProcess/API/Cocoa/WKPreferences.mm
>+UIProcess/API/Cocoa/WKPreviewActionItem.mm
>+UIProcess/API/Cocoa/WKPreviewActionItemIdentifiers.mm
>+UIProcess/API/Cocoa/WKPreviewElementInfo.mm
>+UIProcess/API/Cocoa/WKProcessGroup.mm
>+UIProcess/API/Cocoa/WKProcessPool.mm
>+UIProcess/API/Cocoa/WKScriptMessage.mm
>+UIProcess/API/Cocoa/WKSecurityOrigin.mm
>+UIProcess/API/Cocoa/WKSnapshotConfiguration.mm
>+UIProcess/API/Cocoa/WKTypeRefWrapper.mm
>+UIProcess/API/Cocoa/WKURLSchemeTask.mm
>+UIProcess/API/Cocoa/WKUserContentController.mm
>+UIProcess/API/Cocoa/WKUserScript.mm
>+UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
>+UIProcess/API/Cocoa/WKWebsiteDataStore.mm
>+UIProcess/API/Cocoa/WKWebView.mm
>+UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>+UIProcess/API/Cocoa/WKWindowFeatures.mm
>+
>+UIProcess/API/mac/WKView.mm
> 
> UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
> 
>@@ -477,23 +479,23 @@ WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
> WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm
> WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm
> 
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm @no-unify
>-WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm @no-unify
>-
>-WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMElement.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMNode.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMRange.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMText.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm @no-unify
>-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm @no-unify
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm
>+WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
>+
>+WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMElement.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMText.mm
>+WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm
>+WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
>+WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
> 
> WebProcess/InjectedBundle/mac/InjectedBundleMac.mm
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm b/Source/WebKit/UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
>index d518f0533d2e4068186e2d99e8bf15e660f3efea..0625f232d3d00a51593fc1584fd5e0ededf99dc2 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/APIContentRuleListStoreCocoa.mm
>@@ -32,7 +32,7 @@
> 
> namespace API {
> 
>-String ContentRuleListStore::defaultStorePath(bool legacyFilename)
>+WTF::String ContentRuleListStore::defaultStorePath(bool legacyFilename)
> {
>     static dispatch_once_t onceToken;
>     static NSURL *contentRuleListStoreURL;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardList.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardList.mm
>index 79e5d239b9b80cf67417e93f888c99962004d7f9..e6cf70da3d265a9eedc419843de71b4a2cee7406 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardList.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardList.mm
>@@ -31,10 +31,8 @@
> #import "WKBackForwardListItemInternal.h"
> #import "WKNSArray.h"
> 
>-using namespace WebKit;
>-
> @implementation WKBackForwardList {
>-    API::ObjectStorage<WebBackForwardList> _list;
>+    API::ObjectStorage<WebKit::WebBackForwardList> _list;
> }
> 
> - (void)dealloc
>@@ -46,32 +44,32 @@ using namespace WebKit;
> 
> - (WKBackForwardListItem *)currentItem
> {
>-    return wrapper(_list->currentItem());
>+    return WebKit::wrapper(_list->currentItem());
> }
> 
> - (WKBackForwardListItem *)backItem
> {
>-    return wrapper(_list->backItem());
>+    return WebKit::wrapper(_list->backItem());
> }
> 
> - (WKBackForwardListItem *)forwardItem
> {
>-    return wrapper(_list->forwardItem());
>+    return WebKit::wrapper(_list->forwardItem());
> }
> 
> - (WKBackForwardListItem *)itemAtIndex:(NSInteger)index
> {
>-    return wrapper(_list->itemAtIndex(index));
>+    return WebKit::wrapper(_list->itemAtIndex(index));
> }
> 
> - (NSArray *)backList
> {
>-    return wrapper(_list->backList());
>+    return WebKit::wrapper(_list->backList());
> }
> 
> - (NSArray *)forwardList
> {
>-    return wrapper(_list->forwardList());
>+    return WebKit::wrapper(_list->forwardList());
> }
> 
> #pragma mark WKObject protocol implementation
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.mm
>index 6013287019d91dc3bafeb461fd06c6dc5053ffae..cd818efd5e6d29a9426d188f6ea8e1179257d822 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.mm
>@@ -30,10 +30,8 @@
> 
> #import "WKNSURLExtras.h"
> 
>-using namespace WebKit;
>-
> @implementation WKBackForwardListItem {
>-    API::ObjectStorage<WebBackForwardListItem> _item;
>+    API::ObjectStorage<WebKit::WebBackForwardListItem> _item;
> }
> 
> - (void)dealloc
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
>index ed4286e148eb36418a43c006971b05870fc48ee3..391127a19f9b7a349b7255a8c231906d98f2ff89 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm
>@@ -61,9 +61,6 @@
> #import <wtf/NeverDestroyed.h>
> #import <wtf/WeakObjCPtr.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> NSString * const WKActionIsMainFrameKey = @"WKActionIsMainFrameKey";
> NSString * const WKActionNavigationTypeKey = @"WKActionNavigationTypeKey";
> NSString * const WKActionMouseButtonKey = @"WKActionMouseButtonKey";
>@@ -76,16 +73,16 @@ NSString * const WKActionOriginatingFrameURLKey = @"WKActionOriginatingFrameURLK
> NSString * const WKActionCanShowMIMETypeKey = @"WKActionCanShowMIMETypeKey";
> 
> @implementation WKBrowsingContextController {
>-    RefPtr<WebPageProxy> _page;
>-    std::unique_ptr<PageLoadStateObserver> _pageLoadStateObserver;
>+    RefPtr<WebKit::WebPageProxy> _page;
>+    std::unique_ptr<WebKit::PageLoadStateObserver> _pageLoadStateObserver;
> 
>     WeakObjCPtr<id <WKBrowsingContextLoadDelegate>> _loadDelegate;
>     WeakObjCPtr<id <WKBrowsingContextPolicyDelegate>> _policyDelegate;
> }
> 
>-static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>& browsingContextControllerMap()
>+static HashMap<WebKit::WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>& browsingContextControllerMap()
> {
>-    static NeverDestroyed<HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>> browsingContextControllerMap;
>+    static NeverDestroyed<HashMap<WebKit::WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>> browsingContextControllerMap;
>     return browsingContextControllerMap;
> }
> 
>@@ -103,12 +100,12 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
> 
> + (void)registerSchemeForCustomProtocol:(NSString *)scheme
> {
>-    WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
>+    WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
> }
> 
> + (void)unregisterSchemeForCustomProtocol:(NSString *)scheme
> {
>-    WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
>+    WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
> }
> 
> - (void)loadRequest:(NSURLRequest *)request
>@@ -118,11 +115,11 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
> 
> - (void)loadRequest:(NSURLRequest *)request userData:(id)userData
> {
>-    RefPtr<ObjCObjectGraph> wkUserData;
>+    RefPtr<WebKit::ObjCObjectGraph> wkUserData;
>     if (userData)
>-        wkUserData = ObjCObjectGraph::create(userData);
>+        wkUserData = WebKit::ObjCObjectGraph::create(userData);
> 
>-    _page->loadRequest(request, ShouldOpenExternalURLsPolicy::ShouldNotAllow, wkUserData.get());
>+    _page->loadRequest(request, WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, wkUserData.get());
> }
> 
> - (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
>@@ -135,9 +132,9 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
>     if (![URL isFileURL] || (allowedDirectory && ![allowedDirectory isFileURL]))
>         [NSException raise:NSInvalidArgumentException format:@"Attempted to load a non-file URL"];
> 
>-    RefPtr<ObjCObjectGraph> wkUserData;
>+    RefPtr<WebKit::ObjCObjectGraph> wkUserData;
>     if (userData)
>-        wkUserData = ObjCObjectGraph::create(userData);
>+        wkUserData = WebKit::ObjCObjectGraph::create(userData);
> 
>     _page->loadFile([URL _web_originalDataAsWTFString], [allowedDirectory _web_originalDataAsWTFString], wkUserData.get());
> }
>@@ -149,9 +146,9 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
> 
> - (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL userData:(id)userData
> {
>-    RefPtr<ObjCObjectGraph> wkUserData;
>+    RefPtr<WebKit::ObjCObjectGraph> wkUserData;
>     if (userData)
>-        wkUserData = ObjCObjectGraph::create(userData);
>+        wkUserData = WebKit::ObjCObjectGraph::create(userData);
> 
>     NSData *data = [HTMLString dataUsingEncoding:NSUTF8StringEncoding];
>     _page->loadData({ static_cast<const uint8_t*>(data.bytes), data.length }, "text/html"_s, "UTF-8"_s, [baseURL _web_originalDataAsWTFString], wkUserData.get());
>@@ -170,9 +167,9 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
> 
> - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData
> {
>-    RefPtr<ObjCObjectGraph> wkUserData;
>+    RefPtr<WebKit::ObjCObjectGraph> wkUserData;
>     if (userData)
>-        wkUserData = ObjCObjectGraph::create(userData);
>+        wkUserData = WebKit::ObjCObjectGraph::create(userData);
> 
>     _page->loadData({ static_cast<const uint8_t*>(data.bytes), data.length }, MIMEType, encodingName, [baseURL _web_originalDataAsWTFString], wkUserData.get());
> }
>@@ -292,7 +289,7 @@ static HashMap<WebPageProxy*, __unsafe_unretained WKBrowsingContextController *>
> 
> - (NSArray *)certificateChain
> {
>-    if (WebFrameProxy* mainFrame = _page->mainFrame())
>+    if (WebKit::WebFrameProxy* mainFrame = _page->mainFrame())
>         return mainFrame->certificateInfo() ? (__bridge NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
> 
>     return nil;
>@@ -344,7 +341,7 @@ static void didFailProvisionalNavigation(WKPageRef page, WKNavigationRef, WKErro
>     auto loadDelegate = browsingContext->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)])
>-        [loadDelegate browsingContextController:browsingContext didFailProvisionalLoadWithError:wrapper(*toImpl(error))];
>+        [loadDelegate browsingContextController:browsingContext didFailProvisionalLoadWithError:wrapper(*WebKit::toImpl(error))];
> }
> 
> static void didCommitNavigation(WKPageRef page, WKNavigationRef, WKTypeRef userData, const void* clientInfo)
>@@ -371,7 +368,7 @@ static void didFailNavigation(WKPageRef page, WKNavigationRef, WKErrorRef error,
>     auto loadDelegate = browsingContext->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)])
>-        [loadDelegate browsingContextController:browsingContext didFailLoadWithError:wrapper(*toImpl(error))];
>+        [loadDelegate browsingContextController:browsingContext didFailLoadWithError:wrapper(*WebKit::toImpl(error))];
> }
> 
> static bool canAuthenticateAgainstProtectionSpace(WKPageRef page, WKProtectionSpaceRef protectionSpace, const void *clientInfo)
>@@ -380,7 +377,7 @@ static bool canAuthenticateAgainstProtectionSpace(WKPageRef page, WKProtectionSp
>     auto loadDelegate = browsingContext->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(browsingContextController:canAuthenticateAgainstProtectionSpace:)])
>-        return [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext canAuthenticateAgainstProtectionSpace:toImpl(protectionSpace)->protectionSpace().nsSpace()];
>+        return [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext canAuthenticateAgainstProtectionSpace:WebKit::toImpl(protectionSpace)->protectionSpace().nsSpace()];
> 
>     return false;
> }
>@@ -391,7 +388,7 @@ static void didReceiveAuthenticationChallenge(WKPageRef page, WKAuthenticationCh
>     auto loadDelegate = browsingContext->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(browsingContextController:didReceiveAuthenticationChallenge:)])
>-        [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext didReceiveAuthenticationChallenge:wrapper(*toImpl(authenticationChallenge))];
>+        [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextController:browsingContext didReceiveAuthenticationChallenge:wrapper(*WebKit::toImpl(authenticationChallenge))];
> }
> 
> static void processDidCrash(WKPageRef page, const void* clientInfo)
>@@ -403,7 +400,7 @@ static void processDidCrash(WKPageRef page, const void* clientInfo)
>         [(id <WKBrowsingContextLoadDelegatePrivate>)loadDelegate browsingContextControllerWebProcessDidCrash:browsingContext];
> }
> 
>-static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
>+static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WebKit::WebPageProxy& page)
> {
>     WKPageNavigationClientV0 loaderClient;
>     memset(&loaderClient, 0, sizeof(loaderClient));
>@@ -446,7 +443,7 @@ static WKPolicyDecisionHandler makePolicyDecisionBlock(WKFramePolicyListenerRef
>     } copy] autorelease];
> }
> 
>-static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext, WebPageProxy& page)
>+static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext, WebKit::WebPageProxy& page)
> {
>     WKPagePolicyClientInternal policyClient;
>     memset(&policyClient, 0, sizeof(policyClient));
>@@ -471,7 +468,7 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
> 
>             if (originatingFrame) {
>                 actionDictionary = [[actionDictionary mutableCopy] autorelease];
>-                [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
>+                [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:WebKit::toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
>             }
>             
>             [policyDelegate browsingContextController:browsingContext decidePolicyForNavigationAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
>@@ -491,7 +488,7 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
>                 WKActionModifierFlagsKey: @(modifiers),
>                 WKActionMouseButtonKey: @(mouseButton),
>                 WKActionURLRequestKey: adoptNS(WKURLRequestCopyNSURLRequest(request)).get(),
>-                WKActionFrameNameKey: toImpl(frameName)->wrapper()
>+                WKActionFrameNameKey: WebKit::toImpl(frameName)->wrapper()
>             };
>             
>             [policyDelegate browsingContextController:browsingContext decidePolicyForNewWindowAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
>@@ -571,9 +568,9 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
>     if (!(self = [super init]))
>         return nil;
> 
>-    _page = toImpl(pageRef);
>+    _page = WebKit::toImpl(pageRef);
> 
>-    _pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self);
>+    _pageLoadStateObserver = std::make_unique<WebKit::PageLoadStateObserver>(self);
>     _page->pageLoadState().addObserver(*_pageLoadStateObserver);
> 
>     ASSERT(!browsingContextControllerMap().contains(_page.get()));
>@@ -584,7 +581,7 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
> 
> + (WKBrowsingContextController *)_browsingContextControllerForPageRef:(WKPageRef)pageRef
> {
>-    return browsingContextControllerMap().get(toImpl(pageRef));
>+    return browsingContextControllerMap().get(WebKit::toImpl(pageRef));
> }
> 
> @end
>@@ -593,27 +590,27 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
> 
> - (WKPageRef)_pageRef
> {
>-    return toAPI(_page.get());
>+    return WebKit::toAPI(_page.get());
> }
> 
> - (void)setPaginationMode:(WKBrowsingContextPaginationMode)paginationMode
> {
>-    Pagination::Mode mode;
>+    WebCore::Pagination::Mode mode;
>     switch (paginationMode) {
>     case WKPaginationModeUnpaginated:
>-        mode = Pagination::Unpaginated;
>+        mode = WebCore::Pagination::Unpaginated;
>         break;
>     case WKPaginationModeLeftToRight:
>-        mode = Pagination::LeftToRightPaginated;
>+        mode = WebCore::Pagination::LeftToRightPaginated;
>         break;
>     case WKPaginationModeRightToLeft:
>-        mode = Pagination::RightToLeftPaginated;
>+        mode = WebCore::Pagination::RightToLeftPaginated;
>         break;
>     case WKPaginationModeTopToBottom:
>-        mode = Pagination::TopToBottomPaginated;
>+        mode = WebCore::Pagination::TopToBottomPaginated;
>         break;
>     case WKPaginationModeBottomToTop:
>-        mode = Pagination::BottomToTopPaginated;
>+        mode = WebCore::Pagination::BottomToTopPaginated;
>         break;
>     default:
>         return;
>@@ -625,15 +622,15 @@ static void setUpPagePolicyClient(WKBrowsingContextController *browsingContext,
> - (WKBrowsingContextPaginationMode)paginationMode
> {
>     switch (_page->paginationMode()) {
>-    case Pagination::Unpaginated:
>+    case WebCore::Pagination::Unpaginated:
>         return WKPaginationModeUnpaginated;
>-    case Pagination::LeftToRightPaginated:
>+    case WebCore::Pagination::LeftToRightPaginated:
>         return WKPaginationModeLeftToRight;
>-    case Pagination::RightToLeftPaginated:
>+    case WebCore::Pagination::RightToLeftPaginated:
>         return WKPaginationModeRightToLeft;
>-    case Pagination::TopToBottomPaginated:
>+    case WebCore::Pagination::TopToBottomPaginated:
>         return WKPaginationModeTopToBottom;
>-    case Pagination::BottomToTopPaginated:
>+    case WebCore::Pagination::BottomToTopPaginated:
>         return WKPaginationModeBottomToTop;
>     }
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
>index 96df0d6b1dd372ddc21b534265d0a3cc3c0fa759..a28a81e7055706a65a6df9151d80fd942e585f31 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
>@@ -42,10 +42,8 @@
> #import "WKURLCF.h"
> #import <wtf/Vector.h>
> 
>-using namespace WebKit;
>-
> @implementation WKBrowsingContextGroup {
>-    API::ObjectStorage<WebPageGroup> _pageGroup;
>+    API::ObjectStorage<WebKit::WebPageGroup> _pageGroup;
> }
> 
> - (void)dealloc
>@@ -61,55 +59,55 @@ using namespace WebKit;
>     if (!self)
>         return nil;
> 
>-    API::Object::constructInWrapper<WebPageGroup>(self, identifier);
>+    API::Object::constructInWrapper<WebKit::WebPageGroup>(self, identifier);
> 
>     // Give the WKBrowsingContextGroup a identifier-less preferences, so that they
>     // don't get automatically written to the disk. The automatic writing has proven
>     // confusing to users of the API.
>     WKRetainPtr<WKPreferencesRef> preferences = adoptWK(WKPreferencesCreate());
>-    WKPageGroupSetPreferences(toAPI(_pageGroup.get()), preferences.get());
>+    WKPageGroupSetPreferences(WebKit::toAPI(_pageGroup.get()), preferences.get());
> 
>     return self;
> }
> 
> - (BOOL)allowsJavaScript
> {
>-    return WKPreferencesGetJavaScriptEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())));
>+    return WKPreferencesGetJavaScriptEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())));
> }
> 
> - (void)setAllowsJavaScript:(BOOL)allowsJavaScript
> {
>-    WKPreferencesSetJavaScriptEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())), allowsJavaScript);
>+    WKPreferencesSetJavaScriptEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())), allowsJavaScript);
> }
> 
> - (BOOL)allowsJavaScriptMarkup
> {
>-    return WKPreferencesGetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())));
>+    return WKPreferencesGetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())));
> }
> 
> - (void)setAllowsJavaScriptMarkup:(BOOL)allowsJavaScriptMarkup
> {
>-    WKPreferencesSetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())), allowsJavaScriptMarkup);
>+    WKPreferencesSetJavaScriptMarkupEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())), allowsJavaScriptMarkup);
> }
> 
> - (BOOL)allowsPlugIns
> {
>-    return WKPreferencesGetPluginsEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())));
>+    return WKPreferencesGetPluginsEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())));
> }
> 
> - (void)setAllowsPlugIns:(BOOL)allowsPlugIns
> {
>-    WKPreferencesSetPluginsEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())), allowsPlugIns);
>+    WKPreferencesSetPluginsEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())), allowsPlugIns);
> }
> 
> - (BOOL)privateBrowsingEnabled
> {
>-    return WKPreferencesGetPrivateBrowsingEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())));
>+    return WKPreferencesGetPrivateBrowsingEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())));
> }
> 
> - (void)setPrivateBrowsingEnabled:(BOOL)enablePrivateBrowsing
> {
>-    WKPreferencesSetPrivateBrowsingEnabled(WKPageGroupGetPreferences(toAPI(_pageGroup.get())), enablePrivateBrowsing);
>+    WKPreferencesSetPrivateBrowsingEnabled(WKPageGroupGetPreferences(WebKit::toAPI(_pageGroup.get())), enablePrivateBrowsing);
> }
> 
> static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
>@@ -124,10 +122,10 @@ static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
> 
>     for (id entry in array) {
>         if ([entry isKindOfClass:[NSString class]])
>-            strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
>+            strings.uncheckedAppend(adoptRef(WebKit::toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
>     }
> 
>-    return toAPI(&API::Array::create(WTFMove(strings)).leakRef());
>+    return WebKit::toAPI(&API::Array::create(WTFMove(strings)).leakRef());
> }
> 
> -(void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist mainFrameOnly:(BOOL)mainFrameOnly
>@@ -141,12 +139,12 @@ static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
>     auto wkBlacklist = createWKArray(blacklist);
>     WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
> 
>-    WKPageGroupAddUserStyleSheet(toAPI(_pageGroup.get()), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames);
>+    WKPageGroupAddUserStyleSheet(WebKit::toAPI(_pageGroup.get()), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames);
> }
> 
> - (void)removeAllUserStyleSheets
> {
>-    WKPageGroupRemoveAllUserStyleSheets(toAPI(_pageGroup.get()));
>+    WKPageGroupRemoveAllUserStyleSheets(WebKit::toAPI(_pageGroup.get()));
> }
> 
> - (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly
>@@ -160,12 +158,12 @@ static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
>     auto wkBlacklist = createWKArray(blacklist);
>     WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
> 
>-    WKPageGroupAddUserScript(toAPI(_pageGroup.get()), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames, injectionTime);
>+    WKPageGroupAddUserScript(WebKit::toAPI(_pageGroup.get()), wkSource.get(), wkBaseURL.get(), wkWhitelist.get(), wkBlacklist.get(), injectedFrames, injectionTime);
> }
> 
> - (void)removeAllUserScripts
> {
>-    WKPageGroupRemoveAllUserScripts(toAPI(_pageGroup.get()));
>+    WKPageGroupRemoveAllUserScripts(WebKit::toAPI(_pageGroup.get()));
> }
> 
> #pragma mark WKObject protocol implementation
>@@ -181,7 +179,7 @@ static WKRetainPtr<WKArrayRef> createWKArray(NSArray *array)
> 
> - (WKPageGroupRef)_pageGroupRef
> {
>-    return toAPI(_pageGroup.get());
>+    return WebKit::toAPI(_pageGroup.get());
> }
> 
> @end
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm b/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm
>index abe43483ce9feb6d1dc3ec23d107500c246337c7..3f75c85c537c0aa54341aa0f6d24a0d60795e181 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm
>@@ -36,8 +36,6 @@
> #import <wtf/WeakObjCPtr.h>
> #import <wtf/text/WTFString.h>
> 
>-using namespace WebKit;
>-
> @implementation WKConnection {
>     WeakObjCPtr<id <WKConnectionDelegate>> _delegate;
> }
>@@ -56,7 +54,7 @@ static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRe
> 
>     if ([delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
>         RetainPtr<CFStringRef> nsMessageName = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, messageName));
>-        RetainPtr<id> nsMessageBody = static_cast<ObjCObjectGraph*>(toImpl(messageBody))->rootObject();
>+        RetainPtr<id> nsMessageBody = static_cast<WebKit::ObjCObjectGraph*>(WebKit::toImpl(messageBody))->rootObject();
>         [delegate connection:connection didReceiveMessageWithName:(__bridge NSString *)nsMessageName.get() body:nsMessageBody.get()];
>     }
> }
>@@ -70,7 +68,7 @@ static void didClose(WKConnectionRef, const void* clientInfo)
>         [delegate connectionDidClose:connection];
> }
> 
>-static void setUpClient(WKConnection *wrapper, WebConnection& connection)
>+static void setUpClient(WKConnection *wrapper, WebKit::WebConnection& connection)
> {
>     WKConnectionClientV0 client;
>     memset(&client, 0, sizeof(client));
>@@ -99,13 +97,13 @@ static void setUpClient(WKConnection *wrapper, WebConnection& connection)
> 
> - (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody
> {
>-    RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
>+    RefPtr<WebKit::ObjCObjectGraph> wkMessageBody = WebKit::ObjCObjectGraph::create(messageBody);
>     self._connection.postMessage(messageName, wkMessageBody.get());
> }
> 
>-- (WebConnection&)_connection
>+- (WebKit::WebConnection&)_connection
> {
>-    return static_cast<WebConnection&>(API::Object::fromWKObjectExtraSpace(self));
>+    return static_cast<WebKit::WebConnection&>(API::Object::fromWKObjectExtraSpace(self));
> }
> 
> #pragma mark WKObject protocol implementation
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm b/Source/WebKit/UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
>index e331fe2156e279906e14e812455e43c356e7eab9..8fd84304b7107322c1e7dafed6932cadd8b16f30 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
>@@ -33,9 +33,6 @@
> #import "WebCredential.h"
> #import <WebCore/AuthenticationMac.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> @interface WKNSURLAuthenticationChallengeSender : NSObject <NSURLAuthenticationChallengeSender>
> @end
> 
>@@ -43,7 +40,7 @@ using namespace WebKit;
> 
> - (NSObject *)_web_createTarget
> {
>-    AuthenticationChallengeProxy& challenge = *reinterpret_cast<AuthenticationChallengeProxy*>(&self._apiObject);
>+    WebKit::AuthenticationChallengeProxy& challenge = *reinterpret_cast<WebKit::AuthenticationChallengeProxy*>(&self._apiObject);
> 
>     static dispatch_once_t token;
>     static WKNSURLAuthenticationChallengeSender *sender;
>@@ -54,9 +51,9 @@ using namespace WebKit;
>     return [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:mac(challenge.core()) sender:sender];
> }
> 
>-- (AuthenticationChallengeProxy&)_web_authenticationChallengeProxy
>+- (WebKit::AuthenticationChallengeProxy&)_web_authenticationChallengeProxy
> {
>-    return *reinterpret_cast<AuthenticationChallengeProxy*>(&self._apiObject);
>+    return *reinterpret_cast<WebKit::AuthenticationChallengeProxy*>(&self._apiObject);
> }
> 
> @end
>@@ -72,35 +69,35 @@ static void checkChallenge(NSURLAuthenticationChallenge *challenge)
> - (void)cancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
> {
>     checkChallenge(challenge);
>-    AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>+    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>     webChallenge.listener()->cancel();
> }
> 
> - (void)continueWithoutCredentialForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
> {
>     checkChallenge(challenge);
>-    AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>+    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>     webChallenge.listener()->useCredential(nullptr);
> }
> 
> - (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
> {
>     checkChallenge(challenge);
>-    AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>-    webChallenge.listener()->useCredential(WebCredential::create(Credential(credential)).ptr());
>+    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>+    webChallenge.listener()->useCredential(WebKit::WebCredential::create(WebCore::Credential(credential)).ptr());
> }
> 
> - (void)performDefaultHandlingForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
> {
>     checkChallenge(challenge);
>-    AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>+    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>     webChallenge.listener()->performDefaultHandling();
> }
> 
> - (void)rejectProtectionSpaceAndContinueWithChallenge:(NSURLAuthenticationChallenge *)challenge
> {
>     checkChallenge(challenge);
>-    AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>+    WebKit::AuthenticationChallengeProxy& webChallenge = ((WKNSURLAuthenticationChallenge *)challenge)._web_authenticationChallengeProxy;
>     webChallenge.listener()->rejectProtectionSpaceAndContinue();
> }
> 
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationData.mm b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationData.mm
>index 3d4b518bfc934001c52b1d65144248d932e6036c..0cd50ebdd1b8b76b321243f8bd63b364911315eb 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKNavigationData.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKNavigationData.mm
>@@ -32,8 +32,6 @@
> #import <WebCore/ResourceRequest.h>
> #import <WebCore/ResourceResponse.h>
> 
>-using namespace WebKit;
>-
> @implementation WKNavigationData {
>     API::ObjectStorage<API::NavigationData> _data;
> }
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm b/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm
>index 4d417b543c0ed862299422226ba0fa57331f59dd..89f2d884fae63bd7c3c4a29c712398fda419f4d3 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm
>@@ -52,10 +52,8 @@
> #import <WebCore/WebCoreThreadSystemInterface.h>
> #endif
> 
>-using namespace WebKit;
>-
> @implementation WKProcessGroup {
>-    RefPtr<WebProcessPool> _processPool;
>+    RefPtr<WebKit::WebProcessPool> _processPool;
> 
>     WeakObjCPtr<id <WKProcessGroupDelegate>> _delegate;
> 
>@@ -70,7 +68,7 @@ static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, con
>     auto delegate = processGroup->_delegate.get();
> 
>     if ([delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
>-        [delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:wrapper(*toImpl(connectionRef))];
>+        [delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:wrapper(*WebKit::toImpl(connectionRef))];
> }
> 
> static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
>@@ -113,50 +111,50 @@ static void setUpInjectedBundleClient(WKProcessGroup *processGroup, WKContextRef
> 
> static void didNavigateWithNavigationData(WKContextRef, WKPageRef pageRef, WKNavigationDataRef navigationDataRef, WKFrameRef frameRef, const void*)
> {
>-    if (!toImpl(frameRef)->isMainFrame())
>+    if (!WebKit::toImpl(frameRef)->isMainFrame())
>         return;
> 
>     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
>     auto historyDelegate = controller->_historyDelegate.get();
> 
>     if ([historyDelegate respondsToSelector:@selector(browsingContextController:didNavigateWithNavigationData:)])
>-        [historyDelegate browsingContextController:controller didNavigateWithNavigationData:wrapper(*toImpl(navigationDataRef))];
>+        [historyDelegate browsingContextController:controller didNavigateWithNavigationData:wrapper(*WebKit::toImpl(navigationDataRef))];
> }
> 
> static void didPerformClientRedirect(WKContextRef, WKPageRef pageRef, WKURLRef sourceURLRef, WKURLRef destinationURLRef, WKFrameRef frameRef, const void*)
> {
>-    if (!toImpl(frameRef)->isMainFrame())
>+    if (!WebKit::toImpl(frameRef)->isMainFrame())
>         return;
> 
>     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
>     auto historyDelegate = controller->_historyDelegate.get();
> 
>     if ([historyDelegate respondsToSelector:@selector(browsingContextController:didPerformClientRedirectFromURL:toURL:)])
>-        [historyDelegate browsingContextController:controller didPerformClientRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
>+        [historyDelegate browsingContextController:controller didPerformClientRedirectFromURL:wrapper(*WebKit::toImpl(sourceURLRef)) toURL:wrapper(*WebKit::toImpl(destinationURLRef))];
> }
> 
> static void didPerformServerRedirect(WKContextRef, WKPageRef pageRef, WKURLRef sourceURLRef, WKURLRef destinationURLRef, WKFrameRef frameRef, const void*)
> {
>-    if (!toImpl(frameRef)->isMainFrame())
>+    if (!WebKit::toImpl(frameRef)->isMainFrame())
>         return;
> 
>     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
>     auto historyDelegate = controller->_historyDelegate.get();
> 
>     if ([historyDelegate respondsToSelector:@selector(browsingContextController:didPerformServerRedirectFromURL:toURL:)])
>-        [historyDelegate browsingContextController:controller didPerformServerRedirectFromURL:wrapper(*toImpl(sourceURLRef)) toURL:wrapper(*toImpl(destinationURLRef))];
>+        [historyDelegate browsingContextController:controller didPerformServerRedirectFromURL:wrapper(*WebKit::toImpl(sourceURLRef)) toURL:wrapper(*WebKit::toImpl(destinationURLRef))];
> }
> 
> static void didUpdateHistoryTitle(WKContextRef, WKPageRef pageRef, WKStringRef titleRef, WKURLRef urlRef, WKFrameRef frameRef, const void*)
> {
>-    if (!toImpl(frameRef)->isMainFrame())
>+    if (!WebKit::toImpl(frameRef)->isMainFrame())
>         return;
> 
>     WKBrowsingContextController *controller = [WKBrowsingContextController _browsingContextControllerForPageRef:pageRef];
>     auto historyDelegate = controller->_historyDelegate.get();
> 
>     if ([historyDelegate respondsToSelector:@selector(browsingContextController:didUpdateHistoryTitle:forURL:)])
>-        [historyDelegate browsingContextController:controller didUpdateHistoryTitle:wrapper(*toImpl(titleRef)) forURL:wrapper(*toImpl(urlRef))];
>+        [historyDelegate browsingContextController:controller didUpdateHistoryTitle:wrapper(*WebKit::toImpl(titleRef)) forURL:wrapper(*WebKit::toImpl(urlRef))];
> }
> 
> static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contextRef)
>@@ -188,7 +186,7 @@ static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contex
>     auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
>     configuration->setInjectedBundlePath(bundleURL ? String(bundleURL.path) : String());
> 
>-    _processPool = WebProcessPool::create(configuration);
>+    _processPool = WebKit::WebProcessPool::create(configuration);
> 
>     setUpConnectionClient(self, toAPI(_processPool.get()));
>     setUpInjectedBundleClient(self, toAPI(_processPool.get()));
>@@ -218,7 +216,7 @@ static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contex
> 
> - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
> {
>-    _processPool->allowSpecificHTTPSCertificateForHost(WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
>+    _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
> }
> 
> #if PLATFORM(IOS)
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTask.mm b/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTask.mm
>index fad88754638966ca5c1e2453df1f33e6dc338695..c58c13c5c0a46d2686776f7f88009469c1249806 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTask.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTask.mm
>@@ -35,8 +35,6 @@
> #import <WebCore/SharedBuffer.h>
> #import <wtf/BlockPtr.h>
> 
>-using namespace WebCore;
>-
> static void raiseExceptionIfNecessary(WebKit::WebURLSchemeTask::ExceptionType exceptionType)
> {
>     switch (exceptionType) {
>@@ -71,7 +69,7 @@ static void raiseExceptionIfNecessary(WebKit::WebURLSchemeTask::ExceptionType ex
> 
> - (NSURLRequest *)request
> {
>-    return _urlSchemeTask->task().request().nsURLRequest(HTTPBodyUpdatePolicy::UpdateHTTPBody);
>+    return _urlSchemeTask->task().request().nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
> }
> 
> - (void)didReceiveResponse:(NSURLResponse *)response
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>index 8478db2ce3c67ee5077ec50b0e5041be94aef592..2d853c769b208d33d2ac82f3c1bbf2049cac0a52 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>@@ -53,8 +53,6 @@
> #import <WebCore/Device.h>
> #endif
> 
>-using namespace WebCore;
>-
> template<typename T> class LazyInitialized {
> public:
>     typedef typename WTF::GetPtrHelper<T>::PtrType PtrType;
>@@ -238,7 +236,7 @@ static _WKDragLiftDelay toDragLiftDelay(NSUInteger value)
>     _systemPreviewEnabled = NO;
> #endif // PLATFORM(IOS)
> 
>-    _mediaContentTypesRequiringHardwareSupport = Settings::defaultMediaContentTypesRequiringHardwareSupport();
>+    _mediaContentTypesRequiringHardwareSupport = WebCore::Settings::defaultMediaContentTypesRequiringHardwareSupport();
>     _allowMediaContentTypesRequiringHardwareSupportAsFallback = YES;
> 
>     _colorFilterEnabled = NO;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
>index fd85ef6fed9f00c74428dbd7498fcdb995c63d91..c649ff6cbcea5a1da45f360be539c7dbc4928326 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
>@@ -42,8 +42,6 @@
> #import <WebKit/ServiceWorkerProcessProxy.h>
> #import <wtf/BlockPtr.h>
> 
>-using namespace WebCore;
>-
> @implementation WKWebsiteDataStore
> 
> + (WKWebsiteDataStore *)defaultDataStore
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKAttachment.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKAttachment.mm
>index 811240d2842f50e7b924fd852a0f2b680fd153ce..69aa78040b63d3a277be4b07802eea58ec279791 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKAttachment.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKAttachment.mm
>@@ -39,8 +39,6 @@
> #import <MobileCoreServices/MobileCoreServices.h>
> #endif
> 
>-using namespace WebKit;
>-
> static const NSInteger UnspecifiedAttachmentErrorCode = 1;
> static const NSInteger InvalidAttachmentErrorCode = 2;
> 
>@@ -139,7 +137,7 @@ static const NSInteger InvalidAttachmentErrorCode = 2;
>         if (!capturedBlock)
>             return;
> 
>-        if (error == CallbackBase::Error::None)
>+        if (error == WebKit::CallbackBase::Error::None)
>             capturedBlock(nil);
>         else
>             capturedBlock([NSError errorWithDomain:WKErrorDomain code:UnspecifiedAttachmentErrorCode userInfo:nil]);
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKGeolocationPosition.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKGeolocationPosition.mm
>index e8426024c8b15389968e1f93758a91fa5e34e1c7..fe48750c49b5842e21099eb0d186237b81f9c052 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKGeolocationPosition.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKGeolocationPosition.mm
>@@ -30,8 +30,6 @@
> 
> #import <CoreLocation/CLLocation.h>
> 
>-using namespace WebKit;
>-
> @implementation _WKGeolocationPosition
> 
> + (instancetype)positionWithLocation:(CLLocation *)location
>@@ -39,7 +37,7 @@ using namespace WebKit;
>     if (!location)
>         return nil;
> 
>-    return wrapper(WebGeolocationPosition::create(WebCore::GeolocationPosition { location }));
>+    return wrapper(WebKit::WebGeolocationPosition::create(WebCore::GeolocationPosition { location }));
> }
> 
> - (void)dealloc
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
>index 69bd36d84dbf9d4910609762f0df51987caae11a..b1e175a2f7c71312cd55333af54245157fe09271 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
>@@ -30,8 +30,6 @@
> 
> #import "RemoteWebInspectorProxy.h"
> 
>-using namespace WebKit;
>-
> @interface _WKRemoteWebInspectorViewController ()
> - (void)sendMessageToBackend:(NSString *)message;
> - (void)closeFromFrontend;
>@@ -67,8 +65,8 @@ private:
> } // namespace WebKit
> 
> @implementation _WKRemoteWebInspectorViewController {
>-    RefPtr<RemoteWebInspectorProxy> m_remoteInspectorProxy;
>-    std::unique_ptr<_WKRemoteWebInspectorProxyClient> m_remoteInspectorClient;
>+    RefPtr<WebKit::RemoteWebInspectorProxy> m_remoteInspectorProxy;
>+    std::unique_ptr<WebKit::_WKRemoteWebInspectorProxyClient> m_remoteInspectorClient;
> }
> 
> - (instancetype)init
>@@ -76,8 +74,8 @@ private:
>     if (!(self = [super init]))
>         return nil;
> 
>-    m_remoteInspectorProxy = RemoteWebInspectorProxy::create();
>-    m_remoteInspectorClient = std::make_unique<_WKRemoteWebInspectorProxyClient>(self);
>+    m_remoteInspectorProxy = WebKit::RemoteWebInspectorProxy::create();
>+    m_remoteInspectorClient = std::make_unique<WebKit::_WKRemoteWebInspectorProxyClient>(self);
>     m_remoteInspectorProxy->setClient(m_remoteInspectorClient.get());
> 
>     return self;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm
>index 5d767232435db1da3c3a33a49a5293bd6c2d22d8..34b10f0b35fcacc56fa48e54340414b336a0e345 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm
>@@ -43,13 +43,10 @@
> // FIXME: We should re-use existing tiles for unparented views, if we have them (we need to know if they've been purged; if so, repaint at scaled-down size).
> // FIXME: We should switch to the low-resolution scale if a view we have high-resolution tiles for repaints.
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> @implementation _WKThumbnailView {
>     RetainPtr<WKView> _wkView;
>     RetainPtr<WKWebView> _wkWebView;
>-    WebPageProxy* _webPageProxy;
>+    WebKit::WebPageProxy* _webPageProxy;
> 
>     BOOL _originalMayStartMediaWhenInWindow;
>     BOOL _originalSourceViewIsInWindow;
>@@ -84,7 +81,7 @@ using namespace WebKit;
>         return nil;
> 
>     _wkView = wkView;
>-    _webPageProxy = toImpl([_wkView pageRef]);
>+    _webPageProxy = WebKit::toImpl([_wkView pageRef]);
>     _originalMayStartMediaWhenInWindow = _webPageProxy->mayStartMediaWhenInWindow();
>     _originalSourceViewIsInWindow = !![_wkView window];
> 
>@@ -127,9 +124,9 @@ using namespace WebKit;
>     _waitingForSnapshot = YES;
> 
>     RetainPtr<_WKThumbnailView> thumbnailView = self;
>-    IntRect snapshotRect(IntPoint(), _webPageProxy->viewSize() - IntSize(0, _webPageProxy->topContentInset()));
>-    SnapshotOptions options = SnapshotOptionsInViewCoordinates | SnapshotOptionsUseScreenColorSpace;
>-    IntSize bitmapSize = snapshotRect.size();
>+    WebCore::IntRect snapshotRect(WebCore::IntPoint(), _webPageProxy->viewSize() - WebCore::IntSize(0, _webPageProxy->topContentInset()));
>+    WebKit::SnapshotOptions options = WebKit::SnapshotOptionsInViewCoordinates | WebKit::SnapshotOptionsUseScreenColorSpace;
>+    WebCore::IntSize bitmapSize = snapshotRect.size();
>     bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
> 
>     if (!CGSizeEqualToSize(_maximumSnapshotSize, CGSizeZero)) {
>@@ -138,13 +135,13 @@ using namespace WebKit;
>             sizeConstraintScale = CGFloatMin(sizeConstraintScale, _maximumSnapshotSize.width / bitmapSize.width());
>         if (_maximumSnapshotSize.height)
>             sizeConstraintScale = CGFloatMin(sizeConstraintScale, _maximumSnapshotSize.height / bitmapSize.height());
>-        bitmapSize = IntSize(CGCeiling(bitmapSize.width() * sizeConstraintScale), CGCeiling(bitmapSize.height() * sizeConstraintScale));
>+        bitmapSize = WebCore::IntSize(CGCeiling(bitmapSize.width() * sizeConstraintScale), CGCeiling(bitmapSize.height() * sizeConstraintScale));
>     }
> 
>     _lastSnapshotScale = _scale;
>     _lastSnapshotMaximumSize = _maximumSnapshotSize;
>-    _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
>-        RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
>+    _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const WebKit::ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
>+        auto bitmap = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::Protection::ReadOnly);
>         RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
>         [thumbnailView _didTakeSnapshot:cgImage.get()];
>     });
>diff --git a/Source/WebKit/UIProcess/API/mac/WKView.mm b/Source/WebKit/UIProcess/API/mac/WKView.mm
>index fe97010375507b7d71119a4dafb0d528a72e4976..fe8d9ca5f4c5eac61d3c10d60b9e94866a2e0bf5 100644
>--- a/Source/WebKit/UIProcess/API/mac/WKView.mm
>+++ b/Source/WebKit/UIProcess/API/mac/WKView.mm
>@@ -45,12 +45,9 @@
> #import <pal/spi/cocoa/AVKitSPI.h>
> #import <wtf/BlockPtr.h>
> 
>-using namespace WebKit;
>-using namespace WebCore;
>-
> @interface WKViewData : NSObject {
> @public
>-    std::unique_ptr<WebViewImpl> _impl;
>+    std::unique_ptr<WebKit::WebViewImpl> _impl;
> }
> 
> @end
>@@ -759,7 +756,7 @@ Some other editing-related methods still unimplemented:
> 
> - (BOOL)mouseDownCanMoveWindow
> {
>-    return WebViewImpl::mouseDownCanMoveWindow();
>+    return WebKit::WebViewImpl::mouseDownCanMoveWindow();
> }
> 
> - (void)viewDidHide
>@@ -898,7 +895,7 @@ Some other editing-related methods still unimplemented:
>                 ASSERT(RunLoop::isMain());
>                 if (loadCompletionHandler) {
>                     completionHandler([loadCompletionHandler = BlockPtr<void (NSData *)>(loadCompletionHandler)](API::Data* data, WebKit::CallbackBase::Error error) {
>-                        if (error != CallbackBase::Error::None || !data)
>+                        if (error != WebKit::CallbackBase::Error::None || !data)
>                             loadCompletionHandler(nil);
>                         else
>                             loadCompletionHandler(wrapper(*data));
>@@ -916,16 +913,16 @@ Some other editing-related methods still unimplemented:
> #endif // WK_API_ENABLED
> }
> 
>-- (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration
>+- (instancetype)initWithFrame:(NSRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration
> {
>     self = [super initWithFrame:frame];
>     if (!self)
>         return nil;
> 
>-    InitializeWebKit2();
>+    WebKit::InitializeWebKit2();
> 
>     _data = [[WKViewData alloc] init];
>-    _data->_impl = std::make_unique<WebViewImpl>(self, nullptr, processPool, WTFMove(configuration));
>+    _data->_impl = std::make_unique<WebKit::WebViewImpl>(self, nullptr, processPool, WTFMove(configuration));
> 
>     [self maybeInstallIconLoadingClient];
> 
>@@ -1006,7 +1003,7 @@ Some other editing-related methods still unimplemented:
> 
> - (id)_web_immediateActionAnimationControllerForHitTestResultInternal:(API::HitTestResult*)hitTestResult withType:(uint32_t)type userData:(API::Object*)userData
> {
>-    return [self _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult) withType:type userData:toAPI(userData)];
>+    return [self _immediateActionAnimationControllerForHitTestResult:WebKit::toAPI(hitTestResult) withType:type userData:WebKit::toAPI(userData)];
> }
> 
> - (void)_web_prepareForImmediateActionAnimation
>@@ -1131,7 +1128,7 @@ Some other editing-related methods still unimplemented:
> 
> - (void)saveBackForwardSnapshotForItem:(WKBackForwardListItemRef)item
> {
>-    _data->_impl->saveBackForwardSnapshotForItem(*toImpl(item));
>+    _data->_impl->saveBackForwardSnapshotForItem(*WebKit::toImpl(item));
> }
> 
> - (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef
>@@ -1155,19 +1152,19 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(NSUs
> - (id)initWithFrame:(NSRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef relatedToPage:(WKPageRef)relatedPage
> {
>     auto configuration = API::PageConfiguration::create();
>-    configuration->setProcessPool(toImpl(contextRef));
>-    configuration->setPageGroup(toImpl(pageGroupRef));
>-    configuration->setRelatedPage(toImpl(relatedPage));
>+    configuration->setProcessPool(WebKit::toImpl(contextRef));
>+    configuration->setPageGroup(WebKit::toImpl(pageGroupRef));
>+    configuration->setRelatedPage(WebKit::toImpl(relatedPage));
> #if PLATFORM(MAC)
>     configuration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(toUserInterfaceLayoutDirection(self.userInterfaceLayoutDirection))));
> #endif
> 
>-    return [self initWithFrame:frame processPool:*toImpl(contextRef) configuration:WTFMove(configuration)];
>+    return [self initWithFrame:frame processPool:*WebKit::toImpl(contextRef) configuration:WTFMove(configuration)];
> }
> 
> - (id)initWithFrame:(NSRect)frame configurationRef:(WKPageConfigurationRef)configurationRef
> {
>-    Ref<API::PageConfiguration> configuration = toImpl(configurationRef)->copy();
>+    Ref<API::PageConfiguration> configuration = WebKit::toImpl(configurationRef)->copy();
>     auto& processPool = *configuration->processPool();
> 
>     return [self initWithFrame:frame processPool:processPool configuration:WTFMove(configuration)];
>@@ -1175,7 +1172,7 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(NSUs
> 
> - (BOOL)wantsUpdateLayer
> {
>-    return WebViewImpl::wantsUpdateLayer();
>+    return WebKit::WebViewImpl::wantsUpdateLayer();
> }
> 
> - (void)updateLayer
>@@ -1185,17 +1182,17 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(NSUs
> 
> - (WKPageRef)pageRef
> {
>-    return toAPI(&_data->_impl->page());
>+    return WebKit::toAPI(&_data->_impl->page());
> }
> 
> - (BOOL)canChangeFrameLayout:(WKFrameRef)frameRef
> {
>-    return _data->_impl->canChangeFrameLayout(*toImpl(frameRef));
>+    return _data->_impl->canChangeFrameLayout(*WebKit::toImpl(frameRef));
> }
> 
> - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef
> {
>-    return _data->_impl->printOperationWithPrintInfo(printInfo, *toImpl(frameRef));
>+    return _data->_impl->printOperationWithPrintInfo(printInfo, *WebKit::toImpl(frameRef));
> }
> 
> - (void)setFrame:(NSRect)rect andScrollBy:(NSSize)offset
>@@ -1220,7 +1217,7 @@ static WebCore::UserInterfaceLayoutDirection toUserInterfaceLayoutDirection(NSUs
> 
> + (void)hideWordDefinitionWindow
> {
>-    WebViewImpl::hideWordDefinitionWindow();
>+    WebKit::WebViewImpl::hideWordDefinitionWindow();
> }
> 
> - (NSSize)minimumSizeForAutoLayout
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 41a569dcc91268c523b5ab06ad7abac11c1f2f1a..7bdac60fc32b60737e6ed11f6177941050f7570a 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -117,7 +117,6 @@
> 		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 */; };
> 		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 */; };
>@@ -140,11 +139,9 @@
> 		1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0EC90D124C0AF5007EF4A5 /* PluginProcessConnectionManager.h */; };
> 		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 */; };
> 		1A15841A189044F50017616C /* WKProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */; };
> 		1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */; };
>-		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 */; };
> 		1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */; };
>@@ -158,7 +155,6 @@
> 		1A2464F31891E45100234C5B /* APILoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2464F21891E45100234C5B /* APILoaderClient.h */; };
> 		1A24B5F311F531E800C38269 /* MachUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A24B5F111F531E800C38269 /* MachUtilities.h */; };
> 		1A24BED5120894D100FBB059 /* SharedMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A24BED3120894D100FBB059 /* SharedMemory.h */; };
>-		1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A256E3518A1A788006FB922 /* WKNavigationAction.mm */; };
> 		1A256E3818A1A788006FB922 /* WKNavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A256E3618A1A788006FB922 /* WKNavigationAction.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1A256E3A18A1A7DF006FB922 /* WKNavigationActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A256E3918A1A7DF006FB922 /* WKNavigationActionInternal.h */; };
> 		1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2BB6CE14117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp */; };
>@@ -177,9 +173,7 @@
> 		1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
> 		1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
> 		1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */; };
>-		1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */; };
> 		1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
>-		1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
> 		1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */; };
> 		1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
>@@ -188,14 +182,12 @@
> 		1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */; };
> 		1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
> 		1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */; };
> 		1A43E82A188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445B9E184D5FB5004B3414 /* WKContextInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		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, ); }; };
> 		1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
>-		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 */; };
>@@ -204,17 +196,13 @@
> 		1A4A9C5612B816CF008FE984 /* NetscapePluginModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9C5412B816CF008FE984 /* NetscapePluginModule.h */; };
> 		1A4A9F3312B844E2008FE984 /* PluginQuirks.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9F3112B844E2008FE984 /* PluginQuirks.h */; };
> 		1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664718A2D91A00D82E21 /* APIUIClient.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 */; };
> 		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, ); }; };
>-		1A5704FB1BE1751100874AF1 /* RemoteObjectInvocation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A5704F91BE1751100874AF1 /* RemoteObjectInvocation.mm */; };
> 		1A5704FC1BE1751100874AF1 /* RemoteObjectInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5704FA1BE1751100874AF1 /* RemoteObjectInvocation.h */; };
> 		1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5705101BE410E500874AF1 /* BlockSPI.h */; };
> 		1A57109F1ABA0027002FABBE /* WKWebsiteDataStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57109D1ABA0027002FABBE /* WKWebsiteDataStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */; };
> 		1A5B1C511898606F004FCF9B /* WKNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */; };
> 		1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
>@@ -243,9 +231,7 @@
> 		1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */; };
> 		1A7C0DF71B7D1F1000A9B848 /* WKWindowFeaturesRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7C0DF51B7D1F1000A9B848 /* WKWindowFeaturesRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */; };
> 		1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */; };
> 		1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */; };
> 		1A85E4721E303F3700914599 /* WebKit.apinotes in Headers */ = {isa = PBXBuildFile; fileRef = 1A85E4701E303F2400914599 /* WebKit.apinotes */; settings = {ATTRIBUTES = (Public, ); }; };
>@@ -264,12 +250,8 @@
> 		1A90C1F41264FD71003E44D4 /* FindController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A90C1F21264FD71003E44D4 /* FindController.h */; };
> 		1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
> 		1A9E32891821636900F5D04C /* _WKRemoteObjectRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		1A9E328A1821636900F5D04C /* _WKRemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */; };
> 		1A9E328D182165A900F5D04C /* _WKRemoteObjectInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		1A9E328E182165A900F5D04C /* _WKRemoteObjectInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E328C182165A900F5D04C /* _WKRemoteObjectInterface.mm */; };
>-		1A9E329A1822E1CC00F5D04C /* WKRemoteObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */; };
> 		1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */; };
>-		1A9E329E1822FEDD00F5D04C /* WKRemoteObjectCoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */; };
> 		1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */; };
> 		1A9E32A11823018900F5D04C /* _WKRemoteObjectRegistryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32A01823018900F5D04C /* _WKRemoteObjectRegistryInternal.h */; };
> 		1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */; };
>@@ -290,7 +272,6 @@
> 		1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAB0378185A7C6A00EDF501 /* MessageSender.h */; };
> 		1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */; };
> 		1AABFE3A1829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.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 */; };
> 		1AAF08A2192681D100B6390C /* WebUserContentControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF08A0192681D100B6390C /* WebUserContentControllerProxy.h */; };
>@@ -311,7 +292,6 @@
> 		1AB1F7991D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7951D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h */; };
> 		1AB31A9616BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */; };
> 		1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */; };
>-		1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB40EE31BF677E300BA81BE /* WKMenuItemIdentifiers.mm */; };
> 		1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB40EE41BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1AB474D8184D43FD0051B622 /* WKBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474D7184D43FD0051B622 /* WKBundlePageLoaderClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1AB474DA184D44250051B622 /* WKBundlePageResourceLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474D9184D44250051B622 /* WKBundlePageResourceLoadClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -338,7 +318,6 @@
> 		1AC1336818565B5700F3EC05 /* UserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336618565B5700F3EC05 /* UserData.h */; };
> 		1AC1336C18565C7A00F3EC05 /* APIPageHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1336B18565C7A00F3EC05 /* APIPageHandle.h */; };
> 		1AC1337218566C7C00F3EC05 /* APIFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */; };
>-		1AC1337F18590AE400F3EC05 /* RemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1337D18590AE400F3EC05 /* RemoteObjectRegistry.mm */; };
> 		1AC1338018590AE400F3EC05 /* RemoteObjectRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1337E18590AE400F3EC05 /* RemoteObjectRegistry.h */; };
> 		1AC1338518590C4600F3EC05 /* RemoteObjectRegistryMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1338318590C4600F3EC05 /* RemoteObjectRegistryMessageReceiver.cpp */; };
> 		1AC1338618590C4600F3EC05 /* RemoteObjectRegistryMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1338418590C4600F3EC05 /* RemoteObjectRegistryMessages.h */; };
>@@ -349,30 +328,24 @@
> 		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 */; };
>-		1ACC50F11CBC381D003C7D03 /* WKOpenPanelParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ACC50EF1CBC381D003C7D03 /* WKOpenPanelParameters.mm */; };
> 		1ACC50F21CBC381D003C7D03 /* WKOpenPanelParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACC50F01CBC381D003C7D03 /* WKOpenPanelParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1ACC87BA1981C341003D1AF4 /* WKNavigationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		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, ); }; };
> 		1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */; };
> 		1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
> 		1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */; };
> 		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, ); }; };
> 		1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
> 		1AD8790A18B6C38A006CAFD7 /* WKUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADCB869189831B30022EE5A /* NavigationActionData.h */; };
> 		1ADE46B31954EC61000F7985 /* WKSessionStateRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADE46B11954EC61000F7985 /* WKSessionStateRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		1ADF591A1890528E0043C145 /* WKWebViewConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */; };
> 		1ADF591B1890528E0043C145 /* WKWebViewConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADF59191890528E0043C145 /* WKWebViewConfiguration.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 */; };
> 		1AE00D611831792100087DD7 /* FrameLoadState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D5F1831792100087DD7 /* FrameLoadState.h */; };
> 		1AE00D6C18327C1200087DD7 /* StringReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE00D6A18327C1200087DD7 /* StringReference.h */; };
>-		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, ); }; };
> 		1AE286801C7F92C00069AC4F /* _WKWebsiteDataSizeInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE2867F1C7F92BF0069AC4F /* _WKWebsiteDataSizeInternal.h */; };
>@@ -387,19 +360,14 @@
> 		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, ); }; };
>-		1AF4592E19464B2000F9D4A2 /* WKError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4592C19464B2000F9D4A2 /* WKError.mm */; };
> 		1AF4592F19464B2000F9D4A2 /* WKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4592D19464B2000F9D4A2 /* WKError.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		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, ); }; };
> 		1AFA4B8C1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA4B8A1A65A1D0006C4AB4 /* WebProcessLifetimeTracker.h */; };
> 		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, ); }; };
> 		1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3141891B54000153970 /* APIPolicyClient.h */; };
> 		1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		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 */; };
> 		1AFDE6621954E9B100C48FFA /* APISessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDE6601954E9B100C48FFA /* APISessionState.h */; };
> 		1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE436418B6C081009C7A48 /* UIDelegate.h */; };
>@@ -636,7 +604,6 @@
> 		2D5C9D0619C81D8F00B3C5C1 /* WebPageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5C9D0419C81D8F00B3C5C1 /* WebPageOverlay.h */; };
> 		2D6AB541192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6AB53F192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.h */; };
> 		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 */; };
> 		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, ); }; };
>@@ -668,26 +635,9 @@
> 		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 */; };
> 		2D8786201BDB57F500D02ABB /* _WKUserStyleSheetInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D87861F1BDB57F500D02ABB /* _WKUserStyleSheetInternal.h */; };
> 		2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8786221BDB58FF00D02ABB /* APIUserStyleSheet.h */; };
> 		2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8949EF182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h */; };
>-		2D913428212C84F500128AFD /* WKWebProcessBundleParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA2E56418D77508003814BD /* WKWebProcessBundleParameters.mm */; };
>-		2D913429212C84F500128AFD /* WKWebProcessPlugInFrame.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816A1858DC1500F92884 /* WKWebProcessPlugInFrame.mm */; };
>-		2D91342A212C84F500128AFD /* WKWebProcessPlugInHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F01816D1858DC1600F92884 /* WKWebProcessPlugInHitTestResult.mm */; };
>-		2D91342B212C84F500128AFD /* WKWebProcessPlugInNodeHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181701858DC1600F92884 /* WKWebProcessPlugInNodeHandle.mm */; };
>-		2D91342C212C84F500128AFD /* WKWebProcessPlugInPageGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1FB00AC5185F76460019142E /* WKWebProcessPlugInPageGroup.mm */; };
>-		2D91342D212C84F500128AFD /* WKWebProcessPlugInRangeHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374942181DF1F9FF0033C19F /* WKWebProcessPlugInRangeHandle.mm */; };
>-		2D91342E212C84F500128AFD /* WKWebProcessPlugInScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */; };
>-		2D91342F212C850100128AFD /* WKWebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC989D7F161A7E5B000D46D3 /* WKWebProcessPlugIn.mm */; };
>-		2D913430212C850100128AFD /* WKWebProcessPlugInBrowserContextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8F2F2816273A2B005FACB5 /* WKWebProcessPlugInBrowserContextController.mm */; };
>-		2D913431212C853D00128AFD /* WKDOMDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC017D0016260FF4007054F5 /* WKDOMDocument.mm */; };
>-		2D913432212C853D00128AFD /* WKDOMElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC017D0216260FF4007054F5 /* WKDOMElement.mm */; };
>-		2D913433212C853D00128AFD /* WKDOMInternals.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC017D0416260FF4007054F5 /* WKDOMInternals.mm */; };
>-		2D913434212C853D00128AFD /* WKDOMNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC017D0616260FF4007054F5 /* WKDOMNode.mm */; };
>-		2D913435212C853D00128AFD /* WKDOMRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC39C4331626366F008BC689 /* WKDOMRange.mm */; };
>-		2D913436212C853D00128AFD /* WKDOMText.mm in Sources */ = {isa = PBXBuildFile; fileRef = 293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */; };
>-		2D913437212C853D00128AFD /* WKDOMTextIterator.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC017D1E16263308007054F5 /* WKDOMTextIterator.mm */; };
> 		2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE49A4811FFA8CE0048B464 /* JSNPMethod.cpp */; };
> 		2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4987711FF7FAA0048B464 /* JSNPObject.cpp */; };
> 		2D913443212CF9F000128AFD /* NetscapeBrowserFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */; };
>@@ -788,7 +738,6 @@
> 		316B8B642054B55800BD4A62 /* WKSystemPreviewView.h in Headers */ = {isa = PBXBuildFile; fileRef = 316B8B622054B55800BD4A62 /* WKSystemPreviewView.h */; };
> 		317FE7C51C487A6C00A0CA89 /* APIExperimentalFeature.h in Headers */ = {isa = PBXBuildFile; fileRef = 317FE7C21C487A6600A0CA89 /* APIExperimentalFeature.h */; };
> 		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, ); }; };
> 		318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17014743DB100A8FBB2 /* WKNotificationManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		318BE17914743E6F00A8FBB2 /* WKNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17814743E6A00A8FBB2 /* WKNotification.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -813,7 +762,6 @@
> 		3309345B1315B9980097A7BC /* WKCookieManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934591315B9980097A7BC /* WKCookieManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		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, ); }; };
> 		370F34A51829BEA3009027C8 /* WKNavigationDataInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 370F34A41829BEA3009027C8 /* WKNavigationDataInternal.h */; };
> 		370F34A71829CFF3009027C8 /* WKBrowsingContextHistoryDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 370F34A61829CFF3009027C8 /* WKBrowsingContextHistoryDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -829,7 +777,6 @@
> 		372EBB412017E64300085064 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
> 		373CEAD6185417AE008C363D /* WKNSData.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD4185417AE008C363D /* WKNSData.h */; };
> 		373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373CEAD71859553F008C363D /* WKPagePolicyClientInternal.h */; };
>-		373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 373D122018A473010066D9CC /* _WKFrameHandle.mm */; };
> 		373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122118A473010066D9CC /* _WKFrameHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122618A473F60066D9CC /* _WKFrameHandleInternal.h */; };
> 		373D122D18A4B6EB0066D9CC /* WKWebProcessPlugInFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 373D122C18A4B6A80066D9CC /* WKWebProcessPlugInFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -862,10 +809,8 @@
> 		37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 37948407150C4B9600E52CE9 /* WKRenderLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		3795789C18AD4F1900B9ED2E /* WKWebProcessPlugInFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3795789B18AD4F1100B9ED2E /* WKWebProcessPlugInFormDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		379A873618BBFA4300588AF2 /* _WKActivatedElementInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 379A873518BBFA4300588AF2 /* _WKActivatedElementInfoInternal.h */; };
>-		379A873918BBFE0F00588AF2 /* _WKElementAction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 379A873718BBFE0F00588AF2 /* _WKElementAction.mm */; };
> 		379A873A18BBFE0F00588AF2 /* _WKElementAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 379A873818BBFE0F00588AF2 /* _WKElementAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		379A873C18BBFF0700588AF2 /* _WKElementActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 379A873B18BBFF0700588AF2 /* _WKElementActionInternal.h */; };
>-		37A5E01318BBF937000A081E /* _WKActivatedElementInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */; };
> 		37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -879,10 +824,8 @@
> 		37BEC4E119491486008B4286 /* CompletionHandlerCallChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */; };
> 		37BF2F061947DEB400723C48 /* WKNSURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 37BF2F041947DEB400723C48 /* WKNSURLRequest.h */; };
> 		37C21CAE1E994C0C0029D5F9 /* CorePredictionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C21CAD1E994C0C0029D5F9 /* CorePredictionSPI.h */; };
>-		37C4C08618149C5B003688B9 /* WKBackForwardListItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */; };
> 		37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		37C4C08918149F23003688B9 /* WKBackForwardListItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */; };
>-		37C4C08C1814AC5C003688B9 /* WKBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */; };
> 		37C4C08D1814AC5C003688B9 /* WKBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		37C4C0941814B3AF003688B9 /* WKNSArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C0921814B3AF003688B9 /* WKNSArray.h */; };
> 		37C4C0951814B9E6003688B9 /* WKBackForwardListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C4C08E1814AF3A003688B9 /* WKBackForwardListInternal.h */; };
>@@ -892,7 +835,6 @@
> 		37F623B812A57B6200E3FDF6 /* WKFindOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		37F90DE31376560E0051CF68 /* HTTPCookieAcceptPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */; };
> 		37FC19471850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37FC194818510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm */; };
> 		37FC194B18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FC194918510D6A008CFA47 /* WKNSURLAuthenticationChallenge.h */; };
> 		3F418EF91887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF51887BD97002795FD /* VideoFullscreenManagerMessageReceiver.cpp */; };
> 		3F418EFB1887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F418EF71887BD97002795FD /* VideoFullscreenManagerProxyMessageReceiver.cpp */; };
>@@ -952,7 +894,6 @@
> 		510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 510AFFB816542048001BA05E /* WebResourceLoader.h */; };
> 		510F59101DDE296900412FF5 /* _WKIconLoadingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5143B25E1DDCDFD10014FAC6 /* _WKIconLoadingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		510F59111DDE297000412FF5 /* _WKLinkIconParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9791DDD78540032CAD3 /* _WKLinkIconParameters.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		510F59121DDE297700412FF5 /* _WKLinkIconParameters.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51C0C97A1DDD78540032CAD3 /* _WKLinkIconParameters.mm */; };
> 		510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510FBB991288C95E00AFFDF4 /* WebContextMenuItemData.h */; };
> 		5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 5110AE0B133C16CB0072717A /* WKIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5118E99C1F295266003EF9F5 /* WebToStorageProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5118E99A1F295259003EF9F5 /* WebToStorageProcessConnection.h */; };
>@@ -967,7 +908,6 @@
> 		511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
> 		511F8A81138B485D00A95F44 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.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 */; };
> 		51217461164C20E30037A5C1 /* ShareableResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5121745F164C20E30037A5C1 /* ShareableResource.h */; };
> 		5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 5123CF1A133D260A0056F800 /* WKIconDatabaseCG.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1038,12 +978,9 @@
> 		51C0C9741DDD76000032CAD3 /* IconLoadingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0C9721DDD74F00032CAD3 /* IconLoadingDelegate.h */; };
> 		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 */; };
> 		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 */; };
>-		51D124921E74BF48002B2820 /* WKHTTPCookieStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124851E734AE3002B2820 /* WKHTTPCookieStore.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 */; };
>@@ -1115,28 +1052,22 @@
> 		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 */; };
> 		5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		5CAFDE462130846800B1F7E1 /* _WKInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CAFDE432130843600B1F7E1 /* _WKInspector.mm */; };
> 		5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; };
>-		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 */; };
> 		5CBC9B8E1C652CA000A8FDCF /* NetworkDataTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */; };
> 		5CD286511E7235990094FDC8 /* WKContentRuleListStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864D1E722F440094FDC8 /* WKContentRuleListStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		5CD286521E7235A60094FDC8 /* WKContentRuleList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CD2864B1E722F440094FDC8 /* WKContentRuleList.mm */; };
> 		5CD286531E7235AA0094FDC8 /* _WKUserContentFilterPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD286491E722F440094FDC8 /* _WKUserContentFilterPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5CD286541E7235B10094FDC8 /* WKContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864A1E722F440094FDC8 /* WKContentRuleList.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		5CD286551E7235B80094FDC8 /* WKContentRuleListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864C1E722F440094FDC8 /* WKContentRuleListInternal.h */; };
>-		5CD286561E7235C60094FDC8 /* WKContentRuleListStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CD2864E1E722F440094FDC8 /* WKContentRuleListStore.mm */; };
> 		5CD286571E7235C90094FDC8 /* WKContentRuleListStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */; };
> 		5CD286581E7235D10094FDC8 /* WKContentRuleListStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD286501E722F440094FDC8 /* WKContentRuleListStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5CE85B201C88E64B0070BFCE /* PingLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE85B1F1C88E6430070BFCE /* PingLoad.h */; };
> 		617A52D81F43A9DA00DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 617A52D71F43A9B600DCDC0A /* ServiceWorkerClientFetchMessageReceiver.cpp */; };
> 		63108F961F96719C00A0DB84 /* _WKApplicationManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 63108F941F96719C00A0DB84 /* _WKApplicationManifest.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		63108F971F96719C00A0DB84 /* _WKApplicationManifest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 63108F951F96719C00A0DB84 /* _WKApplicationManifest.mm */; };
> 		63108F991F9671F700A0DB84 /* _WKApplicationManifestInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 63108F981F9671F700A0DB84 /* _WKApplicationManifestInternal.h */; };
> 		634842511FB26E7100946E3C /* APIApplicationManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 6348424F1FB26E7100946E3C /* APIApplicationManifest.h */; };
> 		636353A51E9858DF0009F8AF /* _WKGeolocationCoreLocationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 63FABE191E970D65003011D5 /* _WKGeolocationCoreLocationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		63C32C251E9810D900699BD0 /* _WKGeolocationPosition.mm in Sources */ = {isa = PBXBuildFile; fileRef = 63C32C231E9810D900699BD0 /* _WKGeolocationPosition.mm */; };
> 		63C32C261E9810D900699BD0 /* _WKGeolocationPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C32C241E9810D900699BD0 /* _WKGeolocationPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		63C32C281E98119000699BD0 /* _WKGeolocationPositionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C32C271E98119000699BD0 /* _WKGeolocationPositionInternal.h */; };
> 		65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A /* WKBundleInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1149,7 +1080,6 @@
> 		728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
> 		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 */; };
> 		75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */; };
> 		762B748D120BC75C00819339 /* WKPreferencesRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7A1E2A851EEFE8920037A0E0 /* APINotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1E2A841EEFE88A0037A0E0 /* APINotificationProvider.h */; };
>@@ -1168,7 +1098,6 @@
> 		7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
> 		7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7C1BA33E1A4A0E600043E249 /* APIDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1BA33C1A4A0E600043E249 /* APIDictionary.h */; };
>-		7C2413021AACFA7500A58C15 /* _WKUserContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C2413001AACFA7500A58C15 /* _WKUserContentExtensionStore.mm */; };
> 		7C2413031AACFA7500A58C15 /* _WKUserContentExtensionStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413011AACFA7500A58C15 /* _WKUserContentExtensionStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7C2413051AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413041AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h */; };
> 		7C2413091AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413071AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1183,7 +1112,6 @@
> 		7C4ABED11AA8E9F00088AA37 /* WebCompiledContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ABECF1AA8E9F00088AA37 /* WebCompiledContentRuleList.h */; };
> 		7C4ABED51AA8FCB80088AA37 /* WebCompiledContentRuleListData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4ABED31AA8FCB80088AA37 /* WebCompiledContentRuleListData.h */; };
> 		7C882DF71C7E9965006BF731 /* _WKUserContentWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C882DF31C7E995E006BF731 /* _WKUserContentWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7C882DF81C7E996C006BF731 /* _WKUserContentWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C882DF41C7E995E006BF731 /* _WKUserContentWorld.mm */; };
> 		7C882DF91C7E996F006BF731 /* _WKUserContentWorldInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C882DF51C7E995E006BF731 /* _WKUserContentWorldInternal.h */; };
> 		7C882DFA1C7E9973006BF731 /* WKUserScriptPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C882DF61C7E995E006BF731 /* WKUserScriptPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7C882DFD1C7E99A8006BF731 /* APIUserContentWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C882DFC1C7E99A6006BF731 /* APIUserContentWorld.h */; };
>@@ -1194,7 +1122,6 @@
> 		7C89D2A41A678875003A5FDE /* WKUserScriptRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2A21A678875003A5FDE /* WKUserScriptRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7C89D2B41A6B068C003A5FDE /* APIContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B21A6B068C003A5FDE /* APIContentRuleList.h */; };
> 		7C89D2B61A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B51A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C89D2B71A6B0F2C003A5FDE /* _WKUserContentFilter.mm */; };
> 		7C89D2BA1A6B0F2C003A5FDE /* _WKUserContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */; };
> 		7C89D2D71A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */; };
>@@ -1212,7 +1139,6 @@
> 		7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */; };
> 		7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */; };
> 		7CB365AA1D31DB70007158CA /* _WKUserInitiatedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365A81D31DB70007158CA /* _WKUserInitiatedAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7CB365AB1D31DB70007158CA /* _WKUserInitiatedAction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CB365A91D31DB70007158CA /* _WKUserInitiatedAction.mm */; };
> 		7CB365AD1D31DC10007158CA /* _WKUserInitiatedActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AC1D31DC10007158CA /* _WKUserInitiatedActionInternal.h */; };
> 		7CB365B11D31DD1E007158CA /* APIUserInitiatedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB365AF1D31DD1E007158CA /* APIUserInitiatedAction.h */; };
> 		7CBB811D1AA0F8B1006B1942 /* InjectedBundleFileHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CBB811B1AA0F8B1006B1942 /* InjectedBundleFileHandle.h */; };
>@@ -1223,7 +1149,6 @@
> 		7CD3A4831A5D02FA009623B8 /* APINavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD3A4811A5D02FA009623B8 /* APINavigation.h */; };
> 		7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBBC1746B04C000C1C45 /* WKTypeRefWrapper.mm */; };
> 		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 */; };
>@@ -1233,7 +1158,6 @@
> 		7CE4D2281A4916C200C7F152 /* WebProcessPoolMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE4D2261A4916C200C7F152 /* WebProcessPoolMessages.h */; };
> 		7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE9CE0F1FA0764D000177DE /* WebPageUpdatePreferences.cpp */; };
> 		7CEB00DD1FA69ABE0065473B /* WebPreferencesExperimentalFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEB00DC1FA69A890065473B /* WebPreferencesExperimentalFeatures.cpp */; };
>-		7CEFA9621AC0999300B910FD /* APIContentRuleListStoreCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CEFA9601AC0999300B910FD /* APIContentRuleListStoreCocoa.mm */; };
> 		7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FF517275B71008ACB91 /* WKBundlePageBanner.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FF917275C57008ACB91 /* PageBanner.h */; };
> 		7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1282,25 +1206,19 @@
> 		9391074F1BF6BC65008C17AD /* WKPreviewElementInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391074E1BF6BC65008C17AD /* WKPreviewElementInfoInternal.h */; };
> 		9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
> 		9395E68A1BF2C33200F49BCE /* WKPreviewElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 9395E6891BF2C33200F49BCE /* WKPreviewElementInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		9395E68C1BF2C35200F49BCE /* WKPreviewElementInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9395E68B1BF2C35200F49BCE /* WKPreviewElementInfo.mm */; };
> 		939F401C19FB0BBC002B2B42 /* WKActionMenuTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 939F401B19FB0BBC002B2B42 /* WKActionMenuTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93A253ED1C922E1E00F9F68D /* WKPreviewActionItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A253EC1C922E1E00F9F68D /* WKPreviewActionItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		93A253EF1C922E8E00F9F68D /* WKPreviewActionItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93A253EE1C922E8E00F9F68D /* WKPreviewActionItem.mm */; };
> 		93A253F31C92411200F9F68D /* WKPreviewActionItemIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A253F21C92411200F9F68D /* WKPreviewActionItemIdentifiers.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		93A253F51C92413200F9F68D /* WKPreviewActionItemIdentifiers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93A253F41C92413200F9F68D /* WKPreviewActionItemIdentifiers.mm */; };
> 		93A2A3461D246125002B59D3 /* mediaIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 93A2A3451D246125002B59D3 /* mediaIcon.pdf */; };
> 		93A88B331BC6E9CD00ABA5C2 /* WebHitTestResultData.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A88B311BC6E9C000ABA5C2 /* WebHitTestResultData.h */; };
>-		93A88B391BC70F3F00ABA5C2 /* _WKHitTestResult.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93A88B371BC70F2E00ABA5C2 /* _WKHitTestResult.mm */; };
> 		93A88B3B1BC710D900ABA5C2 /* _WKHitTestResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A88B3A1BC710D900ABA5C2 /* _WKHitTestResultInternal.h */; };
> 		93A88B461BC8829300ABA5C2 /* APIHitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 93A88B431BC8828C00ABA5C2 /* APIHitTestResult.h */; };
> 		93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 93BDEB00171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93E6A4EE1BC5DD3900F8A0E7 /* _WKHitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E6A4ED1BC5DD3900F8A0E7 /* _WKHitTestResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93F549B41E3174B7000E7239 /* WKSnapshotConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 93F549B31E3174B7000E7239 /* WKSnapshotConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
>-		93F549B61E3174DA000E7239 /* WKSnapshotConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93F549B51E3174DA000E7239 /* WKSnapshotConfiguration.mm */; };
> 		990D28AB1C6420C600986977 /* _WKAutomationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28A71C6404B000986977 /* _WKAutomationSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		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 */; };
> 		990D28C01C6553F100986977 /* APIAutomationSessionClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 990D28B31C6526D400986977 /* APIAutomationSessionClient.h */; };
> 		99249AD51F1F1E5600B62FBB /* AutomationFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99249AD31F1F1E3300B62FBB /* AutomationFrontendDispatchers.cpp */; };
>@@ -1314,7 +1232,6 @@
> 		9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F21C79866400EB6A93 /* AutomationProtocolObjects.cpp */; };
> 		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 */; };
> 		99C3AE2D1DADA6AD00AF5C16 /* WebAutomationSessionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C3AE2C1DADA6A700AF5C16 /* WebAutomationSessionMacros.h */; };
> 		99C81D5A1C20E7E2005C4C82 /* AutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D551C20DFBE005C4C82 /* AutomationClient.h */; };
> 		99C81D5D1C21F38B005C4C82 /* APIAutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D5B1C20E817005C4C82 /* APIAutomationClient.h */; };
>@@ -1327,7 +1244,6 @@
> 		A11455B0211FD25200CA935B /* NetworkProximityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AE211FD25200CA935B /* NetworkProximityManager.h */; };
> 		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 */; };
>@@ -1335,7 +1251,6 @@
> 		A182D5B51BE6BD250087A7CC /* AccessibilityIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */; };
> 		A19DD3C01D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = A19DD3BF1D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h */; };
> 		A1A4FE5A18DCE9FA00B5EA8A /* _WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = A1A4FE5718DCE9FA00B5EA8A /* _WKDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		A1A4FE5B18DCE9FA00B5EA8A /* _WKDownload.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1A4FE5818DCE9FA00B5EA8A /* _WKDownload.mm */; };
> 		A1A4FE5C18DCE9FA00B5EA8A /* _WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = A1A4FE5918DCE9FA00B5EA8A /* _WKDownloadInternal.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 */; };
>@@ -1348,7 +1263,6 @@
> 		A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */; };
> 		A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */; };
> 		A55BA8101BA1317E007CD33D /* _WKRemoteWebInspectorViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA80C1BA12BE1007CD33D /* _WKRemoteWebInspectorViewController.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		A55BA8111BA13181007CD33D /* _WKRemoteWebInspectorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A55BA80D1BA12BE1007CD33D /* _WKRemoteWebInspectorViewController.mm */; };
> 		A55BA8171BA23E12007CD33D /* RemoteWebInspectorUI.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8131BA23E05007CD33D /* RemoteWebInspectorUI.h */; };
> 		A55BA81F1BA25B27007CD33D /* RemoteWebInspectorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8191BA25B1E007CD33D /* RemoteWebInspectorProxy.h */; };
> 		A55BA8251BA25CFB007CD33D /* RemoteWebInspectorProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8221BA25BB8007CD33D /* RemoteWebInspectorProxyMessages.h */; };
>@@ -1357,7 +1271,6 @@
> 		A55BA8351BA3E70A007CD33D /* WebInspectorFrontendAPIDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */; };
> 		A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
> 		A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		A5C0F0A82000655100536536 /* _WKNSWindowExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5C0F0A52000654400536536 /* _WKNSWindowExtras.mm */; };
> 		A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* WKInspectorWindow.h */; };
> 		A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */; };
>@@ -1492,7 +1405,6 @@
> 		BC857FB512B830E600EDEB2E /* APIOpenPanelParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = BC857FB312B830E600EDEB2E /* APIOpenPanelParameters.h */; };
> 		BC857FE612B843D800EDEB2E /* WKOpenPanelParametersRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BC857FE412B843D800EDEB2E /* WKOpenPanelParametersRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BC8699B5116AADAA002A925B /* WKView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B2116AADAA002A925B /* WKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		BC8699B6116AADAA002A925B /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8699B3116AADAA002A925B /* WKView.mm */; };
> 		BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B4116AADAA002A925B /* WKViewInternal.h */; };
> 		BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8A501411765F5600757573 /* WKRetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */; };
>@@ -1507,7 +1419,6 @@
> 		BC9FA520160D3B430054DF9A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
> 		BCA0EF7F12331E78007D3CFB /* WebUndoStep.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA0EF7D12331E78007D3CFB /* WebUndoStep.h */; };
> 		BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA0EF9D12332642007D3CFB /* WebEditCommandProxy.h */; };
>-		BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA284D41492F2C7001F9042 /* WKConnection.mm */; };
> 		BCA284D71492F2C7001F9042 /* WKConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA284D51492F2C7001F9042 /* WKConnection.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
> 		BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
>@@ -1517,14 +1428,11 @@
> 		BCB9E24B1120E15C00A137E0 /* WKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9E2491120E15C00A137E0 /* WKContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCB9F6A01123A84B00A137E0 /* WebFramePolicyListenerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9F69E1123A84B00A137E0 /* WebFramePolicyListenerProxy.h */; };
> 		BCB9F6A51123DD0D00A137E0 /* WKFramePolicyListener.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9F6A31123DD0D00A137E0 /* WKFramePolicyListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		BCBAAC72144E61990053F82F /* WKBrowsingContextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCBAAC6D144E61920053F82F /* WKBrowsingContextController.mm */; };
> 		BCBAAC73144E619E0053F82F /* WKBrowsingContextController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAAC6C144E61910053F82F /* WKBrowsingContextController.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCBAAC74144E61A50053F82F /* WKBrowsingContextControllerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAAC6E144E61920053F82F /* WKBrowsingContextControllerInternal.h */; settings = {ATTRIBUTES = (); }; };
> 		BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAACE5145225C90053F82F /* WKProcessGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		BCBAACEC145225E30053F82F /* WKProcessGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCBAACE6145225CA0053F82F /* WKProcessGroup.mm */; };
> 		BCBAACED145225E30053F82F /* WKProcessGroupPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAACE7145225CB0053F82F /* WKProcessGroupPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCBAACF41452324F0053F82F /* WKBrowsingContextGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAACEE145232430053F82F /* WKBrowsingContextGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		BCBAACF51452324F0053F82F /* WKBrowsingContextGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCBAACEF145232440053F82F /* WKBrowsingContextGroup.mm */; };
> 		BCBAACF61452324F0053F82F /* WKBrowsingContextGroupPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAACF0145232480053F82F /* WKBrowsingContextGroupPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCBAAD0B14560A430053F82F /* WKBrowsingContextLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBAAD0A14560A430053F82F /* WKBrowsingContextLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBD3912125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp */; };
>@@ -1677,9 +1585,7 @@
> 		ECA680D81E690E2500731D20 /* WebProcessCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = ECA680D71E690DF800731D20 /* WebProcessCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		F41056632130699A0092281D /* APIAttachmentCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = F41056612130699A0092281D /* APIAttachmentCocoa.mm */; };
> 		F44291921FA591C9002CC93E /* _WKAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = F44291911FA59107002CC93E /* _WKAttachment.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		F44291941FA59311002CC93E /* _WKAttachment.mm in Sources */ = {isa = PBXBuildFile; fileRef = F44291931FA59311002CC93E /* _WKAttachment.mm */; };
> 		F44291961FA5942A002CC93E /* _WKAttachmentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F44291951FA5942A002CC93E /* _WKAttachmentInternal.h */; };
> 		F44DFEB21E9E752F0038D196 /* WebIconUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F44DFEB01E9E752F0038D196 /* WebIconUtilities.h */; };
> 		F496A4311F58A272004C1757 /* DragDropInteractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = F496A42F1F58A272004C1757 /* DragDropInteractionState.h */; };
>@@ -1688,7 +1594,6 @@
> 		F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
> 		F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.h */; };
>-		FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */; };
> 		FEDBDCD61E68D20000A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDBDCD41E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp */; };
> 		FEDBDCD71E68D20500A59F8F /* WebInspectorInterruptDispatcherMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDBDCD51E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessages.h */; };
> 		FEE43FD31E67B0180077D6D1 /* WebInspectorInterruptDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = FEE43FD11E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.h */; };
>@@ -10711,44 +10616,7 @@
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>-				37A5E01318BBF937000A081E /* _WKActivatedElementInfo.mm in Sources */,
>-				63108F971F96719C00A0DB84 /* _WKApplicationManifest.mm in Sources */,
>-				F44291941FA59311002CC93E /* _WKAttachment.mm in Sources */,
>-				990D28B21C65209400986977 /* _WKAutomationSession.mm in Sources */,
>-				99788ACC1F421DE200C08000 /* _WKAutomationSessionConfiguration.mm in Sources */,
>-				1A5704F71BE01FF400874AF1 /* _WKContextMenuElementInfo.mm in Sources */,
>-				A1A4FE5B18DCE9FA00B5EA8A /* _WKDownload.mm in Sources */,
>-				379A873918BBFE0F00588AF2 /* _WKElementAction.mm in Sources */,
>-				1AD01BC81905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm in Sources */,
>-				317FE7CE1C487DB800A0CA89 /* _WKExperimentalFeature.mm in Sources */,
>-				373D122218A473010066D9CC /* _WKFrameHandle.mm in Sources */,
>-				63C32C251E9810D900699BD0 /* _WKGeolocationPosition.mm in Sources */,
>-				93A88B391BC70F3F00ABA5C2 /* _WKHitTestResult.mm in Sources */,
>-				5CAFDE462130846800B1F7E1 /* _WKInspector.mm in Sources */,
>-				510F59121DDE297700412FF5 /* _WKLinkIconParameters.mm in Sources */,
>-				A118A9F21908B8EA00F7C92B /* _WKNSFileManagerExtras.mm in Sources */,
>-				A5C0F0A82000655100536536 /* _WKNSWindowExtras.mm in Sources */,
>-				1A43E829188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm in Sources */,
>-				1A9E328E182165A900F5D04C /* _WKRemoteObjectInterface.mm in Sources */,
>-				1A9E328A1821636900F5D04C /* _WKRemoteObjectRegistry.mm in Sources */,
>-				A55BA8111BA13181007CD33D /* _WKRemoteWebInspectorViewController.mm in Sources */,
>-				1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */,
>-				2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */,
>-				7C2413021AACFA7500A58C15 /* _WKUserContentExtensionStore.mm in Sources */,
>-				7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */,
>-				7C882DF81C7E996C006BF731 /* _WKUserContentWorld.mm in Sources */,
>-				7CB365AB1D31DB70007158CA /* _WKUserInitiatedAction.mm in Sources */,
>-				2D87861E1BDB54BF00D02ABB /* _WKUserStyleSheet.mm in Sources */,
>-				1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */,
>-				1AE286771C7E76510069AC4F /* _WKWebsiteDataSize.mm in Sources */,
>-				1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,
>-				5120C8361E5B74BE0025B250 /* _WKWebsiteDataStoreConfiguration.mm in Sources */,
>-				5CB2378B1DF0DE5300117AA3 /* _WKWebsitePolicies.mm in Sources */,
> 				2D92A784212B6AB100F493FD /* ActivityAssertion.cpp in Sources */,
>-				F41056632130699A0092281D /* APIAttachmentCocoa.mm in Sources */,
>-				7CEFA9621AC0999300B910FD /* APIContentRuleListStoreCocoa.mm in Sources */,
>-				FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */,
>-				1A3635AD1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm in Sources */,
> 				2D92A77B212B6A7100F493FD /* ArgumentCoders.cpp in Sources */,
> 				2DEB1D2E2127473600933906 /* ArgumentCodersCF.cpp in Sources */,
> 				2D92A77C212B6A7100F493FD /* Attachment.cpp in Sources */,
>@@ -10770,7 +10638,6 @@
> 				1AA576021496B97900A4EE06 /* EventDispatcherMessageReceiver.cpp in Sources */,
> 				2D913441212CF9F000128AFD /* JSNPMethod.cpp in Sources */,
> 				2D913442212CF9F000128AFD /* JSNPObject.cpp in Sources */,
>-				1AFDE64519510B5500C48FFA /* LegacyBundleForClass.mm in Sources */,
> 				2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */,
> 				2984F57C164B915F004BC0C6 /* LegacyCustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
> 				2D92A779212B6A6100F493FD /* Logging.cpp in Sources */,
>@@ -10825,8 +10692,6 @@
> 				2D54C31B212F4DA60049C174 /* ProcessLauncher.cpp in Sources */,
> 				2D72A1FA212BF46E00517A20 /* RemoteLayerTreeDrawingArea.mm in Sources */,
> 				0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */,
>-				1A5704FB1BE1751100874AF1 /* RemoteObjectInvocation.mm in Sources */,
>-				1AC1337F18590AE400F3EC05 /* RemoteObjectRegistry.mm in Sources */,
> 				1AC1338518590C4600F3EC05 /* RemoteObjectRegistryMessageReceiver.cpp in Sources */,
> 				0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */,
> 				A55BA8261BA25CFD007CD33D /* RemoteWebInspectorProxyMessageReceiver.cpp in Sources */,
>@@ -11098,65 +10963,10 @@
> 				1AAF08B719269E6D00B6390C /* WebUserContentControllerMessageReceiver.cpp in Sources */,
> 				7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */,
> 				2D92A78F212B6AB100F493FD /* WebWheelEvent.cpp in Sources */,
>-				37C4C08C1814AC5C003688B9 /* WKBackForwardList.mm in Sources */,
>-				37C4C08618149C5B003688B9 /* WKBackForwardListItem.mm in Sources */,
>-				BCBAAC72144E61990053F82F /* WKBrowsingContextController.mm in Sources */,
>-				BCBAACF51452324F0053F82F /* WKBrowsingContextGroup.mm in Sources */,
>-				1AE00D4C182D6EB000087DD7 /* WKBrowsingContextHandle.mm in Sources */,
>-				BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
>-				5CD286521E7235A60094FDC8 /* WKContentRuleList.mm in Sources */,
>-				5CD286561E7235C60094FDC8 /* WKContentRuleListStore.mm in Sources */,
> 				2D931169212F61B200044BFE /* WKContentView.mm in Sources */,
> 				2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */,
>-				2D913431212C853D00128AFD /* WKDOMDocument.mm in Sources */,
>-				2D913432212C853D00128AFD /* WKDOMElement.mm in Sources */,
>-				2D913433212C853D00128AFD /* WKDOMInternals.mm in Sources */,
>-				2D913434212C853D00128AFD /* WKDOMNode.mm in Sources */,
>-				2D913435212C853D00128AFD /* WKDOMRange.mm in Sources */,
>-				2D913436212C853D00128AFD /* WKDOMText.mm in Sources */,
>-				2D913437212C853D00128AFD /* WKDOMTextIterator.mm in Sources */,
>-				1AF4592E19464B2000F9D4A2 /* WKError.mm in Sources */,
>-				1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */,
>-				51D124921E74BF48002B2820 /* WKHTTPCookieStore.mm in Sources */,
>-				1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */,
>-				1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */,
>-				1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */,
>-				370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
>-				1A1B0EB518A424950038481A /* WKNavigationResponse.mm in Sources */,
>-				37FC194A18510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm in Sources */,
>-				1ACC50F11CBC381D003C7D03 /* WKOpenPanelParameters.mm in Sources */,
>-				1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */,
>-				93A253EF1C922E8E00F9F68D /* WKPreviewActionItem.mm in Sources */,
>-				93A253F51C92413200F9F68D /* WKPreviewActionItemIdentifiers.mm in Sources */,
>-				9395E68C1BF2C35200F49BCE /* WKPreviewElementInfo.mm in Sources */,
>-				BCBAACEC145225E30053F82F /* WKProcessGroup.mm in Sources */,
>-				1A158419189044F50017616C /* WKProcessPool.mm in Sources */,
>-				1A9E329A1822E1CC00F5D04C /* WKRemoteObject.mm in Sources */,
>-				1A9E329E1822FEDD00F5D04C /* WKRemoteObjectCoder.mm in Sources */,
>-				1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
>-				51CD1C661B34B9DC00142CA5 /* WKSecurityOrigin.mm in Sources */,
> 				1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
>-				93F549B61E3174DA000E7239 /* WKSnapshotConfiguration.mm in Sources */,
> 				26F10BE919187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.m in Sources */,
>-				7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */,
>-				51D124361E6DFB39002B2820 /* WKURLSchemeTask.mm in Sources */,
>-				1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */,
>-				1AAF089A19267EE500B6390C /* WKUserScript.mm in Sources */,
>-				BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
>-				2D913428212C84F500128AFD /* WKWebProcessBundleParameters.mm in Sources */,
>-				2D91342F212C850100128AFD /* WKWebProcessPlugIn.mm in Sources */,
>-				2D913430212C850100128AFD /* WKWebProcessPlugInBrowserContextController.mm in Sources */,
>-				2D913429212C84F500128AFD /* WKWebProcessPlugInFrame.mm in Sources */,
>-				2D91342A212C84F500128AFD /* WKWebProcessPlugInHitTestResult.mm in Sources */,
>-				2D91342B212C84F500128AFD /* WKWebProcessPlugInNodeHandle.mm in Sources */,
>-				2D91342C212C84F500128AFD /* WKWebProcessPlugInPageGroup.mm in Sources */,
>-				2D91342D212C84F500128AFD /* WKWebProcessPlugInRangeHandle.mm in Sources */,
>-				2D91342E212C84F500128AFD /* WKWebProcessPlugInScriptWorld.mm in Sources */,
>-				1A4832CB1A9BC465008B4DFE /* WKWebsiteDataRecord.mm in Sources */,
>-				75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */,
>-				1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */,
>-				1ADF591A1890528E0043C145 /* WKWebViewConfiguration.mm in Sources */,
>-				1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
>index 96adaa94098fa16eec49cf7dbaf48e8a671d1d46..ddde1236ac9b8ef8af7c34c5f508f01658e9bd9a 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
>@@ -44,15 +44,13 @@
> #import <WebCore/LinkIconCollector.h>
> #import <WebCore/LinkIconType.h>
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInFrame {
>-    API::ObjectStorage<WebFrame> _frame;
>+    API::ObjectStorage<WebKit::WebFrame> _frame;
> }
> 
> + (instancetype)lookUpFrameFromHandle:(_WKFrameHandle *)handle
> {
>-    return wrapper(WebProcess::singleton().webFrame(handle._frameID));
>+    return wrapper(WebKit::WebProcess::singleton().webFrame(handle._frameID));
> }
> 
> - (void)dealloc
>@@ -85,7 +83,7 @@ using namespace WebKit;
> 
> - (WKWebProcessPlugInBrowserContextController *)_browserContextController
> {
>-    return wrapper(*_frame->page());
>+    return WebKit::wrapper(*_frame->page());
> }
> 
> - (NSURL *)URL
>@@ -95,7 +93,7 @@ using namespace WebKit;
> 
> - (NSArray *)childFrames
> {
>-    return wrapper(_frame->childFrames());
>+    return WebKit::wrapper(_frame->childFrames());
> }
> 
> - (BOOL)containsAnyFormElements
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
>index 020947cfbd0b80d37c9af7c6346a80c2c7254cf8..dff84a257df9e38f2e42125c0eb038b509b943a1 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
>@@ -30,10 +30,8 @@
> 
> #import "WKWebProcessPlugInNodeHandleInternal.h"
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInHitTestResult {
>-    API::ObjectStorage<InjectedBundleHitTestResult> _hitTestResult;
>+    API::ObjectStorage<WebKit::InjectedBundleHitTestResult> _hitTestResult;
> }
> 
> - (void)dealloc
>@@ -44,7 +42,7 @@ using namespace WebKit;
> 
> - (WKWebProcessPlugInNodeHandle *)nodeHandle
> {
>-    return wrapper(_hitTestResult->nodeHandle());
>+    return WebKit::wrapper(_hitTestResult->nodeHandle());
> }
> 
> #pragma mark WKObject protocol implementation
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
>index 91cd0c40e4cebc5cbb67e1a7f53abd00b54aa724..50229200c73e08a6f4ee8919be204ce928be820e 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
>@@ -34,10 +34,8 @@
> 
> #if WK_API_ENABLED
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInNodeHandle {
>-    API::ObjectStorage<InjectedBundleNodeHandle> _nodeHandle;
>+    API::ObjectStorage<WebKit::InjectedBundleNodeHandle> _nodeHandle;
> }
> 
> - (void)dealloc
>@@ -50,12 +48,12 @@ using namespace WebKit;
> {
>     JSContextRef contextRef = [context JSGlobalContextRef];
>     JSObjectRef objectRef = JSValueToObject(contextRef, [value JSValueRef], nullptr);
>-    return wrapper(InjectedBundleNodeHandle::getOrCreate(contextRef, objectRef));
>+    return WebKit::wrapper(WebKit::InjectedBundleNodeHandle::getOrCreate(contextRef, objectRef));
> }
> 
> - (WKWebProcessPlugInFrame *)htmlIFrameElementContentFrame
> {
>-    return wrapper(_nodeHandle->htmlIFrameElementContentFrame());
>+    return WebKit::wrapper(_nodeHandle->htmlIFrameElementContentFrame());
> }
> 
> #if PLATFORM(IOS)
>@@ -70,7 +68,7 @@ using namespace WebKit;
>     if (width)
>         optionalWidth = width.floatValue;
> 
>-    RefPtr<WebImage> image = _nodeHandle->renderedImage(toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow, optionalWidth);
>+    RefPtr<WebKit::WebImage> image = _nodeHandle->renderedImage(WebKit::toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow, optionalWidth);
>     if (!image)
>         return nil;
> 
>@@ -90,7 +88,7 @@ using namespace WebKit;
>     if (width)
>         optionalWidth = width.floatValue;
> 
>-    RefPtr<WebImage> image = _nodeHandle->renderedImage(toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow, optionalWidth);
>+    RefPtr<WebKit::WebImage> image = _nodeHandle->renderedImage(WebKit::toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow, optionalWidth);
>     if (!image)
>         return nil;
> 
>@@ -183,15 +181,15 @@ static _WKAutoFillButtonType toWKAutoFillButtonType(WebCore::AutoFillButtonType
> 
> - (WKWebProcessPlugInNodeHandle *)HTMLTableCellElementCellAbove
> {
>-    return wrapper(_nodeHandle->htmlTableCellElementCellAbove());
>+    return WebKit::wrapper(_nodeHandle->htmlTableCellElementCellAbove());
> }
> 
> - (WKWebProcessPlugInFrame *)frame
> {
>-    return wrapper(_nodeHandle->document()->documentFrame());
>+    return WebKit::wrapper(_nodeHandle->document()->documentFrame());
> }
> 
>-- (InjectedBundleNodeHandle&)_nodeHandle
>+- (WebKit::InjectedBundleNodeHandle&)_nodeHandle
> {
>     return *_nodeHandle;
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
>index 63cad8838d3c51e7d507aec7961b3843e7b0a3e0..0239b6160ce9bc512addafec42881fd3b4dea23f 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
>@@ -34,10 +34,8 @@
> #import "WKRetainPtr.h"
> #import "WebPageGroupProxy.h"
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInPageGroup {
>-    API::ObjectStorage<WebPageGroupProxy> _bundlePageGroup;
>+    API::ObjectStorage<WebKit::WebPageGroupProxy> _bundlePageGroup;
> }
> 
> - (NSString *)identifier
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm
>index 4a8dd34359523d739da1f79e49c46b65e2596c5d..e2153d5d2526ac77513a3b07cdce5fe9647f9f33 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInRangeHandle.mm
>@@ -37,10 +37,8 @@
> #import "WKDataDetectorTypesInternal.h"
> #endif
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInRangeHandle {
>-    API::ObjectStorage<InjectedBundleRangeHandle> _rangeHandle;
>+    API::ObjectStorage<WebKit::InjectedBundleRangeHandle> _rangeHandle;
> }
> 
> - (void)dealloc
>@@ -53,7 +51,7 @@ using namespace WebKit;
> {
>     JSContextRef contextRef = [context JSGlobalContextRef];
>     JSObjectRef objectRef = JSValueToObject(contextRef, [value JSValueRef], nullptr);
>-    return wrapper(InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef));
>+    return wrapper(WebKit::InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef));
> }
> 
> - (WKWebProcessPlugInFrame *)frame
>@@ -78,7 +76,7 @@ using namespace WebKit;
> }
> #endif
> 
>-- (InjectedBundleRangeHandle&)_rangeHandle
>+- (WebKit::InjectedBundleRangeHandle&)_rangeHandle
> {
>     return *_rangeHandle;
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
>index ae8d9061f4430b2afc98a0a75a3151c70629dd7d..e042dfe2e3f096b7ecd4a16adf8ec92e34b727be 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
>@@ -28,20 +28,18 @@
> 
> #if WK_API_ENABLED
> 
>-using namespace WebKit;
>-
> @implementation WKWebProcessPlugInScriptWorld {
>-    API::ObjectStorage<InjectedBundleScriptWorld> _world;
>+    API::ObjectStorage<WebKit::InjectedBundleScriptWorld> _world;
> }
> 
> + (WKWebProcessPlugInScriptWorld *)world
> {
>-    return wrapper(InjectedBundleScriptWorld::create());
>+    return WebKit::wrapper(WebKit::InjectedBundleScriptWorld::create());
> }
> 
> + (WKWebProcessPlugInScriptWorld *)normalWorld
> {
>-    return wrapper(InjectedBundleScriptWorld::normalWorld());
>+    return WebKit::wrapper(WebKit::InjectedBundleScriptWorld::normalWorld());
> }
> 
> - (void)dealloc
>@@ -70,7 +68,7 @@ using namespace WebKit;
>     return _world->name();
> }
> 
>-- (InjectedBundleScriptWorld&)_scriptWorld
>+- (WebKit::InjectedBundleScriptWorld&)_scriptWorld
> {
>     return *_world;
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
>index 4057349c37a0a60280f565090bd9e19e7d04afaf..91d6b965e103dcaaaf33fcee7d8a95b53845b192 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
>@@ -37,10 +37,8 @@
> #import "WKWebProcessPlugInBrowserContextControllerInternal.h"
> #import <wtf/RetainPtr.h>
> 
>-using namespace WebKit;
>-
> @interface WKWebProcessPlugInController () {
>-    API::ObjectStorage<InjectedBundle> _bundle;
>+    API::ObjectStorage<WebKit::InjectedBundle> _bundle;
>     RetainPtr<id <WKWebProcessPlugIn>> _principalClassInstance;
> }
> @end
>@@ -60,7 +58,7 @@ static void didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void*
>     id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
> 
>     if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:didCreateBrowserContextController:)])
>-        [principalClassInstance webProcessPlugIn:plugInController didCreateBrowserContextController:wrapper(*toImpl(page))];
>+        [principalClassInstance webProcessPlugIn:plugInController didCreateBrowserContextController:wrapper(*WebKit::toImpl(page))];
> }
> 
> static void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
>@@ -69,10 +67,10 @@ static void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void
>     id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
> 
>     if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:willDestroyBrowserContextController:)])
>-        [principalClassInstance webProcessPlugIn:plugInController willDestroyBrowserContextController:wrapper(*toImpl(page))];
>+        [principalClassInstance webProcessPlugIn:plugInController willDestroyBrowserContextController:wrapper(*WebKit::toImpl(page))];
> }
> 
>-static void setUpBundleClient(WKWebProcessPlugInController *plugInController, InjectedBundle& bundle)
>+static void setUpBundleClient(WKWebProcessPlugInController *plugInController, WebKit::InjectedBundle& bundle)
> {
>     WKBundleClientV1 bundleClient;
>     memset(&bundleClient, 0, sizeof(bundleClient));
>@@ -111,7 +109,7 @@ static Ref<API::Array> createWKArray(NSArray *array)
>     
>     for (id entry in array) {
>         if ([entry isKindOfClass:[NSString class]])
>-            strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
>+            strings.uncheckedAppend(adoptRef(WebKit::toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
>     }
>     
>     return API::Array::create(WTFMove(strings));
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
>index 28dc0669df5dd20e0bc1e0667ece9f7e5394c492..bc7a24ac9115db3bdde131fee4357cb5f110d0f5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
>@@ -66,15 +66,12 @@
> #import <pal/spi/cocoa/NSKeyedArchiverSPI.h>
> #import <wtf/WeakObjCPtr.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> @interface NSObject (WKDeprecatedDelegateMethods)
> - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller didSameDocumentNavigationForFrame:(WKWebProcessPlugInFrame *)frame;
> @end
> 
> @implementation WKWebProcessPlugInBrowserContextController {
>-    API::ObjectStorage<WebPage> _page;
>+    API::ObjectStorage<WebKit::WebPage> _page;
>     WeakObjCPtr<id <WKWebProcessPlugInLoadDelegate>> _loadDelegate;
>     WeakObjCPtr<id <WKWebProcessPlugInFormDelegatePrivate>> _formDelegate;
>     WeakObjCPtr<id <WKWebProcessPlugInEditingDelegate>> _editingDelegate;
>@@ -88,7 +85,7 @@ static void didStartProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameR
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didStartProvisionalLoadForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didStartProvisionalLoadForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didStartProvisionalLoadForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef *userDataRef, const void *clientInfo)
>@@ -97,7 +94,7 @@ static void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef p
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didReceiveServerRedirectForProvisionalLoadForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didReceiveServerRedirectForProvisionalLoadForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didReceiveServerRedirectForProvisionalLoadForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didFinishLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
>@@ -106,7 +103,7 @@ static void didFinishLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishLoadForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFinishLoadForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFinishLoadForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void globalObjectIsAvailableForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleScriptWorldRef scriptWorld, const void* clientInfo)
>@@ -115,7 +112,7 @@ static void globalObjectIsAvailableForFrame(WKBundlePageRef page, WKBundleFrameR
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:globalObjectIsAvailableForFrame:inScriptWorld:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController globalObjectIsAvailableForFrame:wrapper(*toImpl(frame)) inScriptWorld:wrapper(*toImpl(scriptWorld))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController globalObjectIsAvailableForFrame:wrapper(*WebKit::toImpl(frame)) inScriptWorld:wrapper(*WebKit::toImpl(scriptWorld))];
> }
> 
> static void didRemoveFrameFromHierarchy(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void* clientInfo)
>@@ -124,7 +121,7 @@ static void didRemoveFrameFromHierarchy(WKBundlePageRef page, WKBundleFrameRef f
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didRemoveFrameFromHierarchy:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didRemoveFrameFromHierarchy:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didRemoveFrameFromHierarchy:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didCommitLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
>@@ -133,7 +130,7 @@ static void didCommitLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame,
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didCommitLoadForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didCommitLoadForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didCommitLoadForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
>@@ -142,7 +139,7 @@ static void didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishDocumentLoadForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFinishDocumentLoadForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFinishDocumentLoadForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
>@@ -151,7 +148,7 @@ static void didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef page, WKBund
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailProvisionalLoadWithErrorForFrame:error:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFailProvisionalLoadWithErrorForFrame:wrapper(*toImpl(frame)) error:wrapper(*toImpl(wkError))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFailProvisionalLoadWithErrorForFrame:wrapper(*WebKit::toImpl(frame)) error:wrapper(*WebKit::toImpl(wkError))];
> }
> 
> static void didFailLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
>@@ -160,7 +157,7 @@ static void didFailLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailLoadWithErrorForFrame:error:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFailLoadWithErrorForFrame:wrapper(*toImpl(frame)) error:wrapper(*toImpl(wkError))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFailLoadWithErrorForFrame:wrapper(*WebKit::toImpl(frame)) error:wrapper(*WebKit::toImpl(wkError))];
> }
> 
> static void didSameDocumentNavigationForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef* userData, const void *clientInfo)
>@@ -169,11 +166,11 @@ static void didSameDocumentNavigationForFrame(WKBundlePageRef page, WKBundleFram
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didSameDocumentNavigation:forFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didSameDocumentNavigation:toWKSameDocumentNavigationType(toSameDocumentNavigationType(type)) forFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didSameDocumentNavigation:toWKSameDocumentNavigationType(WebKit::toSameDocumentNavigationType(type)) forFrame:wrapper(*WebKit::toImpl(frame))];
>     else {
>         // FIXME: Remove this once clients switch to implementing the above delegate method.
>         if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didSameDocumentNavigationForFrame:)])
>-            [(NSObject *)loadDelegate webProcessPlugInBrowserContextController:pluginContextController didSameDocumentNavigationForFrame:wrapper(*toImpl(frame))];
>+            [(NSObject *)loadDelegate webProcessPlugInBrowserContextController:pluginContextController didSameDocumentNavigationForFrame:wrapper(*WebKit::toImpl(frame))];
>     }
> }
> 
>@@ -183,7 +180,7 @@ static void didLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, cons
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didLayoutForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didLayoutForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didLayoutForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
>@@ -192,7 +189,7 @@ static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones mil
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(toLayoutMilestones(milestones))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController renderingProgressDidChange:renderingProgressEvents(WebKit::toLayoutMilestones(milestones))];
> }
> 
> static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
>@@ -201,7 +198,7 @@ static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundl
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFirstVisuallyNonEmptyLayoutForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFirstVisuallyNonEmptyLayoutForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didFirstVisuallyNonEmptyLayoutForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static void didHandleOnloadEventsForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
>@@ -210,7 +207,7 @@ static void didHandleOnloadEventsForFrame(WKBundlePageRef page, WKBundleFrameRef
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didHandleOnloadEventsForFrame:)])
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didHandleOnloadEventsForFrame:wrapper(*toImpl(frame))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didHandleOnloadEventsForFrame:wrapper(*WebKit::toImpl(frame))];
> }
> 
> static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const void* clientInfo)
>@@ -219,8 +216,8 @@ static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const v
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
>     
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:userAgentForURL:)]) {
>-        WKWebProcessPlugInFrame *newFrame = wrapper(*toImpl(frame));
>-        NSString *string = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:newFrame userAgentForURL:wrapper(*toImpl(url))];
>+        WKWebProcessPlugInFrame *newFrame = wrapper(*WebKit::toImpl(frame));
>+        NSString *string = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:newFrame userAgentForURL:wrapper(*WebKit::toImpl(url))];
>         if (!string)
>             return nullptr;
> 
>@@ -230,7 +227,7 @@ static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const v
>     return nullptr;
> }
> 
>-static void setUpPageLoaderClient(WKWebProcessPlugInBrowserContextController *contextController, WebPage& page)
>+static void setUpPageLoaderClient(WKWebProcessPlugInBrowserContextController *contextController, WebKit::WebPage& page)
> {
>     WKBundlePageLoaderClientV9 client;
>     memset(&client, 0, sizeof(client));
>@@ -263,16 +260,16 @@ static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:)]) {
>-        NSURLRequest *originalRequest = wrapper(*toImpl(request));
>-        RetainPtr<NSURLRequest> substituteRequest = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*toImpl(frame)) willSendRequestForResource:resourceIdentifier
>-            request:originalRequest redirectResponse:toImpl(redirectResponse)->resourceResponse().nsURLResponse()];
>+        NSURLRequest *originalRequest = wrapper(*WebKit::toImpl(request));
>+        RetainPtr<NSURLRequest> substituteRequest = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) willSendRequestForResource:resourceIdentifier
>+            request:originalRequest redirectResponse:WebKit::toImpl(redirectResponse)->resourceResponse().nsURLResponse()];
> 
>         if (substituteRequest != originalRequest)
>             return substituteRequest ? WKURLRequestCreateWithNSURLRequest(substituteRequest.get()) : nullptr;
>     } else if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:willSendRequest:redirectResponse:)]) {
>-        NSURLRequest *originalRequest = wrapper(*toImpl(request));
>-        RetainPtr<NSURLRequest> substituteRequest = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*toImpl(frame)) willSendRequest:originalRequest
>-            redirectResponse:toImpl(redirectResponse)->resourceResponse().nsURLResponse()];
>+        NSURLRequest *originalRequest = wrapper(*WebKit::toImpl(request));
>+        RetainPtr<NSURLRequest> substituteRequest = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) willSendRequest:originalRequest
>+            redirectResponse:WebKit::toImpl(redirectResponse)->resourceResponse().nsURLResponse()];
> 
>         if (substituteRequest != originalRequest)
>             return substituteRequest ? WKURLRequestCreateWithNSURLRequest(substituteRequest.get()) : nullptr;
>@@ -288,10 +285,10 @@ static void didInitiateLoadForResource(WKBundlePageRef, WKBundleFrameRef frame,
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didInitiateLoadForResource:request:pageIsProvisionallyLoading:)]) {
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*toImpl(frame)) didInitiateLoadForResource:resourceIdentifier request:wrapper(*toImpl(request))
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) didInitiateLoadForResource:resourceIdentifier request:wrapper(*WebKit::toImpl(request))
>             pageIsProvisionallyLoading:pageIsProvisionallyLoading];
>     } else if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didInitiateLoadForResource:request:)]) {
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*toImpl(frame)) didInitiateLoadForResource:resourceIdentifier request:wrapper(*toImpl(request))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) didInitiateLoadForResource:resourceIdentifier request:wrapper(*WebKit::toImpl(request))];
>     }
> }
> 
>@@ -301,9 +298,7 @@ static void didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, ui
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFinishLoadForResource:)]) {
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController
>-                                                         frame:wrapper(*toImpl(frame))
>-                                      didFinishLoadForResource:resourceIdentifier];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) didFinishLoadForResource:resourceIdentifier];
>     }
> }
> 
>@@ -313,14 +308,11 @@ static void didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint
>     auto loadDelegate = pluginContextController->_loadDelegate.get();
> 
>     if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFailLoadForResource:error:)]) {
>-        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController
>-                                                         frame:wrapper(*toImpl(frame))
>-                                        didFailLoadForResource:resourceIdentifier
>-                                                         error:wrapper(*toImpl(error))];
>+        [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:wrapper(*WebKit::toImpl(frame)) didFailLoadForResource:resourceIdentifier error:wrapper(*WebKit::toImpl(error))];
>     }
> }
> 
>-static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *contextController, WebPage& page)
>+static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *contextController, WebKit::WebPage& page)
> {
>     WKBundlePageResourceLoadClientV1 client;
>     memset(&client, 0, sizeof(client));
>@@ -356,7 +348,7 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
> - (void)dealloc
> {
>     if (_remoteObjectRegistry) {
>-        WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID());
>+        WebKit::WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID());
>         [_remoteObjectRegistry _invalidate];
>     }
> 
>@@ -367,20 +359,20 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
> 
> - (WKDOMDocument *)mainFrameDocument
> {
>-    Frame* webCoreMainFrame = _page->mainFrame();
>+    WebCore::Frame* webCoreMainFrame = _page->mainFrame();
>     if (!webCoreMainFrame)
>         return nil;
> 
>-    return toWKDOMDocument(webCoreMainFrame->document());
>+    return WebKit::toWKDOMDocument(webCoreMainFrame->document());
> }
> 
> - (WKDOMRange *)selectedRange
> {
>-    RefPtr<Range> range = _page->currentSelectionAsRange();
>+    RefPtr<WebCore::Range> range = _page->currentSelectionAsRange();
>     if (!range)
>         return nil;
> 
>-    return toWKDOMRange(range.get());
>+    return WebKit::toWKDOMRange(range.get());
> }
> 
> - (WKWebProcessPlugInFrame *)mainFrame
>@@ -416,14 +408,14 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
> 
> + (instancetype)lookUpBrowsingContextFromHandle:(WKBrowsingContextHandle *)handle
> {
>-    return wrapper(WebProcess::singleton().webPage(handle.pageID));
>+    return wrapper(WebKit::WebProcess::singleton().webPage(handle.pageID));
> }
> 
> - (_WKRemoteObjectRegistry *)_remoteObjectRegistry
> {
>     if (!_remoteObjectRegistry) {
>         _remoteObjectRegistry = adoptNS([[_WKRemoteObjectRegistry alloc] _initWithWebPage:*_page]);
>-        WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
>+        WebKit::WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
>     }
> 
>     return _remoteObjectRegistry.get();
>@@ -447,15 +439,15 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
> 
>         virtual ~FormClient() { }
> 
>-        void didFocusTextField(WebPage*, HTMLInputElement* inputElement, WebFrame* frame) override
>+        void didFocusTextField(WebKit::WebPage*, WebCore::HTMLInputElement* inputElement, WebKit::WebFrame* frame) override
>         {
>             auto formDelegate = m_controller->_formDelegate.get();
> 
>             if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:didFocusTextField:inFrame:)])
>-                [formDelegate _webProcessPlugInBrowserContextController:m_controller didFocusTextField:wrapper(*InjectedBundleNodeHandle::getOrCreate(inputElement).get()) inFrame:wrapper(*frame)];
>+                [formDelegate _webProcessPlugInBrowserContextController:m_controller didFocusTextField:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement).get()) inFrame:wrapper(*frame)];
>         }
> 
>-        void willSendSubmitEvent(WebPage*, HTMLFormElement* formElement, WebFrame* targetFrame, WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values) override
>+        void willSendSubmitEvent(WebKit::WebPage*, WebCore::HTMLFormElement* formElement, WebKit::WebFrame* targetFrame, WebKit::WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values) override
>         {
>             auto formDelegate = m_controller->_formDelegate.get();
> 
>@@ -464,7 +456,7 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
>                 for (const auto& pair : values)
>                     [valueMap setObject:pair.second forKey:pair.first];
> 
>-                [formDelegate _webProcessPlugInBrowserContextController:m_controller willSendSubmitEventToForm:wrapper(*InjectedBundleNodeHandle::getOrCreate(formElement).get())
>+                [formDelegate _webProcessPlugInBrowserContextController:m_controller willSendSubmitEventToForm:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(formElement).get())
>                     inFrame:wrapper(*sourceFrame) targetFrame:wrapper(*targetFrame) values:valueMap.get()];
>             }
>         }
>@@ -486,7 +478,7 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
>             userData = API::Data::createWithoutCopying(archiver.get().encodedData);
>         }
> 
>-        void willSubmitForm(WebPage*, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<WTF::String, WTF::String>>& values, RefPtr<API::Object>& userData) override
>+        void willSubmitForm(WebKit::WebPage*, WebCore::HTMLFormElement* formElement, WebKit::WebFrame* frame, WebKit::WebFrame* sourceFrame, const Vector<std::pair<WTF::String, WTF::String>>& values, RefPtr<API::Object>& userData) override
>         {
>             auto formDelegate = m_controller->_formDelegate.get();
> 
>@@ -495,12 +487,12 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
>                 for (const auto& pair : values)
>                     [valueMap setObject:pair.second forKey:pair.first];
> 
>-                NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller willSubmitForm:wrapper(*InjectedBundleNodeHandle::getOrCreate(formElement).get()) toFrame:wrapper(*frame) fromFrame:wrapper(*sourceFrame) withValues:valueMap.get()];
>+                NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller willSubmitForm:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(formElement).get()) toFrame:wrapper(*frame) fromFrame:wrapper(*sourceFrame) withValues:valueMap.get()];
>                 encodeUserObject(userObject, userData);
>             }
>         }
> 
>-        void textDidChangeInTextField(WebPage*, HTMLInputElement* inputElement, WebFrame* frame, bool initiatedByUserTyping) override
>+        void textDidChangeInTextField(WebKit::WebPage*, WebCore::HTMLInputElement* inputElement, WebKit::WebFrame* frame, bool initiatedByUserTyping) override
>         {
>             auto formDelegate = m_controller->_formDelegate.get();
> 
>@@ -508,7 +500,7 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
>                 [formDelegate _webProcessPlugInBrowserContextController:m_controller textDidChangeInTextField:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(inputElement)) inFrame:wrapper(*frame) initiatedByUserTyping:initiatedByUserTyping];
>         }
> 
>-        void willBeginInputSession(WebPage*, Element* element, WebFrame* frame, bool userIsInteracting, RefPtr<API::Object>& userData) override
>+        void willBeginInputSession(WebKit::WebPage*, WebCore::Element* element, WebKit::WebFrame* frame, bool userIsInteracting, RefPtr<API::Object>& userData) override
>         {
>             auto formDelegate = m_controller->_formDelegate.get();
> 
>@@ -563,14 +555,14 @@ static void setUpResourceLoadClient(WKWebProcessPlugInBrowserContextController *
>     return _editingDelegate.getAutoreleased();
> }
> 
>-static inline WKEditorInsertAction toWK(EditorInsertAction action)
>+static inline WKEditorInsertAction toWK(WebCore::EditorInsertAction action)
> {
>     switch (action) {
>-    case EditorInsertAction::Typed:
>+    case WebCore::EditorInsertAction::Typed:
>         return WKEditorInsertActionTyped;
>-    case EditorInsertAction::Pasted:
>+    case WebCore::EditorInsertAction::Pasted:
>         return WKEditorInsertActionPasted;
>-    case EditorInsertAction::Dropped:
>+    case WebCore::EditorInsertAction::Dropped:
>         return WKEditorInsertActionDropped;
>     }
> }
>@@ -588,15 +580,15 @@ static inline WKEditorInsertAction toWK(EditorInsertAction action)
>         }
> 
>     private:
>-        bool shouldInsertText(WebPage&, StringImpl* text, Range* rangeToReplace, EditorInsertAction action) final
>+        bool shouldInsertText(WebKit::WebPage&, StringImpl* text, WebCore::Range* rangeToReplace, WebCore::EditorInsertAction action) final
>         {
>             if (!m_delegateMethods.shouldInsertText)
>                 return true;
> 
>-            return [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller shouldInsertText:String(text) replacingRange:wrapper(*InjectedBundleRangeHandle::getOrCreate(rangeToReplace)) givenAction:toWK(action)];
>+            return [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller shouldInsertText:String(text) replacingRange:wrapper(*WebKit::InjectedBundleRangeHandle::getOrCreate(rangeToReplace)) givenAction:toWK(action)];
>         }
> 
>-        bool shouldChangeSelectedRange(WebPage&, Range* fromRange, Range* toRange, EAffinity affinity, bool stillSelecting) final
>+        bool shouldChangeSelectedRange(WebKit::WebPage&, WebCore::Range* fromRange, WebCore::Range* toRange, WebCore::EAffinity affinity, bool stillSelecting) final
>         {
>             if (!m_delegateMethods.shouldChangeSelectedRange)
>                 return true;
>@@ -604,9 +596,9 @@ static inline WKEditorInsertAction toWK(EditorInsertAction action)
>             auto apiFromRange = fromRange ? adoptNS([[WKDOMRange alloc] _initWithImpl:fromRange]) : nil;
>             auto apiToRange = toRange ? adoptNS([[WKDOMRange alloc] _initWithImpl:toRange]) : nil;
> #if PLATFORM(IOS)
>-            UITextStorageDirection apiAffinity = affinity == UPSTREAM ? UITextStorageDirectionBackward : UITextStorageDirectionForward;
>+            UITextStorageDirection apiAffinity = affinity == WebCore::UPSTREAM ? UITextStorageDirectionBackward : UITextStorageDirectionForward;
> #else
>-            NSSelectionAffinity apiAffinity = affinity == UPSTREAM ? NSSelectionAffinityUpstream : NSSelectionAffinityDownstream;
>+            NSSelectionAffinity apiAffinity = affinity == WebCore::UPSTREAM ? NSSelectionAffinityUpstream : NSSelectionAffinityDownstream;
> #endif
> 
>             return [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller shouldChangeSelectedRange:apiFromRange.get() toRange:apiToRange.get() affinity:apiAffinity stillSelecting:stillSelecting];
>@@ -625,7 +617,7 @@ static inline WKEditorInsertAction toWK(EditorInsertAction action)
>             if (!m_delegateMethods.willWriteToPasteboard)
>                 return;
> 
>-            [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller willWriteRangeToPasteboard:wrapper(*InjectedBundleRangeHandle::getOrCreate(range).get())];
>+            [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller willWriteRangeToPasteboard:wrapper(*WebKit::InjectedBundleRangeHandle::getOrCreate(range).get())];
>         }
> 
>         void getPasteboardDataForRange(WebKit::WebPage&, WebCore::Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData) final
>@@ -633,10 +625,10 @@ static inline WKEditorInsertAction toWK(EditorInsertAction action)
>             if (!m_delegateMethods.getPasteboardDataForRange)
>                 return;
> 
>-            auto dataByType = [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller pasteboardDataForRange:wrapper(*InjectedBundleRangeHandle::getOrCreate(range).get())];
>+            auto dataByType = [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller pasteboardDataForRange:wrapper(*WebKit::InjectedBundleRangeHandle::getOrCreate(range).get())];
>             for (NSString *type in dataByType) {
>                 pasteboardTypes.append(type);
>-                pasteboardData.append(SharedBuffer::create(dataByType[type]));
>+                pasteboardData.append(WebCore::SharedBuffer::create(dataByType[type]));
>             };
>         }
> 
>@@ -653,8 +645,8 @@ static inline WKEditorInsertAction toWK(EditorInsertAction action)
>             if (!m_delegateMethods.performTwoStepDrop)
>                 return false;
> 
>-            auto rangeHandle = InjectedBundleRangeHandle::getOrCreate(&range);
>-            auto nodeHandle = InjectedBundleNodeHandle::getOrCreate(&fragment);
>+            auto rangeHandle = WebKit::InjectedBundleRangeHandle::getOrCreate(&range);
>+            auto nodeHandle = WebKit::InjectedBundleNodeHandle::getOrCreate(&fragment);
>             return [m_controller->_editingDelegate.get() _webProcessPlugInBrowserContextController:m_controller performTwoStepDrop:wrapper(*nodeHandle) atDestination:wrapper(*rangeHandle) isMove:isMove];
>         }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189447: 349238 | 349239 | 349243 | 349254