Attachment 347438 Details for Bug 188719 – Patch

[patch] Patch

bug-188719-20180818004109.patch (text/plain), 268.14 KB, created by Tim Horton on 2018-08-18 00:41:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-08-18 00:41:10 PDT

Size: 268.14 KB

patch

obsolete

>Subversion Revision: 235007
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 86ce120869ce08ef9fe8ca17529744e7ac510d4e..48b25cbff0159245d573f5c917b8c75b462eb8ac 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,55 @@
>+2018-08-18  Tim Horton  <timothy_horton@apple.com>
>+
>+        Use unified sources to build all of the NetworkProcess code
>+        https://bugs.webkit.org/show_bug.cgi?id=188719
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Obliterate 'using namespace WebCore'.
>+        #undef some things that are re-used in multiple files.
>+        Remove some nullability specifiers from implementation files so that
>+        they don't virally require nullability specifiers in more places.
>+        Switch NetworkProcess/* to unified sources.
>+
>+        * NetworkProcess/Cookies/WebCookieManager.cpp:
>+        * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
>+        * NetworkProcess/Downloads/Download.cpp:
>+        * NetworkProcess/Downloads/DownloadManager.cpp:
>+        * NetworkProcess/Downloads/PendingDownload.cpp:
>+        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
>+        * NetworkProcess/NetworkCORSPreflightChecker.cpp:
>+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
>+        * NetworkProcess/NetworkContentRuleListManager.cpp:
>+        * NetworkProcess/NetworkDataTask.cpp:
>+        * NetworkProcess/NetworkDataTaskBlob.cpp:
>+        * NetworkProcess/NetworkLoad.cpp:
>+        * NetworkProcess/NetworkLoadChecker.cpp:
>+        * NetworkProcess/NetworkProcess.cpp:
>+        * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
>+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        * NetworkProcess/NetworkSession.cpp:
>+        * NetworkProcess/NetworkSocketStream.cpp:
>+        * NetworkProcess/PingLoad.cpp:
>+        * NetworkProcess/PreconnectTask.cpp:
>+        * NetworkProcess/cache/CacheStorageEngineCache.cpp:
>+        * NetworkProcess/cache/CacheStorageEngineConnection.cpp:
>+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
>+        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
>+        * NetworkProcess/capture/NetworkCaptureManager.cpp:
>+        * NetworkProcess/capture/NetworkCaptureRecorder.cpp:
>+        * NetworkProcess/capture/NetworkCaptureReplayer.cpp:
>+        * NetworkProcess/capture/NetworkDataTaskReplay.cpp:
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
>+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
>+        * NetworkProcess/ios/NetworkProcessIOS.mm:
>+        * NetworkProcess/mac/NetworkProcessMac.mm:
>+        * NetworkProcess/mac/RemoteNetworkingContext.mm:
>+        * NetworkProcess/webrtc/NetworkMDNSRegister.cpp:
>+        * Sources.txt:
>+        * SourcesCocoa.txt:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2018-08-17  Tim Horton  <timothy_horton@apple.com>
> 
>         Start bringing up Unified Sources in WebKit2
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>index 0bb149ca15550e1a9c8d3e469ab26ce646b8cba5..9c7b20936c1633fbac9fdfa4b9a5dd65006093ae 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>@@ -38,8 +38,6 @@
> #include <wtf/text/StringHash.h>
> #include <wtf/text/WTFString.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> const char* WebCookieManager::supplementName()
>@@ -58,7 +56,7 @@ WebCookieManager::~WebCookieManager() = default;
> void WebCookieManager::getHostnamesWithCookies(PAL::SessionID sessionID, CallbackID callbackID)
> {
>     HashSet<String> hostnames;
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->getHostnamesWithCookies(hostnames);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidGetHostnamesWithCookies(copyToVector(hostnames), callbackID), 0);
>@@ -66,20 +64,20 @@ void WebCookieManager::getHostnamesWithCookies(PAL::SessionID sessionID, Callbac
> 
> void WebCookieManager::deleteCookiesForHostname(PAL::SessionID sessionID, const String& hostname)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->deleteCookiesForHostnames({ hostname });
> }
> 
> 
> void WebCookieManager::deleteAllCookies(PAL::SessionID sessionID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->deleteAllCookies();
> }
> 
>-void WebCookieManager::deleteCookie(PAL::SessionID sessionID, const Cookie& cookie, CallbackID callbackID)
>+void WebCookieManager::deleteCookie(PAL::SessionID sessionID, const WebCore::Cookie& cookie, CallbackID callbackID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->deleteCookie(cookie);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
>@@ -87,7 +85,7 @@ void WebCookieManager::deleteCookie(PAL::SessionID sessionID, const Cookie& cook
> 
> void WebCookieManager::deleteAllCookiesModifiedSince(PAL::SessionID sessionID, WallTime time, CallbackID callbackID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->deleteAllCookiesModifiedSince(time);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidDeleteCookies(callbackID), 0);
>@@ -95,33 +93,33 @@ void WebCookieManager::deleteAllCookiesModifiedSince(PAL::SessionID sessionID, W
> 
> void WebCookieManager::getAllCookies(PAL::SessionID sessionID, CallbackID callbackID)
> {
>-    Vector<Cookie> cookies;
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    Vector<WebCore::Cookie> cookies;
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         cookies = storageSession->getAllCookies();
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
> }
> 
>-void WebCookieManager::getCookies(PAL::SessionID sessionID, const URL& url, CallbackID callbackID)
>+void WebCookieManager::getCookies(PAL::SessionID sessionID, const WebCore::URL& url, CallbackID callbackID)
> {
>-    Vector<Cookie> cookies;
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    Vector<WebCore::Cookie> cookies;
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         cookies = storageSession->getCookies(url);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidGetCookies(cookies, callbackID), 0);
> }
> 
>-void WebCookieManager::setCookie(PAL::SessionID sessionID, const Cookie& cookie, CallbackID callbackID)
>+void WebCookieManager::setCookie(PAL::SessionID sessionID, const WebCore::Cookie& cookie, CallbackID callbackID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->setCookie(cookie);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
> }
> 
>-void WebCookieManager::setCookies(PAL::SessionID sessionID, const Vector<Cookie>& cookies, const URL& url, const URL& mainDocumentURL, CallbackID callbackID)
>+void WebCookieManager::setCookies(PAL::SessionID sessionID, const Vector<WebCore::Cookie>& cookies, const WebCore::URL& url, const WebCore::URL& mainDocumentURL, CallbackID callbackID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->setCookies(cookies, url, mainDocumentURL);
> 
>     m_process.send(Messages::WebCookieManagerProxy::DidSetCookies(callbackID), 0);
>@@ -135,7 +133,7 @@ void WebCookieManager::notifyCookiesDidChange(PAL::SessionID sessionID)
> 
> void WebCookieManager::startObservingCookieChanges(PAL::SessionID sessionID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID)) {
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID)) {
>         WebCore::startObservingCookieChanges(*storageSession, [this, sessionID] {
>             notifyCookiesDidChange(sessionID);
>         });
>@@ -144,7 +142,7 @@ void WebCookieManager::startObservingCookieChanges(PAL::SessionID sessionID)
> 
> void WebCookieManager::stopObservingCookieChanges(PAL::SessionID sessionID)
> {
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         WebCore::stopObservingCookieChanges(*storageSession);
> }
> 
>diff --git a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>index 980bac11aa27ee6a6df84919ffa2caf7dc7ba98a..11057d7084e4e0b8da5ce67d6ae6f93f5ecf928e 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>+++ b/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>@@ -31,8 +31,6 @@
> #import <pal/spi/cf/CFNetworkSPI.h>
> #import <wtf/ProcessPrivilege.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
>@@ -41,7 +39,7 @@ void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy
> 
>     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:static_cast<NSHTTPCookieAcceptPolicy>(policy)];
> 
>-    NetworkStorageSession::forEach([&] (const NetworkStorageSession& networkStorageSession) {
>+    WebCore::NetworkStorageSession::forEach([&] (const WebCore::NetworkStorageSession& networkStorageSession) {
>         if (auto cookieStorage = networkStorageSession.cookieStorage())
>             CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
>     });
>diff --git a/Source/WebKit/NetworkProcess/Downloads/Download.cpp b/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>index 9a0677e177e50f9f8d34d8f071f274c9cb2aba66..8ed4775e4817ec945e8a9fa4ebac220851ef6289 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>@@ -43,8 +43,6 @@
> #include "NetworkDataTaskCocoa.h"
> #endif
> 
>-using namespace WebCore;
>-
> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - Download::" fmt, this, ##__VA_ARGS__)
> 
> namespace WebKit {
>@@ -129,7 +127,7 @@ void Download::didFinish()
>     m_downloadManager.downloadFinished(this);
> }
> 
>-void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
>+void Download::didFail(const WebCore::ResourceError& error, const IPC::DataReference& resumeData)
> {
>     RELEASE_LOG_IF_ALLOWED("didFail: (id = %" PRIu64 ", isTimeout = %d, isCancellation = %d, errCode = %d)",
>         downloadID().downloadID(), error.isTimeout(), error.isCancellation(), error.errorCode());
>@@ -182,3 +180,5 @@ void Download::platformCancelNetworkLoad()
> #endif
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>index 0f409e91c905f4d95703ecee82ee7b7cdb0bc443..3674fbc00123ceb3d95d70736bba6d9a6af54377 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>@@ -36,8 +36,6 @@
> #include <pal/SessionID.h>
> #include <wtf/StdLibExtras.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> DownloadManager::DownloadManager(Client& client)
>@@ -45,7 +43,7 @@ DownloadManager::DownloadManager(Client& client)
> {
> }
> 
>-void DownloadManager::startDownload(NetworkConnectionToWebProcess* connection, PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
>+void DownloadManager::startDownload(NetworkConnectionToWebProcess* connection, PAL::SessionID sessionID, DownloadID downloadID, const WebCore::ResourceRequest& request, const String& suggestedName)
> {
>     auto* networkSession = SessionTracker::networkSession(sessionID);
>     if (!networkSession)
>@@ -54,10 +52,10 @@ void DownloadManager::startDownload(NetworkConnectionToWebProcess* connection, P
>     NetworkLoadParameters parameters;
>     parameters.sessionID = sessionID;
>     parameters.request = request;
>-    parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
>+    parameters.clientCredentialPolicy = WebCore::ClientCredentialPolicy::MayAskClientForCredentials;
>     if (request.url().protocolIsBlob() && connection)
>         parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
>-    parameters.storedCredentialsPolicy = sessionID.isEphemeral() ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
>+    parameters.storedCredentialsPolicy = sessionID.isEphemeral() ? WebCore::StoredCredentialsPolicy::DoNotUse : WebCore::StoredCredentialsPolicy::Use;
> 
>     m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession, suggestedName));
> }
>@@ -86,7 +84,7 @@ void DownloadManager::willDecidePendingDownloadDestination(NetworkDataTask& netw
>     ASSERT_UNUSED(addResult, addResult.isNewEntry);
> }
> 
>-void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, Vector<RefPtr<WebCore::BlobDataFileReference>>&& blobFileReferences, const ResourceRequest& request, const ResourceResponse& response)
>+void DownloadManager::convertNetworkLoadToDownload(DownloadID downloadID, std::unique_ptr<NetworkLoad>&& networkLoad, Vector<RefPtr<WebCore::BlobDataFileReference>>&& blobFileReferences, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
> {
>     ASSERT(!m_pendingDownloads.contains(downloadID));
>     m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(networkLoad), downloadID, request, response));
>@@ -103,7 +101,7 @@ void DownloadManager::continueDecidePendingDownloadDestination(DownloadID downlo
>         ASSERT(m_pendingDownloads.contains(downloadID));
> 
>         networkDataTask->setPendingDownloadLocation(destination, WTFMove(sandboxExtensionHandle), allowOverwrite);
>-        completionHandler(PolicyAction::Download);
>+        completionHandler(WebCore::PolicyAction::Download);
>         if (networkDataTask->state() == NetworkDataTask::State::Canceling || networkDataTask->state() == NetworkDataTask::State::Completed)
>             return;
> 
>@@ -147,7 +145,7 @@ void DownloadManager::cancelDownload(DownloadID downloadID)
>         ASSERT(completionHandler);
> 
>         networkDataTask->cancel();
>-        completionHandler(PolicyAction::Ignore);
>+        completionHandler(WebCore::PolicyAction::Ignore);
>         m_client.pendingDownloadCanceled(downloadID);
>         return;
>     }
>diff --git a/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp b/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>index f1a57235511cdbacf5f63e132322e275aa48e886..b08112920a02a9ee4864a12f0a1cd4bd39df7b59 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>@@ -32,14 +32,12 @@
> #include "NetworkProcess.h"
> #include "WebCoreArgumentCoders.h"
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
>     : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
> {
>-    m_isAllowedToAskUserForCredentials = parameters.clientCredentialPolicy == ClientCredentialPolicy::MayAskClientForCredentials;
>+    m_isAllowedToAskUserForCredentials = parameters.clientCredentialPolicy == WebCore::ClientCredentialPolicy::MayAskClientForCredentials;
> 
>     m_networkLoad->setPendingDownloadID(downloadID);
>     m_networkLoad->setPendingDownload(*this);
>@@ -48,7 +46,7 @@ PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID
>     send(Messages::DownloadProxy::DidStart(m_networkLoad->currentRequest(), suggestedName));
> }
> 
>-PendingDownload::PendingDownload(std::unique_ptr<NetworkLoad>&& networkLoad, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
>+PendingDownload::PendingDownload(std::unique_ptr<NetworkLoad>&& networkLoad, DownloadID downloadID, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
>     : m_networkLoad(WTFMove(networkLoad))
> {
>     m_isAllowedToAskUserForCredentials = m_networkLoad->isAllowedToAskUserForCredentials();
>diff --git a/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp b/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>index f0824d736be2fcbccf1fb01a012bd7db7bffed48..12a811256f5166856ff7222cb94f40048be0b32b 100644
>--- a/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>+++ b/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>@@ -34,8 +34,6 @@
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> NetworkBlobRegistry& NetworkBlobRegistry::singleton()
>@@ -49,25 +47,25 @@ NetworkBlobRegistry::NetworkBlobRegistry()
> {
> }
> 
>-void NetworkBlobRegistry::registerFileBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, const String& path, RefPtr<SandboxExtension>&& sandboxExtension, const String& contentType)
>+void NetworkBlobRegistry::registerFileBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const String& path, RefPtr<SandboxExtension>&& sandboxExtension, const String& contentType)
> {
>-    blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, WTFMove(sandboxExtension)), contentType);
>+    WebCore::blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, WTFMove(sandboxExtension)), contentType);
> 
>     ASSERT(!m_blobsForConnection.get(connection).contains(url));
>     BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
>     if (mapIterator == m_blobsForConnection.end())
>-        mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator;
>+        mapIterator = m_blobsForConnection.add(connection, HashSet<WebCore::URL>()).iterator;
>     mapIterator->value.add(url);
> }
> 
>-void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType)
>+void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType)
> {
>-    blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType);
>+    WebCore::blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType);
> 
>     ASSERT(!m_blobsForConnection.get(connection).contains(url));
>     BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
>     if (mapIterator == m_blobsForConnection.end())
>-        mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator;
>+        mapIterator = m_blobsForConnection.add(connection, HashSet<WebCore::URL>()).iterator;
>     mapIterator->value.add(url);
> }
> 
>@@ -78,26 +76,26 @@ void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connect
>     if (mapIterator == m_blobsForConnection.end()) {
>         if (!shouldBypassConnectionCheck)
>             return;
>-        mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator;
>+        mapIterator = m_blobsForConnection.add(connection, HashSet<WebCore::URL>()).iterator;
>     }
> 
>-    blobRegistry().registerBlobURL(url, srcURL);
>+    WebCore::blobRegistry().registerBlobURL(url, srcURL);
> 
>     ASSERT(shouldBypassConnectionCheck || mapIterator->value.contains(srcURL));
>     mapIterator->value.add(url);
> }
> 
>-void NetworkBlobRegistry::registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess* connection, const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType)
>+void NetworkBlobRegistry::registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess* connection, const WebCore::URL& url, const WebCore::URL& srcURL, const String& fileBackedPath, const String& contentType)
> {
>     auto fileReference = connection->getBlobDataFileReferenceForPath(fileBackedPath);
>     ASSERT(fileReference);
> 
>-    blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, WTFMove(fileReference), contentType);
>+    WebCore::blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, WTFMove(fileReference), contentType);
> 
>     ASSERT(!m_blobsForConnection.get(connection).contains(url));
>     BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection);
>     if (mapIterator == m_blobsForConnection.end())
>-        mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator;
>+        mapIterator = m_blobsForConnection.add(connection, HashSet<WebCore::URL>()).iterator;
>     mapIterator->value.add(url);
> }
> 
>@@ -108,7 +106,7 @@ void NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess*
>     if (mapIterator == m_blobsForConnection.end())
>         return;
> 
>-    blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
>+    WebCore::blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
> 
>     ASSERT(mapIterator->value.contains(srcURL));
>     mapIterator->value.add(url);
>@@ -121,7 +119,7 @@ void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess* conne
>     if (mapIterator == m_blobsForConnection.end())
>         return;
> 
>-    blobRegistry().unregisterBlobURL(url);
>+    WebCore::blobRegistry().unregisterBlobURL(url);
> 
>     ASSERT(mapIterator->value.contains(url));
>     mapIterator->value.remove(url);
>@@ -132,27 +130,27 @@ uint64_t NetworkBlobRegistry::blobSize(NetworkConnectionToWebProcess* connection
>     if (!m_blobsForConnection.contains(connection) || !m_blobsForConnection.find(connection)->value.contains(url))
>         return 0;
> 
>-    return blobRegistry().blobSize(url);
>+    return WebCore::blobRegistry().blobSize(url);
> }
> 
> void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void(const Vector<String>&)>&& completionHandler)
> {
>-    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
>+    WebCore::blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
> }
> 
>-void NetworkBlobRegistry::writeBlobToFilePath(const URL& blobURL, const String& path, Function<void(bool success)>&& completionHandler)
>+void NetworkBlobRegistry::writeBlobToFilePath(const WebCore::URL& blobURL, const String& path, Function<void(bool success)>&& completionHandler)
> {
>-    if (!blobRegistry().isBlobRegistryImpl()) {
>+    if (!WebCore::blobRegistry().isBlobRegistryImpl()) {
>         completionHandler(false);
>         ASSERT_NOT_REACHED();
>         return;
>     }
> 
>-    auto blobFiles = filesInBlob({ ParsedURLString, blobURL });
>+    auto blobFiles = filesInBlob({ WebCore::ParsedURLString, blobURL });
>     for (auto& file : blobFiles)
>         file->prepareForFileAccess();
> 
>-    static_cast<BlobRegistryImpl&>(blobRegistry()).writeBlobToFilePath(blobURL, path, [blobFiles = WTFMove(blobFiles), completionHandler = WTFMove(completionHandler)] (bool success) {
>+    static_cast<WebCore::BlobRegistryImpl&>(WebCore::blobRegistry()).writeBlobToFilePath(blobURL, path, [blobFiles = WTFMove(blobFiles), completionHandler = WTFMove(completionHandler)] (bool success) {
>         for (auto& file : blobFiles)
>             file->revokeFileAccess();
>         completionHandler(success);
>@@ -164,14 +162,14 @@ void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebP
>     if (!m_blobsForConnection.contains(connection))
>         return;
> 
>-    HashSet<URL>& blobsForConnection = m_blobsForConnection.find(connection)->value;
>-    for (HashSet<URL>::iterator iter = blobsForConnection.begin(), end = blobsForConnection.end(); iter != end; ++iter)
>-        blobRegistry().unregisterBlobURL(*iter);
>+    HashSet<WebCore::URL>& blobsForConnection = m_blobsForConnection.find(connection)->value;
>+    for (HashSet<WebCore::URL>::iterator iter = blobsForConnection.begin(), end = blobsForConnection.end(); iter != end; ++iter)
>+        WebCore::blobRegistry().unregisterBlobURL(*iter);
> 
>     m_blobsForConnection.remove(connection);
> }
> 
>-Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(NetworkConnectionToWebProcess& connection, const WebCore::URL& url)
>+Vector<RefPtr<WebCore::BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(NetworkConnectionToWebProcess& connection, const WebCore::URL& url)
> {
>     if (!m_blobsForConnection.contains(&connection) || !m_blobsForConnection.find(&connection)->value.contains(url))
>         return { };
>@@ -179,16 +177,16 @@ Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(NetworkCo
>     return filesInBlob(url);
> }
> 
>-Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(const URL& url)
>+Vector<RefPtr<WebCore::BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(const WebCore::URL& url)
> {
>-    ASSERT(blobRegistry().isBlobRegistryImpl());
>-    BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(url);
>+    ASSERT(WebCore::blobRegistry().isBlobRegistryImpl());
>+    WebCore::BlobData* blobData = static_cast<WebCore::BlobRegistryImpl&>(WebCore::blobRegistry()).getBlobDataFromURL(url);
>     if (!blobData)
>         return { };
> 
>-    Vector<RefPtr<BlobDataFileReference>> result;
>-    for (const BlobDataItem& item : blobData->items()) {
>-        if (item.type() == BlobDataItem::Type::File)
>+    Vector<RefPtr<WebCore::BlobDataFileReference>> result;
>+    for (const WebCore::BlobDataItem& item : blobData->items()) {
>+        if (item.type() == WebCore::BlobDataItem::Type::File)
>             result.append(item.file());
>     }
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>index 463626e981edd22ca47c56926d42b68cc61cda07..a4e44bb2abc43c5de8b468ce6527757f2896ff03 100644
>--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>@@ -38,8 +38,6 @@
> 
> namespace WebKit {
> 
>-using namespace WebCore;
>-
> NetworkCORSPreflightChecker::NetworkCORSPreflightChecker(Parameters&& parameters, bool shouldCaptureExtraNetworkLoadMetrics, CompletionCallback&& completionCallback)
>     : m_parameters(WTFMove(parameters))
>     , m_completionCallback(WTFMove(completionCallback))
>@@ -55,7 +53,7 @@ NetworkCORSPreflightChecker::~NetworkCORSPreflightChecker()
>         m_task->cancel();
>     }
>     if (m_completionCallback)
>-        m_completionCallback(ResourceError { ResourceError::Type::Cancellation });
>+        m_completionCallback(WebCore::ResourceError { WebCore::ResourceError::Type::Cancellation });
> }
> 
> void NetworkCORSPreflightChecker::startPreflight()
>@@ -67,10 +65,10 @@ void NetworkCORSPreflightChecker::startPreflight()
>     loadParameters.request = createAccessControlPreflightRequest(m_parameters.originalRequest, m_parameters.sourceOrigin, m_parameters.referrer);
>     loadParameters.shouldFollowRedirects = false;
>     if (!m_parameters.userAgent.isNull())
>-        loadParameters.request.setHTTPHeaderField(HTTPHeaderName::UserAgent, m_parameters.userAgent);
>+        loadParameters.request.setHTTPHeaderField(WebCore::HTTPHeaderName::UserAgent, m_parameters.userAgent);
> 
>     if (m_shouldCaptureExtraNetworkLoadMetrics)
>-        m_loadInformation = NetworkTransactionInformation { NetworkTransactionInformation::Type::Preflight, loadParameters.request, { }, { } };
>+        m_loadInformation = WebCore::NetworkTransactionInformation { WebCore::NetworkTransactionInformation::Type::Preflight, loadParameters.request, { }, { } };
> 
>     if (auto* networkSession = SessionTracker::networkSession(loadParameters.sessionID)) {
>         m_task = NetworkDataTask::create(*networkSession, *this, WTFMove(loadParameters));
>@@ -86,7 +84,7 @@ void NetworkCORSPreflightChecker::willPerformHTTPRedirection(WebCore::ResourceRe
> 
>     RELEASE_LOG_IF_ALLOWED("willPerformHTTPRedirection");
>     completionHandler({ });
>-    m_completionCallback(ResourceError { errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "Preflight response is not successful"_s, ResourceError::Type::AccessControl });
>+    m_completionCallback(WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "Preflight response is not successful"_s, WebCore::ResourceError::Type::AccessControl });
> }
> 
> void NetworkCORSPreflightChecker::didReceiveChallenge(WebCore::AuthenticationChallenge&& challenge, ChallengeCompletionHandler&& completionHandler)
>@@ -94,8 +92,8 @@ void NetworkCORSPreflightChecker::didReceiveChallenge(WebCore::AuthenticationCha
>     RELEASE_LOG_IF_ALLOWED("didReceiveChallenge, authentication scheme: %u", challenge.protectionSpace().authenticationScheme());
> 
>     auto scheme = challenge.protectionSpace().authenticationScheme();
>-    bool isTLSHandshake = scheme == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
>-        || scheme == ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>+    bool isTLSHandshake = scheme == WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
>+        || scheme == WebCore::ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
> 
>     if (!isTLSHandshake) {
>         completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
>@@ -113,7 +111,7 @@ void NetworkCORSPreflightChecker::didReceiveResponseNetworkSession(WebCore::Reso
>         m_loadInformation.response = response;
> 
>     m_response = WTFMove(response);
>-    completionHandler(PolicyAction::Use);
>+    completionHandler(WebCore::PolicyAction::Use);
> }
> 
> void NetworkCORSPreflightChecker::didReceiveData(Ref<WebCore::SharedBuffer>&&)
>@@ -130,7 +128,7 @@ void NetworkCORSPreflightChecker::didCompleteWithError(const WebCore::ResourceEr
>         RELEASE_LOG_IF_ALLOWED("didCompleteWithError");
>         auto error = preflightError;
>         if (error.isNull() || error.isGeneral())
>-            error.setType(ResourceError::Type::AccessControl);
>+            error.setType(WebCore::ResourceError::Type::AccessControl);
> 
>         m_completionCallback(WTFMove(error));
>         return;
>@@ -141,10 +139,10 @@ void NetworkCORSPreflightChecker::didCompleteWithError(const WebCore::ResourceEr
>     String errorDescription;
>     if (!validatePreflightResponse(m_parameters.originalRequest, m_response, m_parameters.storedCredentialsPolicy, m_parameters.sourceOrigin, errorDescription)) {
>         RELEASE_LOG_IF_ALLOWED("didComplete, AccessControl error: %s", errorDescription.utf8().data());
>-        m_completionCallback(ResourceError { errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), errorDescription, ResourceError::Type::AccessControl });
>+        m_completionCallback(WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), errorDescription, WebCore::ResourceError::Type::AccessControl });
>         return;
>     }
>-    m_completionCallback(ResourceError { });
>+    m_completionCallback(WebCore::ResourceError { });
> }
> 
> void NetworkCORSPreflightChecker::didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend)
>@@ -154,19 +152,21 @@ void NetworkCORSPreflightChecker::didSendData(uint64_t totalBytesSent, uint64_t
> void NetworkCORSPreflightChecker::wasBlocked()
> {
>     RELEASE_LOG_IF_ALLOWED("wasBlocked");
>-    m_completionCallback(ResourceError { errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "CORS-preflight request was blocked"_s, ResourceError::Type::AccessControl });
>+    m_completionCallback(WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "CORS-preflight request was blocked"_s, WebCore::ResourceError::Type::AccessControl });
> }
> 
> void NetworkCORSPreflightChecker::cannotShowURL()
> {
>     RELEASE_LOG_IF_ALLOWED("cannotShowURL");
>-    m_completionCallback(ResourceError { errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "Preflight response was blocked"_s, ResourceError::Type::AccessControl });
>+    m_completionCallback(WebCore::ResourceError { WebCore::errorDomainWebKitInternal, 0, m_parameters.originalRequest.url(), "Preflight response was blocked"_s, WebCore::ResourceError::Type::AccessControl });
> }
> 
>-NetworkTransactionInformation NetworkCORSPreflightChecker::takeInformation()
>+WebCore::NetworkTransactionInformation NetworkCORSPreflightChecker::takeInformation()
> {
>     ASSERT(m_shouldCaptureExtraNetworkLoadMetrics);
>     return WTFMove(m_loadInformation);
> }
> 
>-} // Namespace WebKit
>+} // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index 0838930852b12fa7b1406cbc40e71d769e849eec..018e6f998059db023bfe6ce0279a15fb590b6bd3 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -58,8 +58,6 @@
> #include <WebCore/SecurityPolicy.h>
> #include <pal/SessionID.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> Ref<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(IPC::Connection::Identifier connectionIdentifier)
>@@ -203,7 +201,7 @@ void NetworkConnectionToWebProcess::didReceiveInvalidMessage(IPC::Connection&, I
> {
> }
> 
>-void NetworkConnectionToWebProcess::createSocketStream(URL&& url, PAL::SessionID sessionID, String cachePartition, uint64_t identifier)
>+void NetworkConnectionToWebProcess::createSocketStream(WebCore::URL&& url, PAL::SessionID sessionID, String cachePartition, uint64_t identifier)
> {
>     ASSERT(!m_networkSocketStreams.contains(identifier));
>     WebCore::SourceApplicationAuditToken token = { };
>@@ -264,7 +262,7 @@ void NetworkConnectionToWebProcess::performSynchronousLoad(NetworkResourceLoadPa
> 
> void NetworkConnectionToWebProcess::loadPing(NetworkResourceLoadParameters&& loadParameters)
> {
>-    auto completionHandler = [connection = m_connection.copyRef(), identifier = loadParameters.identifier] (const ResourceError& error, const ResourceResponse& response) {
>+    auto completionHandler = [connection = m_connection.copyRef(), identifier = loadParameters.identifier] (const WebCore::ResourceError& error, const WebCore::ResourceResponse& response) {
>         connection->send(Messages::NetworkProcessConnection::DidFinishPingLoad(identifier, error, response), 0);
>     };
> 
>@@ -319,7 +317,7 @@ void NetworkConnectionToWebProcess::prefetchDNS(const String& hostname)
> void NetworkConnectionToWebProcess::preconnectTo(uint64_t preconnectionIdentifier, NetworkResourceLoadParameters&& parameters)
> {
> #if ENABLE(SERVER_PRECONNECT)
>-    new PreconnectTask(WTFMove(parameters), [this, protectedThis = makeRef(*this), identifier = preconnectionIdentifier] (const ResourceError& error) {
>+    new PreconnectTask(WTFMove(parameters), [this, protectedThis = makeRef(*this), identifier = preconnectionIdentifier] (const WebCore::ResourceError& error) {
>         didFinishPreconnection(identifier, error);
>     });
> #else
>@@ -328,7 +326,7 @@ void NetworkConnectionToWebProcess::preconnectTo(uint64_t preconnectionIdentifie
> #endif
> }
> 
>-void NetworkConnectionToWebProcess::didFinishPreconnection(uint64_t preconnectionIdentifier, const ResourceError& error)
>+void NetworkConnectionToWebProcess::didFinishPreconnection(uint64_t preconnectionIdentifier, const WebCore::ResourceError& error)
> {
>     if (!m_connection->isValid())
>         return;
>@@ -336,32 +334,32 @@ void NetworkConnectionToWebProcess::didFinishPreconnection(uint64_t preconnectio
>     m_connection->send(Messages::NetworkProcessConnection::DidFinishPreconnection(preconnectionIdentifier, error), 0);
> }
> 
>-static NetworkStorageSession& storageSession(PAL::SessionID sessionID)
>+static WebCore::NetworkStorageSession& storageSession(PAL::SessionID sessionID)
> {
>     ASSERT(sessionID.isValid());
>     if (sessionID != PAL::SessionID::defaultSessionID()) {
>-        if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             return *storageSession;
> 
>         // Some requests with private browsing mode requested may still be coming shortly after NetworkProcess was told to destroy its session.
>         // FIXME: Find a way to track private browsing sessions more rigorously.
>         LOG_ERROR("Non-default storage session was requested, but there was no session for it. Please file a bug unless you just disabled private browsing, in which case it's an expected race.");
>     }
>-    return NetworkStorageSession::defaultStorageSession();
>+    return WebCore::NetworkStorageSession::defaultStorageSession();
> }
> 
>-void NetworkConnectionToWebProcess::startDownload(PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedName)
>+void NetworkConnectionToWebProcess::startDownload(PAL::SessionID sessionID, DownloadID downloadID, const WebCore::ResourceRequest& request, const String& suggestedName)
> {
>     NetworkProcess::singleton().downloadManager().startDownload(this, sessionID, downloadID, request, suggestedName);
> }
> 
>-void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(PAL::SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
>+void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(PAL::SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
> {
>     RELEASE_ASSERT(RunLoop::isMain());
> 
>     auto& networkProcess = NetworkProcess::singleton();
>     // In case a response is served from service worker, we do not have yet the ability to convert the load.
>-    if (!mainResourceLoadIdentifier || response.source() == ResourceResponse::Source::ServiceWorker) {
>+    if (!mainResourceLoadIdentifier || response.source() == WebCore::ResourceResponse::Source::ServiceWorker) {
>         networkProcess.downloadManager().startDownload(this, sessionID, downloadID, request);
>         return;
>     }
>@@ -375,7 +373,7 @@ void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(PAL::Sessi
>     loader->convertToDownload(downloadID, request, response);
> }
> 
>-void NetworkConnectionToWebProcess::cookiesForDOM(PAL::SessionID sessionID, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, IncludeSecureCookies includeSecureCookies, String& cookieString, bool& secureCookiesAccessed)
>+void NetworkConnectionToWebProcess::cookiesForDOM(PAL::SessionID sessionID, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, WebCore::IncludeSecureCookies includeSecureCookies, String& cookieString, bool& secureCookiesAccessed)
> {
>     auto& networkStorageSession = storageSession(sessionID);
>     std::tie(cookieString, secureCookiesAccessed) = networkStorageSession.cookiesForDOM(firstParty, sameSiteInfo, url, frameID, pageID, includeSecureCookies);
>@@ -385,7 +383,7 @@ void NetworkConnectionToWebProcess::cookiesForDOM(PAL::SessionID sessionID, cons
> #endif
> }
> 
>-void NetworkConnectionToWebProcess::setCookiesFromDOM(PAL::SessionID sessionID, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, const String& cookieString)
>+void NetworkConnectionToWebProcess::setCookiesFromDOM(PAL::SessionID sessionID, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, const String& cookieString)
> {
>     auto& networkStorageSession = storageSession(sessionID);
>     networkStorageSession.setCookiesFromDOM(firstParty, sameSiteInfo, url, frameID, pageID, cookieString);
>@@ -400,34 +398,34 @@ void NetworkConnectionToWebProcess::cookiesEnabled(PAL::SessionID sessionID, boo
>     result = storageSession(sessionID).cookiesEnabled();
> }
> 
>-void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, IncludeSecureCookies includeSecureCookies, String& cookieString, bool& secureCookiesAccessed)
>+void NetworkConnectionToWebProcess::cookieRequestHeaderFieldValue(PAL::SessionID sessionID, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, WebCore::IncludeSecureCookies includeSecureCookies, String& cookieString, bool& secureCookiesAccessed)
> {
>     std::tie(cookieString, secureCookiesAccessed) = storageSession(sessionID).cookieRequestHeaderFieldValue(firstParty, sameSiteInfo, url, frameID, pageID, includeSecureCookies);
> }
> 
>-void NetworkConnectionToWebProcess::getRawCookies(PAL::SessionID sessionID, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, Vector<Cookie>& result)
>+void NetworkConnectionToWebProcess::getRawCookies(PAL::SessionID sessionID, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, Vector<WebCore::Cookie>& result)
> {
>     storageSession(sessionID).getRawCookies(firstParty, sameSiteInfo, url, frameID, pageID, result);
> }
> 
>-void NetworkConnectionToWebProcess::deleteCookie(PAL::SessionID sessionID, const URL& url, const String& cookieName)
>+void NetworkConnectionToWebProcess::deleteCookie(PAL::SessionID sessionID, const WebCore::URL& url, const String& cookieName)
> {
>     storageSession(sessionID).deleteCookie(url, cookieName);
> }
> 
>-void NetworkConnectionToWebProcess::registerFileBlobURL(const URL& url, const String& path, SandboxExtension::Handle&& extensionHandle, const String& contentType)
>+void NetworkConnectionToWebProcess::registerFileBlobURL(const WebCore::URL& url, const String& path, SandboxExtension::Handle&& extensionHandle, const String& contentType)
> {
>     RefPtr<SandboxExtension> extension = SandboxExtension::create(WTFMove(extensionHandle));
> 
>     NetworkBlobRegistry::singleton().registerFileBlobURL(this, url, path, WTFMove(extension), contentType);
> }
> 
>-void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart>&& blobParts, const String& contentType)
>+void NetworkConnectionToWebProcess::registerBlobURL(const WebCore::URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType)
> {
>     NetworkBlobRegistry::singleton().registerBlobURL(this, url, WTFMove(blobParts), contentType);
> }
> 
>-void NetworkConnectionToWebProcess::registerBlobURLFromURL(const URL& url, const URL& srcURL, bool shouldBypassConnectionCheck)
>+void NetworkConnectionToWebProcess::registerBlobURLFromURL(const WebCore::URL& url, const WebCore::URL& srcURL, bool shouldBypassConnectionCheck)
> {
>     NetworkBlobRegistry::singleton().registerBlobURL(this, url, srcURL, shouldBypassConnectionCheck);
> }
>@@ -451,31 +449,31 @@ RefPtr<WebCore::BlobDataFileReference> NetworkConnectionToWebProcess::getBlobDat
>     return m_blobDataFileReferences.get(path);
> }
> 
>-void NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType)
>+void NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked(const WebCore::URL& url, const WebCore::URL& srcURL, const String& fileBackedPath, const String& contentType)
> {
>     NetworkBlobRegistry::singleton().registerBlobURLOptionallyFileBacked(this, url, srcURL, fileBackedPath, contentType);
> }
> 
>-void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end)
>+void NetworkConnectionToWebProcess::registerBlobURLForSlice(const WebCore::URL& url, const WebCore::URL& srcURL, int64_t start, int64_t end)
> {
>     NetworkBlobRegistry::singleton().registerBlobURLForSlice(this, url, srcURL, start, end);
> }
> 
>-void NetworkConnectionToWebProcess::unregisterBlobURL(const URL& url)
>+void NetworkConnectionToWebProcess::unregisterBlobURL(const WebCore::URL& url)
> {
>     NetworkBlobRegistry::singleton().unregisterBlobURL(this, url);
> }
> 
>-void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSize)
>+void NetworkConnectionToWebProcess::blobSize(const WebCore::URL& url, uint64_t& resultSize)
> {
>     resultSize = NetworkBlobRegistry::singleton().blobSize(this, url);
> }
> 
> void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier)
> {
>-    Vector<RefPtr<BlobDataFileReference>> fileReferences;
>+    Vector<RefPtr<WebCore::BlobDataFileReference>> fileReferences;
>     for (auto& url : blobURLs)
>-        fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(*this, { ParsedURLString, url }));
>+        fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(*this, { WebCore::ParsedURLString, url }));
> 
>     for (auto& file : fileReferences)
>         file->prepareForFileAccess();
>@@ -514,7 +512,7 @@ void NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession()
> void NetworkConnectionToWebProcess::removeStorageAccessForFrame(PAL::SessionID sessionID, uint64_t frameID, uint64_t pageID)
> {
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->removeStorageAccessForFrame(frameID, pageID);
> #else
>     UNUSED_PARAM(sessionID);
>@@ -526,7 +524,7 @@ void NetworkConnectionToWebProcess::removeStorageAccessForFrame(PAL::SessionID s
> void NetworkConnectionToWebProcess::removeStorageAccessForAllFramesOnPage(PAL::SessionID sessionID, uint64_t pageID)
> {
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
>-    if (auto* storageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* storageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         storageSession->removeStorageAccessForAllFramesOnPage(pageID);
> #else
>     UNUSED_PARAM(sessionID);
>@@ -536,17 +534,17 @@ void NetworkConnectionToWebProcess::removeStorageAccessForAllFramesOnPage(PAL::S
> 
> void NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
> {
>-    SecurityPolicy::addOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
>+    WebCore::SecurityPolicy::addOriginAccessWhitelistEntry(WebCore::SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
> }
> 
> void NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
> {
>-    SecurityPolicy::removeOriginAccessWhitelistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
>+    WebCore::SecurityPolicy::removeOriginAccessWhitelistEntry(WebCore::SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
> }
> 
> void NetworkConnectionToWebProcess::resetOriginAccessWhitelists()
> {
>-    SecurityPolicy::resetOriginAccessWhitelists();
>+    WebCore::SecurityPolicy::resetOriginAccessWhitelists();
> }
> 
> std::optional<NetworkActivityTracker> NetworkConnectionToWebProcess::startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource, const PAL::SessionID& sessionID)
>diff --git a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>index c56a5577d5df7efb74238bd24daf62a357dc4ad9..d55319f161d11f6057a1fe42b3dc73f26fca4534 100644
>--- a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>@@ -32,8 +32,6 @@
> #include "NetworkProcessProxyMessages.h"
> #include "WebCompiledContentRuleList.h"
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> NetworkContentRuleListManager::NetworkContentRuleListManager() = default;
>@@ -72,7 +70,7 @@ void NetworkContentRuleListManager::addContentRuleLists(UserContentControllerIde
>     for (const auto& contentRuleList : contentRuleLists) {
>         WebCompiledContentRuleListData contentRuleListData = contentRuleList.second;
>         auto compiledContentRuleList = WebCompiledContentRuleList::create(WTFMove(contentRuleListData));
>-        backend.addContentExtension(contentRuleList.first, WTFMove(compiledContentRuleList), ContentExtensions::ContentExtension::ShouldCompileCSS::No);
>+        backend.addContentExtension(contentRuleList.first, WTFMove(compiledContentRuleList), WebCore::ContentExtensions::ContentExtension::ShouldCompileCSS::No);
>     }
> 
>     auto pendingCallbacks = m_pendingCallbacks.take(identifier);
>diff --git a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>index 1524d3cf3235ccc383f250211a85fa52f84f9338..21009d9bc7c86573c7626fdfa81044a7c06fdc0e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>@@ -44,8 +44,6 @@
> #include "NetworkDataTaskCurl.h"
> #endif
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
>@@ -64,7 +62,7 @@ Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDat
> #endif
> }
> 
>-NetworkDataTask::NetworkDataTask(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& requestWithCredentials, StoredCredentialsPolicy storedCredentialsPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation)
>+NetworkDataTask::NetworkDataTask(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& requestWithCredentials, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, bool dataTaskIsForMainFrameNavigation)
>     : m_failureTimer(*this, &NetworkDataTask::failureTimerFired)
>     , m_session(session)
>     , m_client(&client)
>@@ -101,14 +99,14 @@ void NetworkDataTask::scheduleFailure(FailureType type)
>     m_failureTimer.startOneShot(0_s);
> }
> 
>-void NetworkDataTask::didReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>+void NetworkDataTask::didReceiveResponse(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
> {
>     ASSERT(m_client);
>     if (response.isHTTP09()) {
>         auto url = response.url();
>         std::optional<uint16_t> port = url.port();
>-        if (port && !isDefaultPortForProtocol(port.value(), url.protocol())) {
>-            completionHandler(PolicyAction::Ignore);
>+        if (port && !WebCore::isDefaultPortForProtocol(port.value(), url.protocol())) {
>+            completionHandler(WebCore::PolicyAction::Ignore);
>             cancel();
>             m_client->didCompleteWithError({ String(), 0, url, "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9." });
>             return;
>diff --git a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>index b5686b593e1d747be0d4c1687d0a2bccbb64846d..725884c0ecffdbef875b45c7f27eb2bfe740f99f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>@@ -52,8 +52,6 @@
> #include <wtf/MainThread.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> static const unsigned bufferSize = 512 * 1024;
>@@ -71,15 +69,15 @@ static const char* httpInternalErrorText = "Internal Server Error";
> 
> static const char* const webKitBlobResourceDomain = "WebKitBlobResource";
> 
>-NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& request, ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
>-    : NetworkDataTask(session, client, request, StoredCredentialsPolicy::DoNotUse, false, false)
>-    , m_stream(std::make_unique<AsyncFileStream>(*this))
>+NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
>+    : NetworkDataTask(session, client, request, WebCore::StoredCredentialsPolicy::DoNotUse, false, false)
>+    , m_stream(std::make_unique<WebCore::AsyncFileStream>(*this))
>     , m_fileReferences(fileReferences)
> {
>     for (auto& fileReference : m_fileReferences)
>         fileReference->prepareForFileAccess();
> 
>-    m_blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(request.url());
>+    m_blobData = static_cast<WebCore::BlobRegistryImpl&>(WebCore::blobRegistry()).getBlobDataFromURL(request.url());
> 
>     m_session->registerNetworkDataTask(*this);
>     LOG(NetworkSession, "%p - Created NetworkDataTaskBlob for %s", this, request.url().string().utf8().data());
>@@ -139,8 +137,8 @@ void NetworkDataTaskBlob::resume()
>         }
> 
>         // Parse the "Range" header we care about.
>-        String range = m_firstRequest.httpHeaderField(HTTPHeaderName::Range);
>-        if (!range.isEmpty() && !parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
>+        String range = m_firstRequest.httpHeaderField(WebCore::HTTPHeaderName::Range);
>+        if (!range.isEmpty() && !WebCore::parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
>             dispatchDidReceiveResponse(Error::RangeError);
>             return;
>         }
>@@ -187,12 +185,12 @@ void NetworkDataTaskBlob::getSizeForNext()
>         return;
>     }
> 
>-    const BlobDataItem& item = m_blobData->items().at(m_sizeItemCount);
>+    const WebCore::BlobDataItem& item = m_blobData->items().at(m_sizeItemCount);
>     switch (item.type()) {
>-    case BlobDataItem::Type::Data:
>+    case WebCore::BlobDataItem::Type::Data:
>         didGetSize(item.length());
>         break;
>-    case BlobDataItem::Type::File:
>+    case WebCore::BlobDataItem::Type::File:
>         // Files know their sizes, but asking the stream to verify that the file wasn't modified.
>         m_stream->getSize(item.file()->path(), item.file()->expectedModificationTime());
>         break;
>@@ -217,7 +215,7 @@ void NetworkDataTaskBlob::didGetSize(long long size)
>     }
> 
>     // The size passed back is the size of the whole file. If the underlying item is a sliced file, we need to use the slice length.
>-    const BlobDataItem& item = m_blobData->items().at(m_sizeItemCount);
>+    const WebCore::BlobDataItem& item = m_blobData->items().at(m_sizeItemCount);
>     size = item.length();
> 
>     // Cache the size.
>@@ -268,18 +266,18 @@ void NetworkDataTaskBlob::dispatchDidReceiveResponse(Error errorCode)
>     LOG(NetworkSession, "%p - NetworkDataTaskBlob::dispatchDidReceiveResponse(%u)", this, static_cast<unsigned>(errorCode));
> 
>     Ref<NetworkDataTaskBlob> protectedThis(*this);
>-    ResourceResponse response(m_firstRequest.url(), errorCode != Error::NoError ? "text/plain" : m_blobData->contentType(), errorCode != Error::NoError ? 0 : m_totalRemainingSize, String());
>+    WebCore::ResourceResponse response(m_firstRequest.url(), errorCode != Error::NoError ? "text/plain" : m_blobData->contentType(), errorCode != Error::NoError ? 0 : m_totalRemainingSize, String());
>     switch (errorCode) {
>     case Error::NoError: {
>         bool isRangeRequest = m_rangeOffset != kPositionNotSpecified;
>         response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
>         response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);
> 
>-        response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_blobData->contentType());
>-        response.setHTTPHeaderField(HTTPHeaderName::ContentLength, String::number(m_totalRemainingSize));
>+        response.setHTTPHeaderField(WebCore::HTTPHeaderName::ContentType, m_blobData->contentType());
>+        response.setHTTPHeaderField(WebCore::HTTPHeaderName::ContentLength, String::number(m_totalRemainingSize));
> 
>         if (isRangeRequest)
>-            response.setHTTPHeaderField(HTTPHeaderName::ContentRange, ParsedContentRange(m_rangeOffset, m_rangeEnd, m_totalSize).headerValue());
>+            response.setHTTPHeaderField(WebCore::HTTPHeaderName::ContentRange, WebCore::ParsedContentRange(m_rangeOffset, m_rangeEnd, m_totalSize).headerValue());
>         // FIXME: If a resource identified with a blob: URL is a File object, user agents must use that file's name attribute,
>         // as if the response had a Content-Disposition header with the filename parameter set to the File's name attribute.
>         // Notably, this will affect a name suggested in "File Save As".
>@@ -299,7 +297,7 @@ void NetworkDataTaskBlob::dispatchDidReceiveResponse(Error errorCode)
>         break;
>     }
> 
>-    didReceiveResponse(WTFMove(response), [this, protectedThis = WTFMove(protectedThis), errorCode](PolicyAction policyAction) {
>+    didReceiveResponse(WTFMove(response), [this, protectedThis = WTFMove(protectedThis), errorCode](WebCore::PolicyAction policyAction) {
>         LOG(NetworkSession, "%p - NetworkDataTaskBlob::didReceiveResponse completionHandler (%u)", this, static_cast<unsigned>(policyAction));
> 
>         if (m_state == State::Canceling || m_state == State::Completed) {
>@@ -313,16 +311,16 @@ void NetworkDataTaskBlob::dispatchDidReceiveResponse(Error errorCode)
>         }
> 
>         switch (policyAction) {
>-        case PolicyAction::Use:
>+        case WebCore::PolicyAction::Use:
>             m_buffer.resize(bufferSize);
>             read();
>             break;
>-        case PolicyAction::Suspend:
>-            LOG_ERROR("PolicyAction::Suspend encountered - Treating as PolicyAction::Ignore for now");
>+        case WebCore::PolicyAction::Suspend:
>+            LOG_ERROR("PolicyAction::Suspend encountered - Treating as WebCore::PolicyAction::Ignore for now");
>             FALLTHROUGH;
>-        case PolicyAction::Ignore:
>+        case WebCore::PolicyAction::Ignore:
>             break;
>-        case PolicyAction::Download:
>+        case WebCore::PolicyAction::Download:
>             download();
>             break;
>         }
>@@ -339,16 +337,16 @@ void NetworkDataTaskBlob::read()
>         return;
>     }
> 
>-    const BlobDataItem& item = m_blobData->items().at(m_readItemCount);
>-    if (item.type() == BlobDataItem::Type::Data)
>+    const WebCore::BlobDataItem& item = m_blobData->items().at(m_readItemCount);
>+    if (item.type() == WebCore::BlobDataItem::Type::Data)
>         readData(item);
>-    else if (item.type() == BlobDataItem::Type::File)
>+    else if (item.type() == WebCore::BlobDataItem::Type::File)
>         readFile(item);
>     else
>         ASSERT_NOT_REACHED();
> }
> 
>-void NetworkDataTaskBlob::readData(const BlobDataItem& item)
>+void NetworkDataTaskBlob::readData(const WebCore::BlobDataItem& item)
> {
>     ASSERT(item.data().data());
> 
>@@ -359,7 +357,7 @@ void NetworkDataTaskBlob::readData(const BlobDataItem& item)
>     m_currentItemReadSize = 0;
> }
> 
>-void NetworkDataTaskBlob::readFile(const BlobDataItem& item)
>+void NetworkDataTaskBlob::readFile(const WebCore::BlobDataItem& item)
> {
>     ASSERT(m_stream);
> 
>@@ -413,12 +411,12 @@ void NetworkDataTaskBlob::consumeData(const char* data, int bytesRead)
>     m_totalRemainingSize -= bytesRead;
> 
>     if (bytesRead) {
>-        if (m_downloadFile != FileSystem::invalidPlatformFileHandle) {
>+        if (m_downloadFile != WebCore::FileSystem::invalidPlatformFileHandle) {
>             if (!writeDownload(data, bytesRead))
>                 return;
>         } else {
>             ASSERT(m_client);
>-            m_client->didReceiveData(SharedBuffer::create(data, bytesRead));
>+            m_client->didReceiveData(WebCore::SharedBuffer::create(data, bytesRead));
>         }
>     }
> 
>@@ -449,8 +447,8 @@ void NetworkDataTaskBlob::setPendingDownloadLocation(const String& filename, San
>     if (m_sandboxExtension)
>         m_sandboxExtension->consume();
> 
>-    if (allowOverwrite && FileSystem::fileExists(m_pendingDownloadLocation))
>-        FileSystem::deleteFile(m_pendingDownloadLocation);
>+    if (allowOverwrite && WebCore::FileSystem::fileExists(m_pendingDownloadLocation))
>+        WebCore::FileSystem::deleteFile(m_pendingDownloadLocation);
> }
> 
> String NetworkDataTaskBlob::suggestedFilename() const
>@@ -468,8 +466,8 @@ void NetworkDataTaskBlob::download()
> 
>     LOG(NetworkSession, "%p - NetworkDataTaskBlob::download to %s", this, m_pendingDownloadLocation.utf8().data());
> 
>-    m_downloadFile = FileSystem::openFile(m_pendingDownloadLocation, FileSystem::FileOpenMode::Write);
>-    if (m_downloadFile == FileSystem::invalidPlatformFileHandle) {
>+    m_downloadFile = WebCore::FileSystem::openFile(m_pendingDownloadLocation, WebCore::FileSystem::FileOpenMode::Write);
>+    if (m_downloadFile == WebCore::FileSystem::invalidPlatformFileHandle) {
>         didFailDownload(cancelledError(m_firstRequest));
>         return;
>     }
>@@ -489,7 +487,7 @@ void NetworkDataTaskBlob::download()
> bool NetworkDataTaskBlob::writeDownload(const char* data, int bytesRead)
> {
>     ASSERT(isDownload());
>-    int bytesWritten = FileSystem::writeToFile(m_downloadFile, data, bytesRead);
>+    int bytesWritten = WebCore::FileSystem::writeToFile(m_downloadFile, data, bytesRead);
>     if (bytesWritten == -1) {
>         didFailDownload(cancelledError(m_firstRequest));
>         return false;
>@@ -504,14 +502,14 @@ bool NetworkDataTaskBlob::writeDownload(const char* data, int bytesRead)
> 
> void NetworkDataTaskBlob::cleanDownloadFiles()
> {
>-    if (m_downloadFile != FileSystem::invalidPlatformFileHandle) {
>-        FileSystem::closeFile(m_downloadFile);
>-        m_downloadFile = FileSystem::invalidPlatformFileHandle;
>+    if (m_downloadFile != WebCore::FileSystem::invalidPlatformFileHandle) {
>+        WebCore::FileSystem::closeFile(m_downloadFile);
>+        m_downloadFile = WebCore::FileSystem::invalidPlatformFileHandle;
>     }
>-    FileSystem::deleteFile(m_pendingDownloadLocation);
>+    WebCore::FileSystem::deleteFile(m_pendingDownloadLocation);
> }
> 
>-void NetworkDataTaskBlob::didFailDownload(const ResourceError& error)
>+void NetworkDataTaskBlob::didFailDownload(const WebCore::ResourceError& error)
> {
>     LOG(NetworkSession, "%p - NetworkDataTaskBlob::didFailDownload", this);
> 
>@@ -537,8 +535,8 @@ void NetworkDataTaskBlob::didFinishDownload()
>     LOG(NetworkSession, "%p - NetworkDataTaskBlob::didFinishDownload", this);
> 
>     ASSERT(isDownload());
>-    FileSystem::closeFile(m_downloadFile);
>-    m_downloadFile = FileSystem::invalidPlatformFileHandle;
>+    WebCore::FileSystem::closeFile(m_downloadFile);
>+    m_downloadFile = WebCore::FileSystem::invalidPlatformFileHandle;
> 
>     if (m_sandboxExtension) {
>         m_sandboxExtension->revoke();
>@@ -557,7 +555,7 @@ void NetworkDataTaskBlob::didFail(Error errorCode)
> 
>     Ref<NetworkDataTaskBlob> protectedThis(*this);
>     if (isDownload()) {
>-        didFailDownload(ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), m_firstRequest.url(), String()));
>+        didFailDownload(WebCore::ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), m_firstRequest.url(), String()));
>         return;
>     }
> 
>@@ -565,12 +563,12 @@ void NetworkDataTaskBlob::didFail(Error errorCode)
> 
>     clearStream();
>     ASSERT(m_client);
>-    m_client->didCompleteWithError(ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), m_firstRequest.url(), String()));
>+    m_client->didCompleteWithError(WebCore::ResourceError(webKitBlobResourceDomain, static_cast<int>(errorCode), m_firstRequest.url(), String()));
> }
> 
> void NetworkDataTaskBlob::didFinish()
> {
>-    if (m_downloadFile != FileSystem::invalidPlatformFileHandle) {
>+    if (m_downloadFile != WebCore::FileSystem::invalidPlatformFileHandle) {
>         didFinishDownload();
>         return;
>     }
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoad.cpp b/Source/WebKit/NetworkProcess/NetworkLoad.cpp
>index 378a548441d31dd70aca766e3de06717ec029195..5b353b0fcf10c8dfbbb56571e86e7a50ad16239f 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoad.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoad.cpp
>@@ -51,18 +51,16 @@
> 
> namespace WebKit {
> 
>-using namespace WebCore;
>-
> struct NetworkLoad::Throttle {
>-    Throttle(NetworkLoad& load, Seconds delay, ResourceResponse&& response, ResponseCompletionHandler&& handler)
>+    Throttle(NetworkLoad& load, Seconds delay, WebCore::ResourceResponse&& response, ResponseCompletionHandler&& handler)
>         : timer(load, &NetworkLoad::throttleDelayCompleted)
>         , response(WTFMove(response))
>         , responseCompletionHandler(WTFMove(handler))
>     {
>         timer.startOneShot(delay);
>     }
>-    Timer timer;
>-    ResourceResponse response;
>+    WebCore::Timer timer;
>+    WebCore::ResourceResponse response;
>     ResponseCompletionHandler responseCompletionHandler;
> };
> 
>@@ -121,7 +119,7 @@ NetworkLoad::~NetworkLoad()
>     if (m_redirectCompletionHandler)
>         m_redirectCompletionHandler({ });
>     if (m_responseCompletionHandler)
>-        m_responseCompletionHandler(PolicyAction::Ignore);
>+        m_responseCompletionHandler(WebCore::PolicyAction::Ignore);
>     if (m_task)
>         m_task->clearClient();
> }
>@@ -150,7 +148,7 @@ void NetworkLoad::cancel()
> void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest)
> {
> #if PLATFORM(COCOA)
>-    m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest.nsURLRequest(HTTPBodyUpdatePolicy::DoNotUpdateHTTPBody));
>+    m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::DoNotUpdateHTTPBody));
> #elif USE(SOUP)
>     // FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldProperties. See https://bugs.webkit.org/show_bug.cgi?id=126127.
>     m_currentRequest.updateFromDelegatePreservingOldProperties(newRequest);
>@@ -164,7 +162,7 @@ void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest)
>     auto redirectCompletionHandler = std::exchange(m_redirectCompletionHandler, nullptr);
>     ASSERT(redirectCompletionHandler);
>     if (m_currentRequest.isNull()) {
>-        NetworkLoadMetrics emptyMetrics;
>+        WebCore::NetworkLoadMetrics emptyMetrics;
>         didCompleteWithError(cancelledError(m_currentRequest), emptyMetrics);
>         if (redirectCompletionHandler)
>             redirectCompletionHandler({ });
>@@ -172,14 +170,14 @@ void NetworkLoad::continueWillSendRequest(WebCore::ResourceRequest&& newRequest)
>     }
> 
>     if (redirectCompletionHandler)
>-        redirectCompletionHandler(ResourceRequest(m_currentRequest));
>+        redirectCompletionHandler(WebCore::ResourceRequest(m_currentRequest));
> }
> 
> void NetworkLoad::continueDidReceiveResponse()
> {
>     if (m_responseCompletionHandler) {
>         auto responseCompletionHandler = std::exchange(m_responseCompletionHandler, nullptr);
>-        responseCompletionHandler(PolicyAction::Use);
>+        responseCompletionHandler(WebCore::PolicyAction::Use);
>     }
> }
> 
>@@ -193,7 +191,7 @@ bool NetworkLoad::isAllowedToAskUserForCredentials() const
>     return m_client.get().isAllowedToAskUserForCredentials();
> }
> 
>-void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const ResourceRequest& updatedRequest, const ResourceResponse& response)
>+void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const WebCore::ResourceRequest& updatedRequest, const WebCore::ResourceResponse& response)
> {
>     if (!m_task)
>         return;
>@@ -230,13 +228,13 @@ void NetworkLoad::setPendingDownload(PendingDownload& pendingDownload)
>     m_task->setPendingDownload(pendingDownload);
> }
> 
>-void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse, ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
>+void NetworkLoad::willPerformHTTPRedirection(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
> {
>     ASSERT(!redirectResponse.isNull());
>     ASSERT(RunLoop::isMain());
>     ASSERT(!m_redirectCompletionHandler);
> 
>-    redirectResponse.setSource(ResourceResponse::Source::Network);
>+    redirectResponse.setSource(WebCore::ResourceResponse::Source::Network);
>     m_redirectCompletionHandler = WTFMove(completionHandler);
> 
> #if ENABLE(NETWORK_CAPTURE)
>@@ -251,11 +249,11 @@ void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse
>     m_client.get().willSendRedirectedRequest(WTFMove(oldRequest), WTFMove(request), WTFMove(redirectResponse));
> }
> 
>-void NetworkLoad::didReceiveChallenge(AuthenticationChallenge&& challenge, ChallengeCompletionHandler&& completionHandler)
>+void NetworkLoad::didReceiveChallenge(WebCore::AuthenticationChallenge&& challenge, ChallengeCompletionHandler&& completionHandler)
> {
>     auto scheme = challenge.protectionSpace().authenticationScheme();
>-    bool isTLSHandshake = scheme == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
>-        || scheme == ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>+    bool isTLSHandshake = scheme == WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested
>+        || scheme == WebCore::ProtectionSpaceAuthenticationSchemeClientCertificateRequested;
>     if (!isAllowedToAskUserForCredentials() && !isTLSHandshake) {
>         m_client.get().didBlockAuthenticationChallenge();
>         completionHandler(AuthenticationChallengeDisposition::UseCredential, { });
>@@ -268,7 +266,7 @@ void NetworkLoad::didReceiveChallenge(AuthenticationChallenge&& challenge, Chall
>         NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge, WTFMove(completionHandler));
> }
> 
>-void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>+void NetworkLoad::didReceiveResponseNetworkSession(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
> {
>     ASSERT(RunLoop::isMain());
>     ASSERT(!m_throttle);
>@@ -287,7 +285,7 @@ void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response,
>     notifyDidReceiveResponse(WTFMove(response), WTFMove(completionHandler));
> }
> 
>-void NetworkLoad::notifyDidReceiveResponse(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>+void NetworkLoad::notifyDidReceiveResponse(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
> {
>     ASSERT(RunLoop::isMain());
> 
>@@ -296,7 +294,7 @@ void NetworkLoad::notifyDidReceiveResponse(ResourceResponse&& response, Response
>         m_recorder->recordResponseReceived(response);
> #endif
> 
>-    response.setSource(ResourceResponse::Source::Network);
>+    response.setSource(WebCore::ResourceResponse::Source::Network);
>     if (m_parameters.needsCertificateInfo)
>         response.includeCertificateInfo();
> 
>@@ -304,10 +302,10 @@ void NetworkLoad::notifyDidReceiveResponse(ResourceResponse&& response, Response
>         m_responseCompletionHandler = WTFMove(completionHandler);
>         return;
>     }
>-    completionHandler(PolicyAction::Use);
>+    completionHandler(WebCore::PolicyAction::Use);
> }
> 
>-void NetworkLoad::didReceiveData(Ref<SharedBuffer>&& buffer)
>+void NetworkLoad::didReceiveData(Ref<WebCore::SharedBuffer>&& buffer)
> {
>     ASSERT(!m_throttle);
> 
>@@ -321,7 +319,7 @@ void NetworkLoad::didReceiveData(Ref<SharedBuffer>&& buffer)
>     m_client.get().didReceiveBuffer(WTFMove(buffer), size);
> }
> 
>-void NetworkLoad::didCompleteWithError(const ResourceError& error, const WebCore::NetworkLoadMetrics& networkLoadMetrics)
>+void NetworkLoad::didCompleteWithError(const WebCore::ResourceError& error, const WebCore::NetworkLoadMetrics& networkLoadMetrics)
> {
>     ASSERT(!m_throttle);
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>index 804e7b5c5fd04119a80417ede51b90070d2aed3f..3ab76e54d44bab08f301d431e8d035004a815d3d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>@@ -46,14 +46,12 @@
> 
> namespace WebKit {
> 
>-using namespace WebCore;
>-
>-static inline bool isSameOrigin(const URL& url, const SecurityOrigin* origin)
>+static inline bool isSameOrigin(const WebCore::URL& url, const WebCore::SecurityOrigin* origin)
> {
>     return url.protocolIsData() || url.protocolIsBlob() || !origin || origin->canRequest(url);
> }
> 
>-NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, HTTPHeaderMap&& originalRequestHeaders, URL&& url, RefPtr<SecurityOrigin>&& sourceOrigin, PreflightPolicy preflightPolicy, String&& referrer, bool shouldCaptureExtraNetworkLoadMetrics)
>+NetworkLoadChecker::NetworkLoadChecker(WebCore::FetchOptions&& options, PAL::SessionID sessionID, uint64_t pageID, uint64_t frameID, WebCore::HTTPHeaderMap&& originalRequestHeaders, WebCore::URL&& url, RefPtr<WebCore::SecurityOrigin>&& sourceOrigin, WebCore::PreflightPolicy preflightPolicy, String&& referrer, bool shouldCaptureExtraNetworkLoadMetrics)
>     : m_options(WTFMove(options))
>     , m_sessionID(sessionID)
>     , m_pageID(pageID)
>@@ -67,21 +65,21 @@ NetworkLoadChecker::NetworkLoadChecker(FetchOptions&& options, PAL::SessionID se
> {
>     m_isSameOriginRequest = isSameOrigin(m_url, m_origin.get());
>     switch (options.credentials) {
>-    case FetchOptions::Credentials::Include:
>-        m_storedCredentialsPolicy = StoredCredentialsPolicy::Use;
>+    case WebCore::FetchOptions::Credentials::Include:
>+        m_storedCredentialsPolicy = WebCore::StoredCredentialsPolicy::Use;
>         break;
>-    case FetchOptions::Credentials::SameOrigin:
>-        m_storedCredentialsPolicy = m_isSameOriginRequest ? StoredCredentialsPolicy::Use : StoredCredentialsPolicy::DoNotUse;
>+    case WebCore::FetchOptions::Credentials::SameOrigin:
>+        m_storedCredentialsPolicy = m_isSameOriginRequest ? WebCore::StoredCredentialsPolicy::Use : WebCore::StoredCredentialsPolicy::DoNotUse;
>         break;
>-    case FetchOptions::Credentials::Omit:
>-        m_storedCredentialsPolicy = StoredCredentialsPolicy::DoNotUse;
>+    case WebCore::FetchOptions::Credentials::Omit:
>+        m_storedCredentialsPolicy = WebCore::StoredCredentialsPolicy::DoNotUse;
>         break;
>     }
> }
> 
> NetworkLoadChecker::~NetworkLoadChecker() = default;
> 
>-void NetworkLoadChecker::check(ResourceRequest&& request, ContentSecurityPolicyClient* client, ValidationHandler&& handler)
>+void NetworkLoadChecker::check(WebCore::ResourceRequest&& request, WebCore::ContentSecurityPolicyClient* client, ValidationHandler&& handler)
> {
>     ASSERT(!isChecking());
> 
>@@ -90,26 +88,26 @@ void NetworkLoadChecker::check(ResourceRequest&& request, ContentSecurityPolicyC
> 
>     m_firstRequestHeaders = request.httpHeaderFields();
>     // FIXME: We should not get this information from the request but directly from some NetworkProcess setting.
>-    m_dntHeaderValue = m_firstRequestHeaders.get(HTTPHeaderName::DNT);
>+    m_dntHeaderValue = m_firstRequestHeaders.get(WebCore::HTTPHeaderName::DNT);
>     if (m_dntHeaderValue.isNull() && m_sessionID.isEphemeral()) {
>         m_dntHeaderValue = "1";
>-        request.setHTTPHeaderField(HTTPHeaderName::DNT, m_dntHeaderValue);
>+        request.setHTTPHeaderField(WebCore::HTTPHeaderName::DNT, m_dntHeaderValue);
>     }
>     checkRequest(WTFMove(request), client, WTFMove(handler));
> }
> 
>-void NetworkLoadChecker::prepareRedirectedRequest(ResourceRequest& request)
>+void NetworkLoadChecker::prepareRedirectedRequest(WebCore::ResourceRequest& request)
> {
>     if (!m_dntHeaderValue.isNull())
>-        request.setHTTPHeaderField(HTTPHeaderName::DNT, m_dntHeaderValue);
>+        request.setHTTPHeaderField(WebCore::HTTPHeaderName::DNT, m_dntHeaderValue);
> }
> 
>-static inline NetworkLoadChecker::RedirectionRequestOrError redirectionError(const ResourceResponse& redirectResponse, String&& errorMessage)
>+static inline NetworkLoadChecker::RedirectionRequestOrError redirectionError(const WebCore::ResourceResponse& redirectResponse, String&& errorMessage)
> {
>-    return makeUnexpected(ResourceError { String { }, 0, redirectResponse.url(), WTFMove(errorMessage), ResourceError::Type::AccessControl });
>+    return makeUnexpected(WebCore::ResourceError { String { }, 0, redirectResponse.url(), WTFMove(errorMessage), WebCore::ResourceError::Type::AccessControl });
> }
> 
>-void NetworkLoadChecker::checkRedirection(ResourceRequest&& request, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse, ContentSecurityPolicyClient* client, RedirectionValidationHandler&& handler)
>+void NetworkLoadChecker::checkRedirection(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse, WebCore::ContentSecurityPolicyClient* client, RedirectionValidationHandler&& handler)
> {
>     ASSERT(!isChecking());
> 
>@@ -119,11 +117,11 @@ void NetworkLoadChecker::checkRedirection(ResourceRequest&& request, ResourceReq
>         return;
>     }
> 
>-    if (m_options.redirect == FetchOptions::Redirect::Error) {
>+    if (m_options.redirect == WebCore::FetchOptions::Redirect::Error) {
>         handler(redirectionError(redirectResponse, makeString("Not allowed to follow a redirection while loading ", redirectResponse.url().string())));
>         return;
>     }
>-    if (m_options.redirect == FetchOptions::Redirect::Manual) {
>+    if (m_options.redirect == WebCore::FetchOptions::Redirect::Manual) {
>         handler(RedirectionTriplet { WTFMove(request), WTFMove(redirectRequest), WTFMove(redirectResponse) });
>         return;
>     }
>@@ -148,30 +146,30 @@ void NetworkLoadChecker::checkRedirection(ResourceRequest&& request, ResourceReq
>     });
> }
> 
>-ResourceError NetworkLoadChecker::validateResponse(ResourceResponse& response)
>+WebCore::ResourceError NetworkLoadChecker::validateResponse(WebCore::ResourceResponse& response)
> {
>     if (m_redirectCount)
>         response.setRedirected(true);
> 
>-    if (response.type() == ResourceResponse::Type::Opaqueredirect) {
>-        response.setTainting(ResourceResponse::Tainting::Opaqueredirect);
>+    if (response.type() == WebCore::ResourceResponse::Type::Opaqueredirect) {
>+        response.setTainting(WebCore::ResourceResponse::Tainting::Opaqueredirect);
>         return { };
>     }
> 
>-    if (m_options.mode == FetchOptions::Mode::Navigate || m_isSameOriginRequest) {
>-        response.setTainting(ResourceResponse::Tainting::Basic);
>+    if (m_options.mode == WebCore::FetchOptions::Mode::Navigate || m_isSameOriginRequest) {
>+        response.setTainting(WebCore::ResourceResponse::Tainting::Basic);
>         return { };
>     }
> 
>-    if (m_options.mode == FetchOptions::Mode::NoCors) {
>+    if (m_options.mode == WebCore::FetchOptions::Mode::NoCors) {
>         if (auto error = validateCrossOriginResourcePolicy(*m_origin, m_url, response))
>             return WTFMove(*error);
> 
>-        response.setTainting(ResourceResponse::Tainting::Opaque);
>+        response.setTainting(WebCore::ResourceResponse::Tainting::Opaque);
>         return { };
>     }
> 
>-    ASSERT(m_options.mode == FetchOptions::Mode::Cors);
>+    ASSERT(m_options.mode == WebCore::FetchOptions::Mode::Cors);
> 
>     // If we have a 304, the cached response is in WebProcess so we let WebProcess do the CORS check on the cached response.
>     if (response.httpStatusCode() == 304)
>@@ -179,22 +177,22 @@ ResourceError NetworkLoadChecker::validateResponse(ResourceResponse& response)
> 
>     String errorMessage;
>     if (!passesAccessControlCheck(response, m_storedCredentialsPolicy, *m_origin, errorMessage))
>-        return ResourceError { String { }, 0, m_url, WTFMove(errorMessage), ResourceError::Type::AccessControl };
>+        return WebCore::ResourceError { String { }, 0, m_url, WTFMove(errorMessage), WebCore::ResourceError::Type::AccessControl };
> 
>-    response.setTainting(ResourceResponse::Tainting::Cors);
>+    response.setTainting(WebCore::ResourceResponse::Tainting::Cors);
>     return { };
> }
> 
> auto NetworkLoadChecker::accessControlErrorForValidationHandler(String&& message) -> RequestOrError
> {
>-    return makeUnexpected(ResourceError { String { }, 0, m_url, WTFMove(message), ResourceError::Type::AccessControl });
>+    return makeUnexpected(WebCore::ResourceError { String { }, 0, m_url, WTFMove(message), WebCore::ResourceError::Type::AccessControl });
> }
> 
>-void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ContentSecurityPolicyClient* client, ValidationHandler&& handler)
>+void NetworkLoadChecker::checkRequest(WebCore::ResourceRequest&& request, WebCore::ContentSecurityPolicyClient* client, ValidationHandler&& handler)
> {
>     if (auto* contentSecurityPolicy = this->contentSecurityPolicy()) {
>         if (isRedirected()) {
>-            auto type = m_options.mode == FetchOptions::Mode::Navigate ? ContentSecurityPolicy::InsecureRequestType::Navigation : ContentSecurityPolicy::InsecureRequestType::Load;
>+            auto type = m_options.mode == WebCore::FetchOptions::Mode::Navigate ? WebCore::ContentSecurityPolicy::InsecureRequestType::Navigation : WebCore::ContentSecurityPolicy::InsecureRequestType::Load;
>             contentSecurityPolicy->upgradeInsecureRequestIfNeeded(request, type);
>         }
>         if (!isAllowedByContentSecurityPolicy(request, client)) {
>@@ -221,7 +219,7 @@ void NetworkLoadChecker::checkRequest(ResourceRequest&& request, ContentSecurity
> #endif
> }
> 
>-bool NetworkLoadChecker::isAllowedByContentSecurityPolicy(const ResourceRequest& request, WebCore::ContentSecurityPolicyClient* client)
>+bool NetworkLoadChecker::isAllowedByContentSecurityPolicy(const WebCore::ResourceRequest& request, WebCore::ContentSecurityPolicyClient* client)
> {
>     auto* contentSecurityPolicy = this->contentSecurityPolicy();
>     contentSecurityPolicy->setClient(client);
>@@ -229,31 +227,31 @@ bool NetworkLoadChecker::isAllowedByContentSecurityPolicy(const ResourceRequest&
>         contentSecurityPolicy->setClient(nullptr);
>     });
> 
>-    auto redirectResponseReceived = isRedirected() ? ContentSecurityPolicy::RedirectResponseReceived::Yes : ContentSecurityPolicy::RedirectResponseReceived::No;
>+    auto redirectResponseReceived = isRedirected() ? WebCore::ContentSecurityPolicy::RedirectResponseReceived::Yes : WebCore::ContentSecurityPolicy::RedirectResponseReceived::No;
>     switch (m_options.destination) {
>-    case FetchOptions::Destination::Worker:
>-    case FetchOptions::Destination::Serviceworker:
>-    case FetchOptions::Destination::Sharedworker:
>+    case WebCore::FetchOptions::Destination::Worker:
>+    case WebCore::FetchOptions::Destination::Serviceworker:
>+    case WebCore::FetchOptions::Destination::Sharedworker:
>         return contentSecurityPolicy->allowChildContextFromSource(request.url(), redirectResponseReceived);
>-    case FetchOptions::Destination::Script:
>-        if (request.requester() == ResourceRequest::Requester::ImportScripts && !contentSecurityPolicy->allowScriptFromSource(request.url(), redirectResponseReceived))
>+    case WebCore::FetchOptions::Destination::Script:
>+        if (request.requester() == WebCore::ResourceRequest::Requester::ImportScripts && !contentSecurityPolicy->allowScriptFromSource(request.url(), redirectResponseReceived))
>             return false;
>         // FIXME: Check CSP for non-importScripts() initiated loads.
>         return true;
>-    case FetchOptions::Destination::EmptyString:
>+    case WebCore::FetchOptions::Destination::EmptyString:
>         return contentSecurityPolicy->allowConnectToSource(request.url(), redirectResponseReceived);
>-    case FetchOptions::Destination::Audio:
>-    case FetchOptions::Destination::Document:
>-    case FetchOptions::Destination::Embed:
>-    case FetchOptions::Destination::Font:
>-    case FetchOptions::Destination::Image:
>-    case FetchOptions::Destination::Manifest:
>-    case FetchOptions::Destination::Object:
>-    case FetchOptions::Destination::Report:
>-    case FetchOptions::Destination::Style:
>-    case FetchOptions::Destination::Track:
>-    case FetchOptions::Destination::Video:
>-    case FetchOptions::Destination::Xslt:
>+    case WebCore::FetchOptions::Destination::Audio:
>+    case WebCore::FetchOptions::Destination::Document:
>+    case WebCore::FetchOptions::Destination::Embed:
>+    case WebCore::FetchOptions::Destination::Font:
>+    case WebCore::FetchOptions::Destination::Image:
>+    case WebCore::FetchOptions::Destination::Manifest:
>+    case WebCore::FetchOptions::Destination::Object:
>+    case WebCore::FetchOptions::Destination::Report:
>+    case WebCore::FetchOptions::Destination::Style:
>+    case WebCore::FetchOptions::Destination::Track:
>+    case WebCore::FetchOptions::Destination::Video:
>+    case WebCore::FetchOptions::Destination::Xslt:
>         // FIXME: Check CSP for these destinations.
>         return true;
>     }
>@@ -261,10 +259,10 @@ bool NetworkLoadChecker::isAllowedByContentSecurityPolicy(const ResourceRequest&
>     return true;
> }
> 
>-void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, ValidationHandler&& handler)
>+void NetworkLoadChecker::continueCheckingRequest(WebCore::ResourceRequest&& request, ValidationHandler&& handler)
> {
>-    if (m_options.credentials == FetchOptions::Credentials::SameOrigin)
>-        m_storedCredentialsPolicy = m_isSameOriginRequest && m_origin->canRequest(request.url()) ? StoredCredentialsPolicy::Use : StoredCredentialsPolicy::DoNotUse;
>+    if (m_options.credentials == WebCore::FetchOptions::Credentials::SameOrigin)
>+        m_storedCredentialsPolicy = m_isSameOriginRequest && m_origin->canRequest(request.url()) ? WebCore::StoredCredentialsPolicy::Use : WebCore::StoredCredentialsPolicy::DoNotUse;
> 
>     m_isSameOriginRequest = m_isSameOriginRequest && isSameOrigin(request.url(), m_origin.get());
> 
>@@ -273,7 +271,7 @@ void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, Vali
>         return;
>     }
> 
>-    if (m_options.mode == FetchOptions::Mode::SameOrigin) {
>+    if (m_options.mode == WebCore::FetchOptions::Mode::SameOrigin) {
>         String message = makeString("Unsafe attempt to load URL ", request.url().stringCenterEllipsizedToLength(), " from origin ", m_origin->toString(), ". Domains, protocols and ports must match.\n");
>         handler(accessControlErrorForValidationHandler(WTFMove(message)));
>         return;
>@@ -288,31 +286,31 @@ void NetworkLoadChecker::continueCheckingRequest(ResourceRequest&& request, Vali
>     checkCORSRequest(WTFMove(request), WTFMove(handler));
> }
> 
>-void NetworkLoadChecker::checkCORSRequest(ResourceRequest&& request, ValidationHandler&& handler)
>+void NetworkLoadChecker::checkCORSRequest(WebCore::ResourceRequest&& request, ValidationHandler&& handler)
> {
>-    ASSERT(m_options.mode == FetchOptions::Mode::Cors);
>+    ASSERT(m_options.mode == WebCore::FetchOptions::Mode::Cors);
> 
>     // Except in case where preflight is needed, loading should be able to continue on its own.
>     switch (m_preflightPolicy) {
>-    case PreflightPolicy::Force:
>+    case WebCore::PreflightPolicy::Force:
>         checkCORSRequestWithPreflight(WTFMove(request), WTFMove(handler));
>         break;
>-    case PreflightPolicy::Consider:
>+    case WebCore::PreflightPolicy::Consider:
>         if (!m_isSimpleRequest || !isSimpleCrossOriginAccessRequest(request.httpMethod(), m_originalRequestHeaders)) {
>             checkCORSRequestWithPreflight(WTFMove(request), WTFMove(handler));
>             return;
>         }
>         FALLTHROUGH;
>-    case PreflightPolicy::Prevent:
>+    case WebCore::PreflightPolicy::Prevent:
>         updateRequestForAccessControl(request, *m_origin, m_storedCredentialsPolicy);
>         handler(WTFMove(request));
>         break;
>     }
> }
> 
>-void NetworkLoadChecker::checkCORSRedirectedRequest(ResourceRequest&& request, ValidationHandler&& handler)
>+void NetworkLoadChecker::checkCORSRedirectedRequest(WebCore::ResourceRequest&& request, ValidationHandler&& handler)
> {
>-    ASSERT(m_options.mode == FetchOptions::Mode::Cors);
>+    ASSERT(m_options.mode == WebCore::FetchOptions::Mode::Cors);
>     ASSERT(isRedirected());
> 
>     // Force any subsequent request to use these checks.
>@@ -322,26 +320,26 @@ void NetworkLoadChecker::checkCORSRedirectedRequest(ResourceRequest&& request, V
>         // Use a unique origin for subsequent loads if needed.
>         // https://fetch.spec.whatwg.org/#concept-http-redirect-fetch (Step 10).
>         if (!m_origin || !m_origin->isUnique())
>-            m_origin = SecurityOrigin::createUnique();
>+            m_origin = WebCore::SecurityOrigin::createUnique();
>     }
> 
>     // FIXME: We should set the request referrer according the referrer policy.
> 
>     // Let's fetch the request with the original headers (equivalent to request cloning specified by fetch algorithm).
>-    if (!request.httpHeaderFields().contains(HTTPHeaderName::Authorization))
>-        m_firstRequestHeaders.remove(HTTPHeaderName::Authorization);
>+    if (!request.httpHeaderFields().contains(WebCore::HTTPHeaderName::Authorization))
>+        m_firstRequestHeaders.remove(WebCore::HTTPHeaderName::Authorization);
>     request.setHTTPHeaderFields(m_firstRequestHeaders);
> 
>     checkCORSRequest(WTFMove(request), WTFMove(handler));
> }
> 
>-void NetworkLoadChecker::checkCORSRequestWithPreflight(ResourceRequest&& request, ValidationHandler&& handler)
>+void NetworkLoadChecker::checkCORSRequestWithPreflight(WebCore::ResourceRequest&& request, ValidationHandler&& handler)
> {
>-    ASSERT(m_options.mode == FetchOptions::Mode::Cors);
>+    ASSERT(m_options.mode == WebCore::FetchOptions::Mode::Cors);
> 
>     m_isSimpleRequest = false;
>     // FIXME: We should probably partition preflight result cache by session ID.
>-    if (CrossOriginPreflightResultCache::singleton().canSkipPreflight(m_origin->toString(), request.url(), m_storedCredentialsPolicy, request.httpMethod(), m_originalRequestHeaders)) {
>+    if (WebCore::CrossOriginPreflightResultCache::singleton().canSkipPreflight(m_origin->toString(), request.url(), m_storedCredentialsPolicy, request.httpMethod(), m_originalRequestHeaders)) {
>         RELEASE_LOG_IF_ALLOWED("checkCORSRequestWithPreflight - preflight can be skipped thanks to cached result");
>         updateRequestForAccessControl(request, *m_origin, m_storedCredentialsPolicy);
>         handler(WTFMove(request));
>@@ -379,40 +377,40 @@ void NetworkLoadChecker::checkCORSRequestWithPreflight(ResourceRequest&& request
>     m_corsPreflightChecker->startPreflight();
> }
> 
>-bool NetworkLoadChecker::doesNotNeedCORSCheck(const URL& url) const
>+bool NetworkLoadChecker::doesNotNeedCORSCheck(const WebCore::URL& url) const
> {
>-    if (m_options.mode == FetchOptions::Mode::NoCors || m_options.mode == FetchOptions::Mode::Navigate)
>+    if (m_options.mode == WebCore::FetchOptions::Mode::NoCors || m_options.mode == WebCore::FetchOptions::Mode::Navigate)
>         return true;
> 
>-    if (!SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(url.protocol().toStringWithoutCopying()))
>+    if (!WebCore::SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(url.protocol().toStringWithoutCopying()))
>         return true;
> 
>     return m_isSameOriginRequest;
> }
> 
>-ContentSecurityPolicy* NetworkLoadChecker::contentSecurityPolicy()
>+WebCore::ContentSecurityPolicy* NetworkLoadChecker::contentSecurityPolicy()
> {
>     if (!m_contentSecurityPolicy && m_cspResponseHeaders) {
>         // FIXME: Pass the URL of the protected resource instead of its origin.
>-        m_contentSecurityPolicy = std::make_unique<ContentSecurityPolicy>(URL { URL { }, m_origin->toString() });
>-        m_contentSecurityPolicy->didReceiveHeaders(*m_cspResponseHeaders, String { m_referrer }, ContentSecurityPolicy::ReportParsingErrors::No);
>+        m_contentSecurityPolicy = std::make_unique<WebCore::ContentSecurityPolicy>(WebCore::URL { WebCore::URL { }, m_origin->toString() });
>+        m_contentSecurityPolicy->didReceiveHeaders(*m_cspResponseHeaders, String { m_referrer }, WebCore::ContentSecurityPolicy::ReportParsingErrors::No);
>     }
>     return m_contentSecurityPolicy.get();
> }
> 
> #if ENABLE(CONTENT_EXTENSIONS)
>-void NetworkLoadChecker::processContentExtensionRulesForLoad(ResourceRequest&& request, ContentExtensionCallback&& callback)
>+void NetworkLoadChecker::processContentExtensionRulesForLoad(WebCore::ResourceRequest&& request, ContentExtensionCallback&& callback)
> {
>     // FIXME: Enable content blockers for navigation loads.
>-    if (!m_checkContentExtensions || !m_userContentControllerIdentifier || m_options.mode == FetchOptions::Mode::Navigate) {
>-        ContentExtensions::BlockedStatus status;
>+    if (!m_checkContentExtensions || !m_userContentControllerIdentifier || m_options.mode == WebCore::FetchOptions::Mode::Navigate) {
>+        WebCore::ContentExtensions::BlockedStatus status;
>         callback(ContentExtensionResult { WTFMove(request), status });
>         return;
>     }
> 
>     NetworkProcess::singleton().networkContentRuleListManager().contentExtensionsBackend(*m_userContentControllerIdentifier, [this, weakThis = makeWeakPtr(this), request = WTFMove(request), callback = WTFMove(callback)](auto& backend) mutable {
>         if (!weakThis) {
>-            callback(makeUnexpected(ResourceError { ResourceError::Type::Cancellation }));
>+            callback(makeUnexpected(WebCore::ResourceError { WebCore::ResourceError::Type::Cancellation }));
>             return;
>         }
> 
>@@ -423,11 +421,13 @@ void NetworkLoadChecker::processContentExtensionRulesForLoad(ResourceRequest&& r
> }
> #endif // ENABLE(CONTENT_EXTENSIONS)
> 
>-void NetworkLoadChecker::storeRedirectionIfNeeded(const ResourceRequest& request, const ResourceResponse& response)
>+void NetworkLoadChecker::storeRedirectionIfNeeded(const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
> {
>     if (!m_shouldCaptureExtraNetworkLoadMetrics)
>         return;
>-    m_loadInformation.transactions.append(NetworkTransactionInformation { NetworkTransactionInformation::Type::Redirection, ResourceRequest { request }, ResourceResponse { response }, { } });
>+    m_loadInformation.transactions.append(WebCore::NetworkTransactionInformation { WebCore::NetworkTransactionInformation::Type::Redirection, WebCore::ResourceRequest { request }, WebCore::ResourceResponse { response }, { } });
> }
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 0799a491c142faddb505ae8c2e3c9e9f9bc7355a..7ac9fcadb599c1330d5c9391ab2acccc255a0ea1 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -96,8 +96,6 @@
> #include "NetworkSessionCocoa.h"
> #endif
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> NetworkProcess& NetworkProcess::singleton()
>@@ -126,7 +124,7 @@ NetworkProcess::NetworkProcess()
>     addSupplement<NetworkProximityManager>();
> #endif
> 
>-    NetworkStateNotifier::singleton().addListener([this](bool isOnLine) {
>+    WebCore::NetworkStateNotifier::singleton().addListener([this](bool isOnLine) {
>         auto webProcessConnections = m_webProcessConnections;
>         for (auto& webProcessConnection : webProcessConnections)
>             webProcessConnection->setOnLineState(isOnLine);
>@@ -281,7 +279,7 @@ void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&&
>         RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters::legacyPrivateSessionParameters());
> 
>     if (parameters.shouldUseTestingNetworkSession)
>-        NetworkStorageSession::switchToNewTestingSession();
>+        WebCore::NetworkStorageSession::switchToNewTestingSession();
> 
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING) && !RELEASE_LOG_DISABLED
>     m_logCookieInformation = parameters.logCookieInformation;
>@@ -374,12 +372,12 @@ void NetworkProcess::createNetworkConnectionToWebProcess()
> #endif
> 
>     if (!m_webProcessConnections.isEmpty())
>-        m_webProcessConnections.last()->setOnLineState(NetworkStateNotifier::singleton().onLine());
>+        m_webProcessConnections.last()->setOnLineState(WebCore::NetworkStateNotifier::singleton().onLine());
> }
> 
> void NetworkProcess::clearCachedCredentials()
> {
>-    NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
>+    WebCore::NetworkStorageSession::defaultStorageSession().credentialStorage().clearCredentials();
>     if (auto* networkSession = SessionTracker::networkSession(PAL::SessionID::defaultSessionID()))
>         networkSession->clearCredentials();
>     else
>@@ -431,14 +429,14 @@ void NetworkProcess::writeBlobToFilePath(const WebCore::URL& url, const String&
> #if HAVE(CFNETWORK_STORAGE_PARTITIONING)
> void NetworkProcess::updatePrevalentDomainsToBlockCookiesFor(PAL::SessionID sessionID, const Vector<String>& domainsToBlock, bool shouldClearFirst, uint64_t contextId)
> {
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         networkStorageSession->setPrevalentDomainsToBlockCookiesFor(domainsToBlock, shouldClearFirst);
>     parentProcessConnection()->send(Messages::NetworkProcessProxy::DidUpdateBlockCookies(contextId), 0);
> }
> 
> void NetworkProcess::hasStorageAccessForFrame(PAL::SessionID sessionID, const String& resourceDomain, const String& firstPartyDomain, uint64_t frameID, uint64_t pageID, uint64_t contextId)
> {
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         parentProcessConnection()->send(Messages::NetworkProcessProxy::StorageAccessRequestResult(networkStorageSession->hasStorageAccess(resourceDomain, firstPartyDomain, frameID, pageID), contextId), 0);
>     else
>         ASSERT_NOT_REACHED();
>@@ -446,7 +444,7 @@ void NetworkProcess::hasStorageAccessForFrame(PAL::SessionID sessionID, const St
> 
> void NetworkProcess::getAllStorageAccessEntries(PAL::SessionID sessionID, uint64_t contextId)
> {
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         parentProcessConnection()->send(Messages::NetworkProcessProxy::AllStorageAccessEntriesResult(networkStorageSession->getAllStorageAccessEntries(), contextId), 0);
>     else
>         ASSERT_NOT_REACHED();
>@@ -455,7 +453,7 @@ void NetworkProcess::getAllStorageAccessEntries(PAL::SessionID sessionID, uint64
> void NetworkProcess::grantStorageAccess(PAL::SessionID sessionID, const String& resourceDomain, const String& firstPartyDomain, std::optional<uint64_t> frameID, uint64_t pageID, uint64_t contextId)
> {
>     bool isStorageGranted = false;
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID)) {
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID)) {
>         networkStorageSession->grantStorageAccess(resourceDomain, firstPartyDomain, frameID, pageID);
>         ASSERT(networkStorageSession->hasStorageAccess(resourceDomain, firstPartyDomain, frameID, pageID));
>         isStorageGranted = true;
>@@ -467,7 +465,7 @@ void NetworkProcess::grantStorageAccess(PAL::SessionID sessionID, const String&
> 
> void NetworkProcess::removeAllStorageAccess(PAL::SessionID sessionID, uint64_t contextId)
> {
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         networkStorageSession->removeAllStorageAccess();
>     else
>         ASSERT_NOT_REACHED();
>@@ -476,7 +474,7 @@ void NetworkProcess::removeAllStorageAccess(PAL::SessionID sessionID, uint64_t c
> 
> void NetworkProcess::removePrevalentDomains(PAL::SessionID sessionID, const Vector<String>& domains)
> {
>-    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+    if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>         networkStorageSession->removePrevalentDomains(domains);
> }
> #endif
>@@ -497,7 +495,7 @@ void NetworkProcess::setSessionIsControlledByAutomation(PAL::SessionID sessionID
> static void fetchDiskCacheEntries(PAL::SessionID sessionID, OptionSet<WebsiteDataFetchOption> fetchOptions, Function<void (Vector<WebsiteData::Entry>)>&& completionHandler)
> {
>     if (auto* cache = NetworkProcess::singleton().cache()) {
>-        HashMap<SecurityOriginData, uint64_t> originsAndSizes;
>+        HashMap<WebCore::SecurityOriginData, uint64_t> originsAndSizes;
>         cache->traverse([fetchOptions, completionHandler = WTFMove(completionHandler), originsAndSizes = WTFMove(originsAndSizes)](auto* traversalEntry) mutable {
>             if (!traversalEntry) {
>                 Vector<WebsiteData::Entry> entries;
>@@ -553,13 +551,13 @@ void NetworkProcess::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<Websit
>     }));
> 
>     if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             networkStorageSession->getHostnamesWithCookies(callbackAggregator->m_websiteData.hostNamesWithCookies);
>     }
> 
>     if (websiteDataTypes.contains(WebsiteDataType::Credentials)) {
>-        if (NetworkStorageSession::storageSession(sessionID))
>-            callbackAggregator->m_websiteData.originsWithCredentials = NetworkStorageSession::storageSession(sessionID)->credentialStorage().originsWithCredentials();
>+        if (WebCore::NetworkStorageSession::storageSession(sessionID))
>+            callbackAggregator->m_websiteData.originsWithCredentials = WebCore::NetworkStorageSession::storageSession(sessionID)->credentialStorage().originsWithCredentials();
>     }
> 
>     if (websiteDataTypes.contains(WebsiteDataType::DOMCache)) {
>@@ -570,7 +568,7 @@ void NetworkProcess::fetchWebsiteData(PAL::SessionID sessionID, OptionSet<Websit
> 
> #if PLATFORM(COCOA)
>     if (websiteDataTypes.contains(WebsiteDataType::HSTSCache)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             getHostNamesWithHSTSCache(*networkStorageSession, callbackAggregator->m_websiteData.hostNamesWithHSTSCache);
>     }
> #endif
>@@ -586,19 +584,19 @@ void NetworkProcess::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<Websi
> {
> #if PLATFORM(COCOA)
>     if (websiteDataTypes.contains(WebsiteDataType::HSTSCache)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             clearHSTSCache(*networkStorageSession, modifiedSince);
>     }
> #endif
> 
>     if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             networkStorageSession->deleteAllCookiesModifiedSince(modifiedSince);
>     }
> 
>     if (websiteDataTypes.contains(WebsiteDataType::Credentials)) {
>-        if (NetworkStorageSession::storageSession(sessionID))
>-            NetworkStorageSession::storageSession(sessionID)->credentialStorage().clearCredentials();
>+        if (WebCore::NetworkStorageSession::storageSession(sessionID))
>+            WebCore::NetworkStorageSession::storageSession(sessionID)->credentialStorage().clearCredentials();
>     }
> 
>     auto clearTasksHandler = WTF::CallbackAggregator::create([this, callbackID] {
>@@ -612,17 +610,17 @@ void NetworkProcess::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<Websi
>         clearDiskCache(modifiedSince, [clearTasksHandler = WTFMove(clearTasksHandler)] { });
> }
> 
>-static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, Function<void ()>&& completionHandler)
>+static void clearDiskCacheEntries(const Vector<WebCore::SecurityOriginData>& origins, Function<void ()>&& completionHandler)
> {
>     if (auto* cache = NetworkProcess::singleton().cache()) {
>-        HashSet<RefPtr<SecurityOrigin>> originsToDelete;
>+        HashSet<RefPtr<WebCore::SecurityOrigin>> originsToDelete;
>         for (auto& origin : origins)
>             originsToDelete.add(origin.securityOrigin());
> 
>         Vector<NetworkCache::Key> cacheKeysToDelete;
>         cache->traverse([cache, completionHandler = WTFMove(completionHandler), originsToDelete = WTFMove(originsToDelete), cacheKeysToDelete = WTFMove(cacheKeysToDelete)](auto* traversalEntry) mutable {
>             if (traversalEntry) {
>-                if (originsToDelete.contains(SecurityOrigin::create(traversalEntry->entry.response().url())))
>+                if (originsToDelete.contains(WebCore::SecurityOrigin::create(traversalEntry->entry.response().url())))
>                     cacheKeysToDelete.append(traversalEntry->entry.key());
>                 return;
>             }
>@@ -637,16 +635,16 @@ static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, Fun
>     RunLoop::main().dispatch(WTFMove(completionHandler));
> }
> 
>-void NetworkProcess::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& originDatas, const Vector<String>& cookieHostNames, const Vector<String>& HSTSCacheHostNames, uint64_t callbackID)
>+void NetworkProcess::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& originDatas, const Vector<String>& cookieHostNames, const Vector<String>& HSTSCacheHostNames, uint64_t callbackID)
> {
>     if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             networkStorageSession->deleteCookiesForHostnames(cookieHostNames);
>     }
> 
> #if PLATFORM(COCOA)
>     if (websiteDataTypes.contains(WebsiteDataType::HSTSCache)) {
>-        if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
>+        if (auto* networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID))
>             deleteHSTSCacheForHostNames(*networkStorageSession, HSTSCacheHostNames);
>     }
> #endif
>@@ -657,14 +655,14 @@ void NetworkProcess::deleteWebsiteDataForOrigins(PAL::SessionID sessionID, Optio
> 
>     if (websiteDataTypes.contains(WebsiteDataType::DOMCache)) {
>         for (auto& originData : originDatas)
>-            CacheStorage::Engine::clearCachesForOrigin(sessionID, SecurityOriginData { originData }, [clearTasksHandler = clearTasksHandler.copyRef()] { });
>+            CacheStorage::Engine::clearCachesForOrigin(sessionID, WebCore::SecurityOriginData { originData }, [clearTasksHandler = clearTasksHandler.copyRef()] { });
>     }
> 
>     if (websiteDataTypes.contains(WebsiteDataType::DiskCache) && !sessionID.isEphemeral())
>         clearDiskCacheEntries(originDatas, [clearTasksHandler = WTFMove(clearTasksHandler)] { });
> }
> 
>-void NetworkProcess::downloadRequest(PAL::SessionID sessionID, DownloadID downloadID, const ResourceRequest& request, const String& suggestedFilename)
>+void NetworkProcess::downloadRequest(PAL::SessionID sessionID, DownloadID downloadID, const WebCore::ResourceRequest& request, const String& suggestedFilename)
> {
>     downloadManager().startDownload(nullptr, sessionID, downloadID, request, suggestedFilename);
> }
>@@ -689,7 +687,7 @@ void NetworkProcess::pendingDownloadCanceled(DownloadID downloadID)
>     downloadProxyConnection()->send(Messages::DownloadProxy::DidCancel({ }), downloadID.downloadID());
> }
> 
>-void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler, const ResourceResponse& response)
>+void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler, const WebCore::ResourceResponse& response)
> {
>     uint64_t destinationID = networkDataTask.pendingDownloadID().downloadID();
>     downloadProxyConnection()->send(Messages::DownloadProxy::DidReceiveResponse(response), destinationID);
>@@ -699,7 +697,7 @@ void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTas
>     // As per https://html.spec.whatwg.org/#as-a-download (step 2), the filename from the Content-Disposition header
>     // should override the suggested filename from the download attribute.
>     String suggestedFilename = response.isAttachmentWithFilename() ? response.suggestedFilename() : networkDataTask.suggestedFilename();
>-    suggestedFilename = MIMETypeRegistry::appendFileExtensionIfNecessary(suggestedFilename, response.mimeType());
>+    suggestedFilename = WebCore::MIMETypeRegistry::appendFileExtensionIfNecessary(suggestedFilename, response.mimeType());
> 
>     downloadProxyConnection()->send(Messages::DownloadProxy::DecideDestinationWithSuggestedFilenameAsync(networkDataTask.pendingDownloadID(), suggestedFilename), destinationID);
> }
>@@ -757,31 +755,31 @@ void NetworkProcess::getNetworkProcessStatistics(uint64_t callbackID)
> 
> void NetworkProcess::setAllowsAnySSLCertificateForWebSocket(bool allows)
> {
>-    DeprecatedGlobalSettings::setAllowsAnySSLCertificate(allows);
>+    WebCore::DeprecatedGlobalSettings::setAllowsAnySSLCertificate(allows);
> }
> 
>-void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, ShouldSample shouldSample)
>+void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, WebCore::ShouldSample shouldSample)
> {
>-    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>+    if (!WebCore::DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>         return;
> 
>-    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessage(webPageID, message, description, ShouldSample::No), 0);
>+    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessage(webPageID, message, description, WebCore::ShouldSample::No), 0);
> }
> 
>-void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, DiagnosticLoggingResultType result, ShouldSample shouldSample)
>+void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result, WebCore::ShouldSample shouldSample)
> {
>-    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>+    if (!WebCore::DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>         return;
> 
>-    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithResult(webPageID, message, description, result, ShouldSample::No), 0);
>+    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithResult(webPageID, message, description, result, WebCore::ShouldSample::No), 0);
> }
> 
>-void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, double value, unsigned significantFigures, ShouldSample shouldSample)
>+void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample shouldSample)
> {
>-    if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>+    if (!WebCore::DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
>         return;
> 
>-    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithValue(webPageID, message, description, value, significantFigures, ShouldSample::No), 0);
>+    parentProcessConnection()->send(Messages::NetworkProcessProxy::LogDiagnosticMessageWithValue(webPageID, message, description, value, significantFigures, WebCore::ShouldSample::No), 0);
> }
> 
> void NetworkProcess::terminate()
>@@ -896,7 +894,7 @@ void NetworkProcess::preconnectTo(const WebCore::URL& url, WebCore::StoredCreden
> {
> #if ENABLE(SERVER_PRECONNECT)
>     NetworkLoadParameters parameters;
>-    parameters.request = ResourceRequest { url };
>+    parameters.request = WebCore::ResourceRequest { url };
>     parameters.sessionID = PAL::SessionID::defaultSessionID();
>     parameters.storedCredentialsPolicy = storedCredentialsPolicy;
>     parameters.shouldPreconnectOnly = PreconnectOnly::Yes;
>@@ -910,37 +908,37 @@ void NetworkProcess::preconnectTo(const WebCore::URL& url, WebCore::StoredCreden
> 
> void NetworkProcess::registerURLSchemeAsSecure(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsSecure(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsSecure(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsBypassingContentSecurityPolicy(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsLocal(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsLocal(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsLocal(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsNoAccess(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsNoAccess(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsNoAccess(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsDisplayIsolated(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsDisplayIsolated(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsDisplayIsolated(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsCORSEnabled(const String& scheme) const
> {
>-    SchemeRegistry::registerURLSchemeAsCORSEnabled(scheme);
>+    WebCore::SchemeRegistry::registerURLSchemeAsCORSEnabled(scheme);
> }
> 
> void NetworkProcess::registerURLSchemeAsCanDisplayOnlyIfCanRequest(const String& scheme) const
> {
>-    SchemeRegistry::registerAsCanDisplayOnlyIfCanRequest(scheme);
>+    WebCore::SchemeRegistry::registerAsCanDisplayOnlyIfCanRequest(scheme);
> }
> 
> void NetworkProcess::didSyncAllCookies()
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp b/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>index e6d679f8fef8bbc5e5beba3d362d197e4f5b9a42..178848457509c98c6e8f2656248e2b8a6ea630b6 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>@@ -29,8 +29,6 @@
> #include <WebCore/BlobRegistryImpl.h>
> #include <wtf/NeverDestroyed.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void NetworkProcessPlatformStrategies::initialize()
>@@ -39,24 +37,24 @@ void NetworkProcessPlatformStrategies::initialize()
>     setPlatformStrategies(&platformStrategies.get());
> }
> 
>-CookiesStrategy* NetworkProcessPlatformStrategies::createCookiesStrategy()
>+WebCore::CookiesStrategy* NetworkProcessPlatformStrategies::createCookiesStrategy()
> {
>     return nullptr;
> }
> 
>-LoaderStrategy* NetworkProcessPlatformStrategies::createLoaderStrategy()
>+WebCore::LoaderStrategy* NetworkProcessPlatformStrategies::createLoaderStrategy()
> {
>     return nullptr;
> }
> 
>-PasteboardStrategy* NetworkProcessPlatformStrategies::createPasteboardStrategy()
>+WebCore::PasteboardStrategy* NetworkProcessPlatformStrategies::createPasteboardStrategy()
> {
>     return nullptr;
> }
> 
>-BlobRegistry* NetworkProcessPlatformStrategies::createBlobRegistry()
>+WebCore::BlobRegistry* NetworkProcessPlatformStrategies::createBlobRegistry()
> {
>-    return new BlobRegistryImpl;
>+    return new WebCore::BlobRegistryImpl;
> }
> 
> }
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>index 198a46f69300d83678d13a6ac2efd17966706c2a..5fef7925076a933b80e0bea49562a6454f29902d 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>@@ -31,8 +31,6 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/SecurityOriginData.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
>@@ -47,10 +45,10 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
>     if (request.httpBody()) {
>         request.httpBody()->encode(encoder);
> 
>-        const Vector<FormDataElement>& elements = request.httpBody()->elements();
>+        const Vector<WebCore::FormDataElement>& elements = request.httpBody()->elements();
>         size_t fileCount = 0;
>         for (size_t i = 0, count = elements.size(); i < count; ++i) {
>-            if (elements[i].m_type == FormDataElement::Type::EncodedFile)
>+            if (elements[i].m_type == WebCore::FormDataElement::Type::EncodedFile)
>                 ++fileCount;
>         }
> 
>@@ -58,8 +56,8 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
>         requestBodySandboxExtensions.allocate(fileCount);
>         size_t extensionIndex = 0;
>         for (size_t i = 0, count = elements.size(); i < count; ++i) {
>-            const FormDataElement& element = elements[i];
>-            if (element.m_type == FormDataElement::Type::EncodedFile) {
>+            const WebCore::FormDataElement& element = elements[i];
>+            if (element.m_type == WebCore::FormDataElement::Type::EncodedFile) {
>                 const String& path = element.m_shouldGenerateFile ? element.m_generatedFilename : element.m_filename;
>                 SandboxExtension::createHandle(path, SandboxExtension::Type::ReadOnly, requestBodySandboxExtensions[extensionIndex++]);
>             }
>@@ -129,7 +127,7 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
>         return false;
> 
>     if (hasHTTPBody) {
>-        RefPtr<FormData> formData = FormData::decode(decoder);
>+        RefPtr<WebCore::FormData> formData = WebCore::FormData::decode(decoder);
>         if (!formData)
>             return false;
>         result.request.setHTTPBody(WTFMove(formData));
>@@ -180,12 +178,12 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
>     if (!decoder.decode(hasSourceOrigin))
>         return false;
>     if (hasSourceOrigin) {
>-        result.sourceOrigin = SecurityOrigin::decode(decoder);
>+        result.sourceOrigin = WebCore::SecurityOrigin::decode(decoder);
>         if (!result.sourceOrigin)
>             return false;
>     }
> 
>-    std::optional<FetchOptions> options;
>+    std::optional<WebCore::FetchOptions> options;
>     decoder >> options;
>     if (!options)
>         return false;
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 87981a77dae9b1ca5819d35e0df49ca509f6274e..54179d984b3caeaca8f4481fb79af29a5ad2c22b 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -65,8 +65,6 @@
> #include <WebCore/PreviewLoader.h>
> #endif
> 
>-using namespace WebCore;
>-
> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkResourceLoader::" fmt, this, ##__VA_ARGS__)
> #define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkResourceLoader::" fmt, this, ##__VA_ARGS__)
> 
>@@ -78,13 +76,13 @@ struct NetworkResourceLoader::SynchronousLoadData {
>     {
>         ASSERT(delayedReply);
>     }
>-    ResourceRequest currentRequest;
>+    WebCore::ResourceRequest currentRequest;
>     Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply delayedReply;
>-    ResourceResponse response;
>-    ResourceError error;
>+    WebCore::ResourceResponse response;
>+    WebCore::ResourceError error;
> };
> 
>-static void sendReplyToSynchronousRequest(NetworkResourceLoader::SynchronousLoadData& data, const SharedBuffer* buffer)
>+static void sendReplyToSynchronousRequest(NetworkResourceLoader::SynchronousLoadData& data, const WebCore::SharedBuffer* buffer)
> {
>     ASSERT(data.delayedReply);
>     ASSERT(!data.response.isNull() || !data.error.isNull());
>@@ -101,28 +99,28 @@ NetworkResourceLoader::NetworkResourceLoader(NetworkResourceLoadParameters&& par
>     : m_parameters { WTFMove(parameters) }
>     , m_connection { connection }
>     , m_defersLoading { parameters.defersLoading }
>-    , m_isAllowedToAskUserForCredentials { m_parameters.clientCredentialPolicy == ClientCredentialPolicy::MayAskClientForCredentials }
>+    , m_isAllowedToAskUserForCredentials { m_parameters.clientCredentialPolicy == WebCore::ClientCredentialPolicy::MayAskClientForCredentials }
>     , m_bufferingTimer { *this, &NetworkResourceLoader::bufferingTimerFired }
>     , m_cache { sessionID().isEphemeral() ? nullptr : NetworkProcess::singleton().cache() }
> {
>     ASSERT(RunLoop::isMain());
>     // FIXME: This is necessary because of the existence of EmptyFrameLoaderClient in WebCore.
>     //        Once bug 116233 is resolved, this ASSERT can just be "m_webPageID && m_webFrameID"
>-    ASSERT((m_parameters.webPageID && m_parameters.webFrameID) || m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials);
>+    ASSERT((m_parameters.webPageID && m_parameters.webFrameID) || m_parameters.clientCredentialPolicy == WebCore::ClientCredentialPolicy::CannotAskClientForCredentials);
> 
>     if (originalRequest().httpBody()) {
>         for (const auto& element : originalRequest().httpBody()->elements()) {
>-            if (element.m_type == FormDataElement::Type::EncodedBlob)
>+            if (element.m_type == WebCore::FormDataElement::Type::EncodedBlob)
>                 m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, element.m_url));
>         }
>     }
> 
>     if (synchronousReply || parameters.shouldRestrictHTTPResponseAccess) {
>-        m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, HTTPHeaderMap { m_parameters.originalRequestHeaders }, URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), shouldCaptureExtraNetworkLoadMetrics());
>+        m_networkLoadChecker = std::make_unique<NetworkLoadChecker>(WebCore::FetchOptions { m_parameters.options }, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WebCore::HTTPHeaderMap { m_parameters.originalRequestHeaders }, WebCore::URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, originalRequest().httpReferrer(), shouldCaptureExtraNetworkLoadMetrics());
>         if (m_parameters.cspResponseHeaders)
>-            m_networkLoadChecker->setCSPResponseHeaders(ContentSecurityPolicyResponseHeaders { m_parameters.cspResponseHeaders.value() });
>+            m_networkLoadChecker->setCSPResponseHeaders(WebCore::ContentSecurityPolicyResponseHeaders { m_parameters.cspResponseHeaders.value() });
> #if ENABLE(CONTENT_EXTENSIONS)
>-        m_networkLoadChecker->setContentExtensionController(URL { m_parameters.mainDocumentURL }, m_parameters.userContentControllerIdentifier);
>+        m_networkLoadChecker->setContentExtensionController(WebCore::URL { m_parameters.mainDocumentURL }, m_parameters.userContentControllerIdentifier);
> #endif
>     }
>     if (synchronousReply)
>@@ -136,7 +134,7 @@ NetworkResourceLoader::~NetworkResourceLoader()
>     ASSERT(!isSynchronous() || !m_synchronousLoadData->delayedReply);
> }
> 
>-bool NetworkResourceLoader::canUseCache(const ResourceRequest& request) const
>+bool NetworkResourceLoader::canUseCache(const WebCore::ResourceRequest& request) const
> {
>     if (!m_cache)
>         return false;
>@@ -150,7 +148,7 @@ bool NetworkResourceLoader::canUseCache(const ResourceRequest& request) const
>     return true;
> }
> 
>-bool NetworkResourceLoader::canUseCachedRedirect(const ResourceRequest& request) const
>+bool NetworkResourceLoader::canUseCachedRedirect(const WebCore::ResourceRequest& request) const
> {
>     if (!canUseCache(request))
>         return false;
>@@ -183,7 +181,7 @@ void NetworkResourceLoader::start()
>     m_wasStarted = true;
> 
>     if (m_networkLoadChecker) {
>-        m_networkLoadChecker->check(ResourceRequest { originalRequest() }, this, [this] (auto&& result) {
>+        m_networkLoadChecker->check(WebCore::ResourceRequest { originalRequest() }, this, [this] (auto&& result) {
>             if (!result.has_value()) {
>                 if (!result.error().isCancellation())
>                     this->didFailLoading(result.error());
>@@ -206,15 +204,15 @@ void NetworkResourceLoader::start()
>         return;
>     }
> 
>-    startNetworkLoad(ResourceRequest { originalRequest() }, FirstLoad::Yes);
>+    startNetworkLoad(WebCore::ResourceRequest { originalRequest() }, FirstLoad::Yes);
> }
> 
>-void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request)
>+void NetworkResourceLoader::retrieveCacheEntry(const WebCore::ResourceRequest& request)
> {
>     ASSERT(canUseCache(request));
> 
>     RefPtr<NetworkResourceLoader> loader(this);
>-    m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = ResourceRequest { request }](auto entry, auto info) mutable {
>+    m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = WebCore::ResourceRequest { request }](auto entry, auto info) mutable {
>         if (loader->hasOneRef()) {
>             // The loader has been aborted and is only held alive by this lambda.
>             return;
>@@ -247,7 +245,7 @@ void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request)
>     });
> }
> 
>-void NetworkResourceLoader::startNetworkLoad(ResourceRequest&& request, FirstLoad load)
>+void NetworkResourceLoader::startNetworkLoad(WebCore::ResourceRequest&& request, FirstLoad load)
> {
>     if (load == FirstLoad::Yes) {
>         RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
>@@ -255,10 +253,10 @@ void NetworkResourceLoader::startNetworkLoad(ResourceRequest&& request, FirstLoa
>         consumeSandboxExtensions();
> 
>         if (isSynchronous() || m_parameters.maximumBufferingTime > 0_s)
>-            m_bufferedData = SharedBuffer::create();
>+            m_bufferedData = WebCore::SharedBuffer::create();
> 
>         if (canUseCache(request))
>-            m_bufferedDataForCache = SharedBuffer::create();
>+            m_bufferedDataForCache = WebCore::SharedBuffer::create();
>     }
> 
>     NetworkLoadParameters parameters = m_parameters;
>@@ -335,7 +333,7 @@ void NetworkResourceLoader::cleanup(LoadResult result)
>     m_connection->didCleanupResourceLoader(*this);
> }
> 
>-void NetworkResourceLoader::convertToDownload(DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
>+void NetworkResourceLoader::convertToDownload(DownloadID downloadID, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
> {
>     // This can happen if the resource came from the disk cache.
>     if (!m_networkLoad) {
>@@ -366,19 +364,19 @@ void NetworkResourceLoader::abort()
>     cleanup(LoadResult::Cancel);
> }
> 
>-bool NetworkResourceLoader::shouldInterruptLoadForXFrameOptions(const String& xFrameOptions, const URL& url)
>+bool NetworkResourceLoader::shouldInterruptLoadForXFrameOptions(const String& xFrameOptions, const WebCore::URL& url)
> {
>     if (isMainFrameLoad())
>         return false;
> 
>-    switch (parseXFrameOptionsHeader(xFrameOptions)) {
>-    case XFrameOptionsNone:
>-    case XFrameOptionsAllowAll:
>+    switch (WebCore::parseXFrameOptionsHeader(xFrameOptions)) {
>+    case WebCore::XFrameOptionsNone:
>+    case WebCore::XFrameOptionsAllowAll:
>         return false;
>-    case XFrameOptionsDeny:
>+    case WebCore::XFrameOptionsDeny:
>         return true;
>-    case XFrameOptionsSameOrigin: {
>-        auto origin = SecurityOrigin::create(url);
>+    case WebCore::XFrameOptionsSameOrigin: {
>+        auto origin = WebCore::SecurityOrigin::create(url);
>         auto topFrameOrigin = m_parameters.frameAncestorOrigins.last();
>         if (!origin->isSameSchemeHostPort(*topFrameOrigin))
>             return true;
>@@ -388,12 +386,12 @@ bool NetworkResourceLoader::shouldInterruptLoadForXFrameOptions(const String& xF
>         }
>         return false;
>     }
>-    case XFrameOptionsConflict: {
>+    case WebCore::XFrameOptionsConflict: {
>         String errorMessage = "Multiple 'X-Frame-Options' headers with conflicting values ('" + xFrameOptions + "') encountered when loading '" + url.stringCenterEllipsizedToLength() + "'. Falling back to 'DENY'.";
>         send(Messages::WebPage::AddConsoleMessage { m_parameters.webFrameID,  MessageSource::JS, MessageLevel::Error, errorMessage, identifier() }, m_parameters.webPageID);
>         return true;
>     }
>-    case XFrameOptionsInvalid: {
>+    case WebCore::XFrameOptionsInvalid: {
>         String errorMessage = "Invalid 'X-Frame-Options' header encountered when loading '" + url.stringCenterEllipsizedToLength() + "': '" + xFrameOptions + "' is not a recognized directive. The header will be ignored.";
>         send(Messages::WebPage::AddConsoleMessage { m_parameters.webFrameID,  MessageSource::JS, MessageLevel::Error, errorMessage, identifier() }, m_parameters.webPageID);
>         return false;
>@@ -403,7 +401,7 @@ bool NetworkResourceLoader::shouldInterruptLoadForXFrameOptions(const String& xF
>     return false;
> }
> 
>-bool NetworkResourceLoader::shouldInterruptLoadForCSPFrameAncestorsOrXFrameOptions(const ResourceResponse& response)
>+bool NetworkResourceLoader::shouldInterruptLoadForCSPFrameAncestorsOrXFrameOptions(const WebCore::ResourceResponse& response)
> {
>     ASSERT(isMainResource());
> 
>@@ -413,11 +411,11 @@ bool NetworkResourceLoader::shouldInterruptLoadForCSPFrameAncestorsOrXFrameOptio
> #endif
> 
>     auto url = response.url();
>-    ContentSecurityPolicy contentSecurityPolicy { URL { url }, this };
>-    contentSecurityPolicy.didReceiveHeaders(ContentSecurityPolicyResponseHeaders { response }, originalRequest().httpReferrer());
>+    WebCore::ContentSecurityPolicy contentSecurityPolicy { WebCore::URL { url }, this };
>+    contentSecurityPolicy.didReceiveHeaders(WebCore::ContentSecurityPolicyResponseHeaders { response }, originalRequest().httpReferrer());
>     if (!contentSecurityPolicy.allowFrameAncestors(m_parameters.frameAncestorOrigins, url))
>         return true;
>-    String xFrameOptions = m_response.httpHeaderField(HTTPHeaderName::XFrameOptions);
>+    String xFrameOptions = m_response.httpHeaderField(WebCore::HTTPHeaderName::XFrameOptions);
>     if (!xFrameOptions.isNull() && shouldInterruptLoadForXFrameOptions(xFrameOptions, response.url())) {
>         String errorMessage = "Refused to display '" + response.url().stringCenterEllipsizedToLength() + "' in a frame because it set 'X-Frame-Options' to '" + xFrameOptions + "'.";
>         send(Messages::WebPage::AddConsoleMessage { m_parameters.webFrameID,  MessageSource::Security, MessageLevel::Error, errorMessage, identifier() }, m_parameters.webPageID);
>@@ -426,7 +424,7 @@ bool NetworkResourceLoader::shouldInterruptLoadForCSPFrameAncestorsOrXFrameOptio
>     return false;
> }
> 
>-auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
>+auto NetworkResourceLoader::didReceiveResponse(WebCore::ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
> {
>     RELEASE_LOG_IF_ALLOWED("didReceiveResponse: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", httpStatusCode = %d, length = %" PRId64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, receivedResponse.httpStatusCode(), receivedResponse.expectedContentLength());
> 
>@@ -474,7 +472,7 @@ auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedRespon
>         }
>     }
> 
>-    auto response = sanitizeResponseIfPossible(ResourceResponse { m_response }, ResourceResponse::SanitizationType::CrossOriginSafe);
>+    auto response = sanitizeResponseIfPossible(WebCore::ResourceResponse { m_response }, WebCore::ResourceResponse::SanitizationType::CrossOriginSafe);
>     if (isSynchronous()) {
>         m_synchronousLoadData->response = WTFMove(response);
>         return ShouldContinueDidReceiveResponse::Yes;
>@@ -487,7 +485,7 @@ auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedRespon
>     return willWaitForContinueDidReceiveResponse ? ShouldContinueDidReceiveResponse::No : ShouldContinueDidReceiveResponse::Yes;
> }
> 
>-void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
>+void NetworkResourceLoader::didReceiveBuffer(Ref<WebCore::SharedBuffer>&& buffer, int reportedEncodedDataLength)
> {
>     if (!m_numBytesReceived) {
>         RELEASE_LOG_IF_ALLOWED("didReceiveBuffer: Started receiving data (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier);
>@@ -517,7 +515,7 @@ void NetworkResourceLoader::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int rep
>     sendBuffer(buffer, encodedDataLength);
> }
> 
>-void NetworkResourceLoader::didFinishLoading(const NetworkLoadMetrics& networkLoadMetrics)
>+void NetworkResourceLoader::didFinishLoading(const WebCore::NetworkLoadMetrics& networkLoadMetrics)
> {
>     RELEASE_LOG_IF_ALLOWED("didFinishLoading: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", length = %zd)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, m_numBytesReceived);
> 
>@@ -552,7 +550,7 @@ void NetworkResourceLoader::didFinishLoading(const NetworkLoadMetrics& networkLo
>     cleanup(LoadResult::Success);
> }
> 
>-void NetworkResourceLoader::didFailLoading(const ResourceError& error)
>+void NetworkResourceLoader::didFailLoading(const WebCore::ResourceError& error)
> {
>     RELEASE_LOG_IF_ALLOWED("didFailLoading: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isTimeout = %d, isCancellation = %d, isAccessControl = %d, errCode = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, error.isTimeout(), error.isCancellation(), error.isAccessControl(), error.errorCode());
> 
>@@ -577,11 +575,11 @@ void NetworkResourceLoader::didBlockAuthenticationChallenge()
>     send(Messages::WebResourceLoader::DidBlockAuthenticationChallenge());
> }
> 
>-void NetworkResourceLoader::willSendRedirectedRequest(ResourceRequest&& request, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
>+void NetworkResourceLoader::willSendRedirectedRequest(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse)
> {
>     ++m_redirectCount;
> 
>-    if (redirectResponse.source() == ResourceResponse::Source::Network && canUseCachedRedirect(request))
>+    if (redirectResponse.source() == WebCore::ResourceResponse::Source::Network && canUseCachedRedirect(request))
>         m_cache->storeRedirect(request, redirectResponse, redirectRequest);
> 
>     if (m_networkLoadChecker) {
>@@ -595,7 +593,7 @@ void NetworkResourceLoader::willSendRedirectedRequest(ResourceRequest&& request,
>                 return;
>             }
> 
>-            if (m_parameters.options.redirect == FetchOptions::Redirect::Manual) {
>+            if (m_parameters.options.redirect == WebCore::FetchOptions::Redirect::Manual) {
>                 this->didFinishWithRedirectResponse(WTFMove(result->redirectResponse));
>                 return;
>             }
>@@ -621,16 +619,16 @@ void NetworkResourceLoader::willSendRedirectedRequest(ResourceRequest&& request,
>     continueWillSendRedirectedRequest(WTFMove(request), WTFMove(redirectRequest), WTFMove(redirectResponse));
> }
> 
>-void NetworkResourceLoader::continueWillSendRedirectedRequest(ResourceRequest&& request, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
>+void NetworkResourceLoader::continueWillSendRedirectedRequest(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse)
> {
>     ASSERT(!isSynchronous());
> 
>-    send(Messages::WebResourceLoader::WillSendRequest(redirectRequest, sanitizeResponseIfPossible(WTFMove(redirectResponse), ResourceResponse::SanitizationType::Redirection)));
>+    send(Messages::WebResourceLoader::WillSendRequest(redirectRequest, sanitizeResponseIfPossible(WTFMove(redirectResponse), WebCore::ResourceResponse::SanitizationType::Redirection)));
> }
> 
>-void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& redirectResponse)
>+void NetworkResourceLoader::didFinishWithRedirectResponse(WebCore::ResourceResponse&& redirectResponse)
> {
>-    redirectResponse.setType(ResourceResponse::Type::Opaqueredirect);
>+    redirectResponse.setType(WebCore::ResourceResponse::Type::Opaqueredirect);
>     didReceiveResponse(WTFMove(redirectResponse));
> 
>     WebCore::NetworkLoadMetrics networkLoadMetrics;
>@@ -642,7 +640,7 @@ void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& red
>     cleanup(LoadResult::Success);
> }
> 
>-ResourceResponse NetworkResourceLoader::sanitizeResponseIfPossible(ResourceResponse&& response, ResourceResponse::SanitizationType type)
>+WebCore::ResourceResponse NetworkResourceLoader::sanitizeResponseIfPossible(WebCore::ResourceResponse&& response, WebCore::ResourceResponse::SanitizationType type)
> {
>     if (m_parameters.shouldRestrictHTTPResponseAccess)
>         response.sanitizeHTTPHeaderFields(type);
>@@ -660,7 +658,7 @@ void NetworkResourceLoader::restartNetworkLoad(WebCore::ResourceRequest&& newReq
>     startNetworkLoad(WTFMove(newRequest), FirstLoad::No);
> }
> 
>-void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest, bool isAllowedToAskUserForCredentials)
>+void NetworkResourceLoader::continueWillSendRequest(WebCore::ResourceRequest&& newRequest, bool isAllowedToAskUserForCredentials)
> {
>     if (m_shouldRestartLoad) {
>         m_shouldRestartLoad = false;
>@@ -671,7 +669,7 @@ void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest
>     if (m_networkLoadChecker) {
>         // FIXME: We should be doing this check when receiving the redirection and not allow about protocol as per fetch spec.
>         if (!newRequest.url().protocolIsInHTTPFamily() && !newRequest.url().isBlankURL() && m_redirectCount) {
>-            didFailLoading(ResourceError { String { }, 0, newRequest.url(), "Redirection to URL with a scheme that is not HTTP(S)"_s, ResourceError::Type::AccessControl });
>+            didFailLoading(WebCore::ResourceError { String { }, 0, newRequest.url(), "Redirection to URL with a scheme that is not HTTP(S)"_s, WebCore::ResourceError::Type::AccessControl });
>             return;
>         }
>     }
>@@ -743,13 +741,13 @@ void NetworkResourceLoader::bufferingTimerFired()
>     IPC::SharedBufferDataReference dataReference(m_bufferedData.get());
>     size_t encodedLength = m_bufferedDataEncodedDataLength;
> 
>-    m_bufferedData = SharedBuffer::create();
>+    m_bufferedData = WebCore::SharedBuffer::create();
>     m_bufferedDataEncodedDataLength = 0;
> 
>     send(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedLength));
> }
> 
>-void NetworkResourceLoader::sendBuffer(SharedBuffer& buffer, size_t encodedDataLength)
>+void NetworkResourceLoader::sendBuffer(WebCore::SharedBuffer& buffer, size_t encodedDataLength)
> {
>     ASSERT(!isSynchronous());
> 
>@@ -790,7 +788,7 @@ void NetworkResourceLoader::didRetrieveCacheEntry(std::unique_ptr<NetworkCache::
>         }
>     }
> 
>-    response = sanitizeResponseIfPossible(WTFMove(response), ResourceResponse::SanitizationType::CrossOriginSafe);
>+    response = sanitizeResponseIfPossible(WTFMove(response), WebCore::ResourceResponse::SanitizationType::CrossOriginSafe);
>     if (isSynchronous()) {
>         m_synchronousLoadData->response = WTFMove(response);
>         sendReplyToSynchronousRequest(*m_synchronousLoadData, entry->buffer());
>@@ -872,14 +870,14 @@ void NetworkResourceLoader::validateCacheEntry(std::unique_ptr<NetworkCache::Ent
> 
>     // If the request is already conditional then the revalidation was not triggered by the disk cache
>     // and we should not overwrite the existing conditional headers.
>-    ResourceRequest revalidationRequest = originalRequest();
>+    WebCore::ResourceRequest revalidationRequest = originalRequest();
>     if (!revalidationRequest.isConditional()) {
>-        String eTag = entry->response().httpHeaderField(HTTPHeaderName::ETag);
>-        String lastModified = entry->response().httpHeaderField(HTTPHeaderName::LastModified);
>+        String eTag = entry->response().httpHeaderField(WebCore::HTTPHeaderName::ETag);
>+        String lastModified = entry->response().httpHeaderField(WebCore::HTTPHeaderName::LastModified);
>         if (!eTag.isEmpty())
>-            revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
>+            revalidationRequest.setHTTPHeaderField(WebCore::HTTPHeaderName::IfNoneMatch, eTag);
>         if (!lastModified.isEmpty())
>-            revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
>+            revalidationRequest.setHTTPHeaderField(WebCore::HTTPHeaderName::IfModifiedSince, lastModified);
>     }
> 
>     m_cacheEntryForValidation = WTFMove(entry);
>@@ -887,7 +885,7 @@ void NetworkResourceLoader::validateCacheEntry(std::unique_ptr<NetworkCache::Ent
>     startNetworkLoad(WTFMove(revalidationRequest), FirstLoad::Yes);
> }
> 
>-void NetworkResourceLoader::dispatchWillSendRequestForCacheEntry(ResourceRequest&& request, std::unique_ptr<NetworkCache::Entry>&& entry)
>+void NetworkResourceLoader::dispatchWillSendRequestForCacheEntry(WebCore::ResourceRequest&& request, std::unique_ptr<NetworkCache::Entry>&& entry)
> {
>     ASSERT(entry->redirectRequest());
>     ASSERT(!m_isWaitingContinueWillSendRequestForCachedRedirect);
>@@ -895,7 +893,7 @@ void NetworkResourceLoader::dispatchWillSendRequestForCacheEntry(ResourceRequest
>     LOG(NetworkCache, "(NetworkProcess) Executing cached redirect");
> 
>     m_isWaitingContinueWillSendRequestForCachedRedirect = true;
>-    willSendRedirectedRequest(WTFMove(request), ResourceRequest { *entry->redirectRequest() }, ResourceResponse { entry->response() });
>+    willSendRedirectedRequest(WTFMove(request), WebCore::ResourceRequest { *entry->redirectRequest() }, WebCore::ResourceResponse { entry->response() });
> }
> 
> IPC::Connection* NetworkResourceLoader::messageSenderConnection()
>@@ -971,10 +969,10 @@ void NetworkResourceLoader::logCookieInformation() const
>     auto networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID());
>     ASSERT(networkStorageSession);
> 
>-    logCookieInformation("NetworkResourceLoader", reinterpret_cast<const void*>(this), *networkStorageSession, originalRequest().firstPartyForCookies(), SameSiteInfo::create(originalRequest()), originalRequest().url(), originalRequest().httpReferrer(), frameID(), pageID(), identifier());
>+    logCookieInformation("NetworkResourceLoader", reinterpret_cast<const void*>(this), *networkStorageSession, originalRequest().firstPartyForCookies(), WebCore::SameSiteInfo::create(originalRequest()), originalRequest().url(), originalRequest().httpReferrer(), frameID(), pageID(), identifier());
> }
> 
>-static void logBlockedCookieInformation(const String& label, const void* loggedObject, const WebCore::NetworkStorageSession& networkStorageSession, const WebCore::URL& firstParty, const SameSiteInfo& sameSiteInfo, const WebCore::URL& url, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier)
>+static void logBlockedCookieInformation(const String& label, const void* loggedObject, const WebCore::NetworkStorageSession& networkStorageSession, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier)
> {
>     ASSERT(NetworkResourceLoader::shouldLogCookieInformation());
> 
>@@ -1062,7 +1060,7 @@ static void logCookieInformationInternal(const String& label, const void* logged
> #undef LOCAL_LOG_IF_ALLOWED
> }
> 
>-void NetworkResourceLoader::logCookieInformation(const String& label, const void* loggedObject, const NetworkStorageSession& networkStorageSession, const URL& firstParty, const SameSiteInfo& sameSiteInfo, const URL& url, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier)
>+void NetworkResourceLoader::logCookieInformation(const String& label, const void* loggedObject, const WebCore::NetworkStorageSession& networkStorageSession, const WebCore::URL& firstParty, const WebCore::SameSiteInfo& sameSiteInfo, const WebCore::URL& url, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier)
> {
>     ASSERT(shouldLogCookieInformation());
> 
>@@ -1078,7 +1076,7 @@ void NetworkResourceLoader::addConsoleMessage(MessageSource messageSource, Messa
>     send(Messages::WebPage::AddConsoleMessage { m_parameters.webFrameID,  messageSource, messageLevel, message, identifier() }, m_parameters.webPageID);
> }
> 
>-void NetworkResourceLoader::sendCSPViolationReport(URL&& reportURL, Ref<FormData>&& report)
>+void NetworkResourceLoader::sendCSPViolationReport(WebCore::URL&& reportURL, Ref<WebCore::FormData>&& report)
> {
>     send(Messages::WebPage::SendCSPViolationReport { m_parameters.webFrameID, WTFMove(reportURL), IPC::FormDataReference { WTFMove(report) } }, m_parameters.webPageID);
> }
>@@ -1123,3 +1121,6 @@ void NetworkResourceLoader::logSlowCacheRetrieveIfNeeded(const NetworkCache::Cac
> }
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>+#undef RELEASE_LOG_ERROR_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/NetworkSession.cpp b/Source/WebKit/NetworkProcess/NetworkSession.cpp
>index de8186ca502c66780a7a596e24573d5cfcbcaaad..fc3e1ab1c72282eb3ece706f87e338921bb5309e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSession.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSession.cpp
>@@ -41,9 +41,6 @@
> #include "NetworkSessionCurl.h"
> #endif
> 
>-
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> Ref<NetworkSession> NetworkSession::create(NetworkSessionCreationParameters&& parameters)
>@@ -59,9 +56,9 @@ Ref<NetworkSession> NetworkSession::create(NetworkSessionCreationParameters&& pa
> #endif
> }
> 
>-NetworkStorageSession& NetworkSession::networkStorageSession() const
>+WebCore::NetworkStorageSession& NetworkSession::networkStorageSession() const
> {
>-    auto* storageSession = NetworkStorageSession::storageSession(m_sessionID);
>+    auto* storageSession = WebCore::NetworkStorageSession::storageSession(m_sessionID);
>     RELEASE_ASSERT(storageSession);
>     return *storageSession;
> }
>diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>index 8a77e46be367b34e5470fe4920c4eb2f8a8fffe4..530549eaad03df598aff50169ee4cdf8a552dc23 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>@@ -32,19 +32,17 @@
> #include <WebCore/SocketStreamError.h>
> #include <WebCore/SocketStreamHandleImpl.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
>-Ref<NetworkSocketStream> NetworkSocketStream::create(WebCore::URL&& url, PAL::SessionID sessionID, const String& credentialPartition, uint64_t identifier, IPC::Connection& connection, SourceApplicationAuditToken&& auditData)
>+Ref<NetworkSocketStream> NetworkSocketStream::create(WebCore::URL&& url, PAL::SessionID sessionID, const String& credentialPartition, uint64_t identifier, IPC::Connection& connection, WebCore::SourceApplicationAuditToken&& auditData)
> {
>     return adoptRef(*new NetworkSocketStream(WTFMove(url), sessionID, credentialPartition, identifier, connection, WTFMove(auditData)));
> }
> 
>-NetworkSocketStream::NetworkSocketStream(URL&& url, PAL::SessionID sessionID, const String& credentialPartition, uint64_t identifier, IPC::Connection& connection, SourceApplicationAuditToken&& auditData)
>+NetworkSocketStream::NetworkSocketStream(WebCore::URL&& url, PAL::SessionID sessionID, const String& credentialPartition, uint64_t identifier, IPC::Connection& connection, WebCore::SourceApplicationAuditToken&& auditData)
>     : m_identifier(identifier)
>     , m_connection(connection)
>-    , m_impl(SocketStreamHandleImpl::create(url, *this, sessionID, credentialPartition, WTFMove(auditData)))
>+    , m_impl(WebCore::SocketStreamHandleImpl::create(url, *this, sessionID, credentialPartition, WTFMove(auditData)))
> {
> }
> 
>@@ -55,7 +53,7 @@ void NetworkSocketStream::sendData(const IPC::DataReference& data, uint64_t iden
>     });
> }
> 
>-void NetworkSocketStream::sendHandshake(const IPC::DataReference& data, const std::optional<CookieRequestHeaderFieldProxy>& headerFieldProxy, uint64_t identifier)
>+void NetworkSocketStream::sendHandshake(const IPC::DataReference& data, const std::optional<WebCore::CookieRequestHeaderFieldProxy>& headerFieldProxy, uint64_t identifier)
> {
>     m_impl->platformSendHandshake(data.data(), data.size(), headerFieldProxy, [this, protectedThis = makeRef(*this), identifier] (bool success, bool didAccessSecureCookies) {
>         send(Messages::WebSocketStream::DidSendHandshake(identifier, success, didAccessSecureCookies));
>@@ -72,19 +70,19 @@ NetworkSocketStream::~NetworkSocketStream()
>     close();
> }
> 
>-void NetworkSocketStream::didOpenSocketStream(SocketStreamHandle& handle)
>+void NetworkSocketStream::didOpenSocketStream(WebCore::SocketStreamHandle& handle)
> {
>     ASSERT_UNUSED(handle, &handle == m_impl.ptr());
>     send(Messages::WebSocketStream::DidOpenSocketStream());
> }
> 
>-void NetworkSocketStream::didCloseSocketStream(SocketStreamHandle& handle)
>+void NetworkSocketStream::didCloseSocketStream(WebCore::SocketStreamHandle& handle)
> {
>     ASSERT_UNUSED(handle, &handle == m_impl.ptr());
>     send(Messages::WebSocketStream::DidCloseSocketStream());
> }
> 
>-void NetworkSocketStream::didReceiveSocketStreamData(SocketStreamHandle& handle, const char* data, size_t length)
>+void NetworkSocketStream::didReceiveSocketStreamData(WebCore::SocketStreamHandle& handle, const char* data, size_t length)
> {
>     ASSERT_UNUSED(handle, &handle == m_impl.ptr());
>     send(Messages::WebSocketStream::DidReceiveSocketStreamData(IPC::DataReference(reinterpret_cast<const uint8_t*>(data), length)));
>@@ -96,13 +94,13 @@ void NetworkSocketStream::didFailToReceiveSocketStreamData(WebCore::SocketStream
>     send(Messages::WebSocketStream::DidFailToReceiveSocketStreamData());
> }
> 
>-void NetworkSocketStream::didUpdateBufferedAmount(SocketStreamHandle& handle, size_t amount)
>+void NetworkSocketStream::didUpdateBufferedAmount(WebCore::SocketStreamHandle& handle, size_t amount)
> {
>     ASSERT_UNUSED(handle, &handle == m_impl.ptr());
>     send(Messages::WebSocketStream::DidUpdateBufferedAmount(amount));
> }
> 
>-void NetworkSocketStream::didFailSocketStream(SocketStreamHandle& handle, const SocketStreamError& error)
>+void NetworkSocketStream::didFailSocketStream(WebCore::SocketStreamHandle& handle, const WebCore::SocketStreamError& error)
> {
>     ASSERT_UNUSED(handle, &handle == m_impl.ptr());
>     send(Messages::WebSocketStream::DidFailSocketStream(error));
>diff --git a/Source/WebKit/NetworkProcess/PingLoad.cpp b/Source/WebKit/NetworkProcess/PingLoad.cpp
>index 5ab7bb5a23b299594728176afb083d344abec49c..c4c7e21d55b58b0c469eddaa86b109d220b2a3bc 100644
>--- a/Source/WebKit/NetworkProcess/PingLoad.cpp
>+++ b/Source/WebKit/NetworkProcess/PingLoad.cpp
>@@ -36,13 +36,11 @@
> 
> namespace WebKit {
> 
>-using namespace WebCore;
>-
>-PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, WTF::CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler)
>+PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, WTF::CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&& completionHandler)
>     : m_parameters(WTFMove(parameters))
>     , m_completionHandler(WTFMove(completionHandler))
>     , m_timeoutTimer(*this, &PingLoad::timeoutTimerFired)
>-    , m_networkLoadChecker(makeUniqueRef<NetworkLoadChecker>(FetchOptions { m_parameters.options}, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WTFMove(m_parameters.originalRequestHeaders), URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, m_parameters.request.httpReferrer()))
>+    , m_networkLoadChecker(makeUniqueRef<NetworkLoadChecker>(WebCore::FetchOptions { m_parameters.options}, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WTFMove(m_parameters.originalRequestHeaders), WebCore::URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, m_parameters.request.httpReferrer()))
> {
>     m_networkLoadChecker->enableContentExtensionsCheck();
>     if (m_parameters.cspResponseHeaders)
>@@ -55,7 +53,7 @@ PingLoad::PingLoad(NetworkResourceLoadParameters&& parameters, WTF::CompletionHa
>     // Set a very generous timeout, just in case.
>     m_timeoutTimer.startOneShot(60000_s);
> 
>-    m_networkLoadChecker->check(ResourceRequest { m_parameters.request }, nullptr, [this] (auto&& result) {
>+    m_networkLoadChecker->check(WebCore::ResourceRequest { m_parameters.request }, nullptr, [this] (auto&& result) {
>         if (!result.has_value()) {
>             this->didFinish(result.error());
>             return;
>@@ -73,13 +71,13 @@ PingLoad::~PingLoad()
>     }
> }
> 
>-void PingLoad::didFinish(const ResourceError& error, const ResourceResponse& response)
>+void PingLoad::didFinish(const WebCore::ResourceError& error, const WebCore::ResourceResponse& response)
> {
>     m_completionHandler(error, response);
>     delete this;
> }
> 
>-void PingLoad::loadRequest(ResourceRequest&& request)
>+void PingLoad::loadRequest(WebCore::ResourceRequest&& request)
> {
>     RELEASE_LOG_IF_ALLOWED("startNetworkLoad");
>     if (auto* networkSession = SessionTracker::networkSession(m_parameters.sessionID)) {
>@@ -91,9 +89,9 @@ void PingLoad::loadRequest(ResourceRequest&& request)
>         ASSERT_NOT_REACHED();
> }
> 
>-void PingLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse, ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
>+void PingLoad::willPerformHTTPRedirection(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
> {
>-    m_networkLoadChecker->checkRedirection(ResourceRequest { }, WTFMove(request), WTFMove(redirectResponse), nullptr, [this, completionHandler = WTFMove(completionHandler)] (auto&& result) mutable {
>+    m_networkLoadChecker->checkRedirection(WebCore::ResourceRequest { }, WTFMove(request), WTFMove(redirectResponse), nullptr, [this, completionHandler = WTFMove(completionHandler)] (auto&& result) mutable {
>         if (!result.has_value()) {
>             completionHandler({ });
>             this->didFinish(result.error());
>@@ -103,7 +101,7 @@ void PingLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse, R
>         m_networkLoadChecker->prepareRedirectedRequest(request);
> 
>         if (!request.url().protocolIsInHTTPFamily()) {
>-            this->didFinish(ResourceError { String { }, 0, request.url(), "Redirection to URL with a scheme that is not HTTP(S)"_s, ResourceError::Type::AccessControl });
>+            this->didFinish(WebCore::ResourceError { String { }, 0, request.url(), "Redirection to URL with a scheme that is not HTTP(S)"_s, WebCore::ResourceError::Type::AccessControl });
>             return;
>         }
> 
>@@ -111,33 +109,33 @@ void PingLoad::willPerformHTTPRedirection(ResourceResponse&& redirectResponse, R
>     });
> }
> 
>-void PingLoad::didReceiveChallenge(AuthenticationChallenge&&, ChallengeCompletionHandler&& completionHandler)
>+void PingLoad::didReceiveChallenge(WebCore::AuthenticationChallenge&&, ChallengeCompletionHandler&& completionHandler)
> {
>     RELEASE_LOG_IF_ALLOWED("didReceiveChallenge");
>     auto weakThis = makeWeakPtr(*this);
>     completionHandler(AuthenticationChallengeDisposition::Cancel, { });
>     if (!weakThis)
>         return;
>-    didFinish(ResourceError { String(), 0, currentURL(), "Failed HTTP authentication"_s, ResourceError::Type::AccessControl });
>+    didFinish(WebCore::ResourceError { String(), 0, currentURL(), "Failed HTTP authentication"_s, WebCore::ResourceError::Type::AccessControl });
> }
> 
>-void PingLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
>+void PingLoad::didReceiveResponseNetworkSession(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
> {
>     RELEASE_LOG_IF_ALLOWED("didReceiveResponseNetworkSession - httpStatusCode: %d", response.httpStatusCode());
>     auto weakThis = makeWeakPtr(*this);
>-    completionHandler(PolicyAction::Ignore);
>+    completionHandler(WebCore::PolicyAction::Ignore);
>     if (!weakThis)
>         return;
>     didFinish({ }, response);
> }
> 
>-void PingLoad::didReceiveData(Ref<SharedBuffer>&&)
>+void PingLoad::didReceiveData(Ref<WebCore::SharedBuffer>&&)
> {
>     RELEASE_LOG_IF_ALLOWED("didReceiveData");
>     ASSERT_NOT_REACHED();
> }
> 
>-void PingLoad::didCompleteWithError(const ResourceError& error, const NetworkLoadMetrics&)
>+void PingLoad::didCompleteWithError(const WebCore::ResourceError& error, const WebCore::NetworkLoadMetrics&)
> {
>     if (error.isNull())
>         RELEASE_LOG_IF_ALLOWED("didComplete");
>@@ -154,24 +152,26 @@ void PingLoad::didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedT
> void PingLoad::wasBlocked()
> {
>     RELEASE_LOG_IF_ALLOWED("wasBlocked");
>-    didFinish(blockedError(ResourceRequest { currentURL() }));
>+    didFinish(blockedError(WebCore::ResourceRequest { currentURL() }));
> }
> 
> void PingLoad::cannotShowURL()
> {
>     RELEASE_LOG_IF_ALLOWED("cannotShowURL");
>-    didFinish(cannotShowURLError(ResourceRequest { currentURL() }));
>+    didFinish(cannotShowURLError(WebCore::ResourceRequest { currentURL() }));
> }
> 
> void PingLoad::timeoutTimerFired()
> {
>     RELEASE_LOG_IF_ALLOWED("timeoutTimerFired");
>-    didFinish(ResourceError { String(), 0, currentURL(), "Load timed out"_s, ResourceError::Type::Timeout });
>+    didFinish(WebCore::ResourceError { String(), 0, currentURL(), "Load timed out"_s, WebCore::ResourceError::Type::Timeout });
> }
> 
>-const URL& PingLoad::currentURL() const
>+const WebCore::URL& PingLoad::currentURL() const
> {
>     return m_networkLoadChecker->url();
> }
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/PreconnectTask.cpp b/Source/WebKit/NetworkProcess/PreconnectTask.cpp
>index 421de34414f9cbd657e50f01c387c740c7e39930..0e53d382fdb53886d0451c73d66c386c2aa674c4 100644
>--- a/Source/WebKit/NetworkProcess/PreconnectTask.cpp
>+++ b/Source/WebKit/NetworkProcess/PreconnectTask.cpp
>@@ -38,11 +38,9 @@
> 
> namespace WebKit {
> 
>-using namespace WebCore;
>-
>-PreconnectTask::PreconnectTask(NetworkLoadParameters&& parameters, WTF::CompletionHandler<void(const ResourceError&)>&& completionHandler)
>+PreconnectTask::PreconnectTask(NetworkLoadParameters&& parameters, WTF::CompletionHandler<void(const WebCore::ResourceError&)>&& completionHandler)
>     : m_completionHandler(WTFMove(completionHandler))
>-    , m_timeoutTimer([this] { didFinish(ResourceError { String(), 0, m_networkLoad->parameters().request.url(), "Preconnection timed out"_s, ResourceError::Type::Timeout }); })
>+    , m_timeoutTimer([this] { didFinish(WebCore::ResourceError { String(), 0, m_networkLoad->parameters().request.url(), "Preconnection timed out"_s, WebCore::ResourceError::Type::Timeout }); })
> {
>     RELEASE_LOG(Network, "%p - PreconnectTask::PreconnectTask()", this);
> 
>@@ -63,29 +61,29 @@ PreconnectTask::~PreconnectTask()
> {
> }
> 
>-void PreconnectTask::willSendRedirectedRequest(ResourceRequest&&, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
>+void PreconnectTask::willSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse)
> {
>     ASSERT_NOT_REACHED();
> }
> 
>-auto PreconnectTask::didReceiveResponse(ResourceResponse&&) -> ShouldContinueDidReceiveResponse
>+auto PreconnectTask::didReceiveResponse(WebCore::ResourceResponse&&) -> ShouldContinueDidReceiveResponse
> {
>     ASSERT_NOT_REACHED();
>     return ShouldContinueDidReceiveResponse::No;
> }
> 
>-void PreconnectTask::didReceiveBuffer(Ref<SharedBuffer>&&, int reportedEncodedDataLength)
>+void PreconnectTask::didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength)
> {
>     ASSERT_NOT_REACHED();
> }
> 
>-void PreconnectTask::didFinishLoading(const NetworkLoadMetrics&)
>+void PreconnectTask::didFinishLoading(const WebCore::NetworkLoadMetrics&)
> {
>     RELEASE_LOG(Network, "%p - PreconnectTask::didFinishLoading", this);
>     didFinish({ });
> }
> 
>-void PreconnectTask::didFailLoading(const ResourceError& error)
>+void PreconnectTask::didFailLoading(const WebCore::ResourceError& error)
> {
>     RELEASE_LOG(Network, "%p - PreconnectTask::didFailLoading, error_code: %d", this, error.errorCode());
>     didFinish(error);
>@@ -96,7 +94,7 @@ void PreconnectTask::didSendData(unsigned long long bytesSent, unsigned long lon
>     ASSERT_NOT_REACHED();
> }
> 
>-void PreconnectTask::didFinish(const ResourceError& error)
>+void PreconnectTask::didFinish(const WebCore::ResourceError& error)
> {
>     if (m_completionHandler)
>         m_completionHandler(error);
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>index 69155ff209331e6b1d5e3fd225ffb0e4b507b5d0..a8585b6394951fcfb38d98012366af1676c948b7 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>@@ -44,8 +44,6 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/StringHash.h>
> 
>-
>-using namespace WebCore;
> using namespace WebCore::DOMCacheEngine;
> using namespace WebKit::NetworkCache;
> 
>@@ -53,14 +51,14 @@ namespace WebKit {
> 
> namespace CacheStorage {
> 
>-static inline String computeKeyURL(const URL& url)
>+static inline String computeKeyURL(const WebCore::URL& url)
> {
>-    URL keyURL { url };
>+    WebCore::URL keyURL { url };
>     keyURL.removeQueryAndFragmentIdentifier();
>     return keyURL.string();
> }
> 
>-static inline Vector<uint64_t> queryCache(const Vector<RecordInformation>* records, const ResourceRequest& request, const CacheQueryOptions& options)
>+static inline Vector<uint64_t> queryCache(const Vector<RecordInformation>* records, const WebCore::ResourceRequest& request, const WebCore::CacheQueryOptions& options)
> {
>     if (!records)
>         return { };
>@@ -76,7 +74,7 @@ static inline Vector<uint64_t> queryCache(const Vector<RecordInformation>* recor
>     return results;
> }
> 
>-static inline void updateVaryInformation(RecordInformation& recordInformation, const ResourceRequest& request, const ResourceResponse& response)
>+static inline void updateVaryInformation(RecordInformation& recordInformation, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
> {
>     auto varyValue = response.httpHeaderField(WebCore::HTTPHeaderName::Vary);
>     if (varyValue.isNull()) {
>@@ -86,7 +84,7 @@ static inline void updateVaryInformation(RecordInformation& recordInformation, c
>     }
> 
>     varyValue.split(',', [&](StringView view) {
>-        if (!recordInformation.hasVaryStar && stripLeadingAndTrailingHTTPSpaces(view) == "*")
>+        if (!recordInformation.hasVaryStar && WebCore::stripLeadingAndTrailingHTTPSpaces(view) == "*")
>             recordInformation.hasVaryStar = true;
>         String headerName = view.toString();
>         recordInformation.varyHeaders.add(headerName, request.httpHeaderField(headerName));
>@@ -282,7 +280,7 @@ void Cache::retrieveRecord(const RecordInformation& record, Ref<ReadRecordTaskCo
>     });
> }
> 
>-void Cache::retrieveRecords(const URL& url, RecordsCallback&& callback)
>+void Cache::retrieveRecords(const WebCore::URL& url, RecordsCallback&& callback)
> {
>     ASSERT(m_state == State::Open);
> 
>@@ -320,7 +318,7 @@ RecordInformation& Cache::addRecord(Vector<RecordInformation>* records, const Re
>     return records->last();
> }
> 
>-Vector<RecordInformation>* Cache::recordsFromURL(const URL& url)
>+Vector<RecordInformation>* Cache::recordsFromURL(const WebCore::URL& url)
> {
>     auto iterator = m_records.find(computeKeyURL(url));
>     if (iterator == m_records.end())
>@@ -328,7 +326,7 @@ Vector<RecordInformation>* Cache::recordsFromURL(const URL& url)
>     return &iterator->value;
> }
> 
>-const Vector<RecordInformation>* Cache::recordsFromURL(const URL& url) const
>+const Vector<RecordInformation>* Cache::recordsFromURL(const WebCore::URL& url) const
> {
>     auto iterator = m_records.find(computeKeyURL(url));
>     if (iterator == m_records.end())
>@@ -424,7 +422,7 @@ void Cache::put(Vector<Record>&& records, RecordIdentifiersCallback&& callback)
>         return;
>     }
> 
>-    m_caches.requestSpace(spaceRequired, [caches = makeRef(m_caches), identifier = m_identifier, records = WTFMove(records), callback = WTFMove(callback)](std::optional<DOMCacheEngine::Error>&& error) mutable {
>+    m_caches.requestSpace(spaceRequired, [caches = makeRef(m_caches), identifier = m_identifier, records = WTFMove(records), callback = WTFMove(callback)](std::optional<WebCore::DOMCacheEngine::Error>&& error) mutable {
>         if (error) {
>             callback(makeUnexpected(error.value()));
>             return;
>@@ -576,7 +574,7 @@ std::optional<Cache::DecodedRecord> Cache::decodeRecordHeader(const Storage::Rec
>     if (!record.request.decodeWithoutPlatformData(decoder))
>         return std::nullopt;
> 
>-    if (!FetchOptions::decodePersistent(decoder, record.options))
>+    if (!WebCore::FetchOptions::decodePersistent(decoder, record.options))
>         return std::nullopt;
> 
>     if (!decoder.decode(record.referrer))
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>index a5623455d9af0e42720ec5ae33baf47195c8ab5a..a917de533d4ae6625e95185aabaf53858844bb59 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>@@ -166,3 +166,5 @@ void CacheStorageEngineConnection::engineRepresentation(PAL::SessionID sessionID
> }
> 
> }
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>index a42a51bcc7bc51cba1d94ab0945969b4fab9e7e4..cd8c0b814b33834494088bbc1cf340b5ecbe52cf 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>@@ -39,23 +39,21 @@
> namespace WebKit {
> namespace NetworkCache {
> 
>-using namespace WebCore;
>-
>-SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& frameID, const ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
>+SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& frameID, const WebCore::ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
>     : m_cache(cache)
>     , m_frameID(frameID)
>     , m_completionHandler(WTFMove(completionHandler))
>     , m_originalRequest(request)
>-    , m_bufferedDataForCache(SharedBuffer::create())
>+    , m_bufferedDataForCache(WebCore::SharedBuffer::create())
>     , m_cacheEntry(WTFMove(cacheEntryForValidation))
> {
>     ASSERT(!m_cacheEntry || m_cacheEntry->needsValidation());
> 
>     NetworkLoadParameters parameters;
>     parameters.sessionID = PAL::SessionID::defaultSessionID();
>-    parameters.storedCredentialsPolicy = StoredCredentialsPolicy::Use;
>-    parameters.contentSniffingPolicy = ContentSniffingPolicy::DoNotSniffContent;
>-    parameters.contentEncodingSniffingPolicy = ContentEncodingSniffingPolicy::Sniff;
>+    parameters.storedCredentialsPolicy = WebCore::StoredCredentialsPolicy::Use;
>+    parameters.contentSniffingPolicy = WebCore::ContentSniffingPolicy::DoNotSniffContent;
>+    parameters.contentEncodingSniffingPolicy = WebCore::ContentEncodingSniffingPolicy::Sniff;
>     parameters.request = m_originalRequest;
>     m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), *SessionTracker::networkSession(PAL::SessionID::defaultSessionID()));
> }
>@@ -65,7 +63,7 @@ SpeculativeLoad::~SpeculativeLoad()
>     ASSERT(!m_networkLoad);
> }
> 
>-void SpeculativeLoad::willSendRedirectedRequest(ResourceRequest&& request, ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
>+void SpeculativeLoad::willSendRedirectedRequest(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&& redirectResponse)
> {
>     LOG(NetworkCacheSpeculativePreloading, "Speculative redirect %s -> %s", request.url().string().utf8().data(), redirectRequest.url().string().utf8().data());
> 
>@@ -78,7 +76,7 @@ void SpeculativeLoad::willSendRedirectedRequest(ResourceRequest&& request, Resou
>     didComplete();
> }
> 
>-auto SpeculativeLoad::didReceiveResponse(ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
>+auto SpeculativeLoad::didReceiveResponse(WebCore::ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
> {
>     m_response = receivedResponse;
> 
>@@ -94,7 +92,7 @@ auto SpeculativeLoad::didReceiveResponse(ResourceResponse&& receivedResponse) ->
>     return ShouldContinueDidReceiveResponse::Yes;
> }
> 
>-void SpeculativeLoad::didReceiveBuffer(Ref<SharedBuffer>&& buffer, int reportedEncodedDataLength)
>+void SpeculativeLoad::didReceiveBuffer(Ref<WebCore::SharedBuffer>&& buffer, int reportedEncodedDataLength)
> {
>     ASSERT(!m_cacheEntry);
> 
>@@ -115,14 +113,14 @@ void SpeculativeLoad::didFinishLoading(const WebCore::NetworkLoadMetrics&)
>     if (!m_cacheEntry && m_bufferedDataForCache) {
>         m_cacheEntry = m_cache->store(m_originalRequest, m_response, m_bufferedDataForCache.copyRef(), [](auto& mappedBody) { });
>         // Create a synthetic cache entry if we can't store.
>-        if (!m_cacheEntry && isStatusCodeCacheableByDefault(m_response.httpStatusCode()))
>+        if (!m_cacheEntry && WebCore::isStatusCodeCacheableByDefault(m_response.httpStatusCode()))
>             m_cacheEntry = m_cache->makeEntry(m_originalRequest, m_response, WTFMove(m_bufferedDataForCache));
>     }
> 
>     didComplete();
> }
> 
>-void SpeculativeLoad::didFailLoading(const ResourceError&)
>+void SpeculativeLoad::didFailLoading(const WebCore::ResourceError&)
> {
>     if (m_didComplete)
>         return;
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>index 6b9aadee59eb0dc045a42c856f88d30d5d8bfb63..7775eb057c15e80d8bc49bfb1bd42e3672025aee 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>@@ -45,8 +45,6 @@ namespace WebKit {
> 
> namespace NetworkCache {
> 
>-using namespace WebCore;
>-
> static const Seconds preloadedEntryLifetime { 10_s };
> 
> #if !LOG_DISABLED
>@@ -85,9 +83,9 @@ static inline Key makeSubresourcesKey(const Key& resourceKey, const Salt& salt)
>     return Key(resourceKey.partition(), subresourcesType(), resourceKey.range(), resourceKey.identifier(), salt);
> }
> 
>-static inline ResourceRequest constructRevalidationRequest(const Key& key, const SubresourceInfo& subResourceInfo, const Entry* entry)
>+static inline WebCore::ResourceRequest constructRevalidationRequest(const Key& key, const SubresourceInfo& subResourceInfo, const Entry* entry)
> {
>-    ResourceRequest revalidationRequest(key.identifier());
>+    WebCore::ResourceRequest revalidationRequest(key.identifier());
>     revalidationRequest.setHTTPHeaderFields(subResourceInfo.requestHeaders());
>     revalidationRequest.setFirstPartyForCookies(subResourceInfo.firstPartyForCookies());
>     revalidationRequest.setIsSameSite(subResourceInfo.isSameSite());
>@@ -98,13 +96,13 @@ static inline ResourceRequest constructRevalidationRequest(const Key& key, const
>     
>     revalidationRequest.makeUnconditional();
>     if (entry) {
>-        String eTag = entry->response().httpHeaderField(HTTPHeaderName::ETag);
>+        String eTag = entry->response().httpHeaderField(WebCore::HTTPHeaderName::ETag);
>         if (!eTag.isEmpty())
>-            revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
>+            revalidationRequest.setHTTPHeaderField(WebCore::HTTPHeaderName::IfNoneMatch, eTag);
> 
>-        String lastModified = entry->response().httpHeaderField(HTTPHeaderName::LastModified);
>+        String lastModified = entry->response().httpHeaderField(WebCore::HTTPHeaderName::LastModified);
>         if (!lastModified.isEmpty())
>-            revalidationRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
>+            revalidationRequest.setHTTPHeaderField(WebCore::HTTPHeaderName::IfModifiedSince, lastModified);
>     }
>     
>     revalidationRequest.setPriority(subResourceInfo.priority());
>@@ -112,7 +110,7 @@ static inline ResourceRequest constructRevalidationRequest(const Key& key, const
>     return revalidationRequest;
> }
> 
>-static bool responseNeedsRevalidation(const ResourceResponse& response, WallTime timestamp)
>+static bool responseNeedsRevalidation(const WebCore::ResourceResponse& response, WallTime timestamp)
> {
>     if (response.cacheControlContainsNoCache())
>         return true;
>@@ -132,13 +130,13 @@ public:
>     }
> 
> private:
>-    Timer m_lifetimeTimer;
>+    WebCore::Timer m_lifetimeTimer;
> };
> 
> class SpeculativeLoadManager::PreloadedEntry : private ExpiringEntry {
>     WTF_MAKE_FAST_ALLOCATED;
> public:
>-    PreloadedEntry(std::unique_ptr<Entry> entry, std::optional<ResourceRequest>&& speculativeValidationRequest, WTF::Function<void()>&& lifetimeReachedHandler)
>+    PreloadedEntry(std::unique_ptr<Entry> entry, std::optional<WebCore::ResourceRequest>&& speculativeValidationRequest, WTF::Function<void()>&& lifetimeReachedHandler)
>         : ExpiringEntry(WTFMove(lifetimeReachedHandler))
>         , m_entry(WTFMove(entry))
>         , m_speculativeValidationRequest(WTFMove(speculativeValidationRequest))
>@@ -150,12 +148,12 @@ public:
>         return WTFMove(m_entry);
>     }
> 
>-    const std::optional<ResourceRequest>& revalidationRequest() const { return m_speculativeValidationRequest; }
>+    const std::optional<WebCore::ResourceRequest>& revalidationRequest() const { return m_speculativeValidationRequest; }
>     bool wasRevalidated() const { return !!m_speculativeValidationRequest; }
> 
> private:
>     std::unique_ptr<Entry> m_entry;
>-    std::optional<ResourceRequest> m_speculativeValidationRequest;
>+    std::optional<WebCore::ResourceRequest> m_speculativeValidationRequest;
> };
> 
> class SpeculativeLoadManager::PendingFrameLoad : public RefCounted<PendingFrameLoad> {
>@@ -171,7 +169,7 @@ public:
>         ASSERT(m_didRetrieveExistingEntry);
>     }
> 
>-    void registerSubresourceLoad(const ResourceRequest& request, const Key& subresourceKey)
>+    void registerSubresourceLoad(const WebCore::ResourceRequest& request, const Key& subresourceKey)
>     {
>         ASSERT(RunLoop::isMain());
>         m_subresourceLoads.append(std::make_unique<SubresourceLoad>(request, subresourceKey));
>@@ -258,7 +256,7 @@ SpeculativeLoadManager::~SpeculativeLoadManager()
> 
> #if !LOG_DISABLED
> 
>-static void dumpHTTPHeadersDiff(const HTTPHeaderMap& headersA, const HTTPHeaderMap& headersB)
>+static void dumpHTTPHeadersDiff(const WebCore::HTTPHeaderMap& headersA, const WebCore::HTTPHeaderMap& headersB)
> {
>     auto aEnd = headersA.end();
>     for (auto it = headersA.begin(); it != aEnd; ++it) {
>@@ -277,10 +275,10 @@ static void dumpHTTPHeadersDiff(const HTTPHeaderMap& headersA, const HTTPHeaderM
> 
> #endif
> 
>-static bool requestsHeadersMatch(const ResourceRequest& speculativeValidationRequest, const ResourceRequest& actualRequest)
>+static bool requestsHeadersMatch(const WebCore::ResourceRequest& speculativeValidationRequest, const WebCore::ResourceRequest& actualRequest)
> {
>     ASSERT(!actualRequest.isConditional());
>-    ResourceRequest speculativeRequest = speculativeValidationRequest;
>+    WebCore::ResourceRequest speculativeRequest = speculativeValidationRequest;
>     speculativeRequest.makeUnconditional();
> 
>     if (speculativeRequest.httpHeaderFields() != actualRequest.httpHeaderFields()) {
>@@ -293,7 +291,7 @@ static bool requestsHeadersMatch(const ResourceRequest& speculativeValidationReq
>     return true;
> }
> 
>-bool SpeculativeLoadManager::canUsePreloadedEntry(const PreloadedEntry& entry, const ResourceRequest& actualRequest)
>+bool SpeculativeLoadManager::canUsePreloadedEntry(const PreloadedEntry& entry, const WebCore::ResourceRequest& actualRequest)
> {
>     if (!entry.wasRevalidated())
>         return true;
>@@ -302,7 +300,7 @@ bool SpeculativeLoadManager::canUsePreloadedEntry(const PreloadedEntry& entry, c
>     return requestsHeadersMatch(*entry.revalidationRequest(), actualRequest);
> }
> 
>-bool SpeculativeLoadManager::canUsePendingPreload(const SpeculativeLoad& load, const ResourceRequest& actualRequest)
>+bool SpeculativeLoadManager::canUsePendingPreload(const SpeculativeLoad& load, const WebCore::ResourceRequest& actualRequest)
> {
>     return requestsHeadersMatch(load.originalRequest(), actualRequest);
> }
>@@ -313,12 +311,12 @@ bool SpeculativeLoadManager::canRetrieve(const Key& storageKey, const WebCore::R
>     if (auto preloadedEntry = m_preloadedEntries.get(storageKey)) {
>         if (!canUsePreloadedEntry(*preloadedEntry, request)) {
>             LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: Could not use preloaded entry to satisfy request for '%s' due to HTTP headers mismatch:", storageKey.identifier().utf8().data());
>-            logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey() : DiagnosticLoggingKeys::wastedSpeculativeWarmupWithoutRevalidationKey());
>+            logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? WebCore::DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey() : WebCore::DiagnosticLoggingKeys::wastedSpeculativeWarmupWithoutRevalidationKey());
>             return false;
>         }
> 
>         LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: Using preloaded entry to satisfy request for '%s':", storageKey.identifier().utf8().data());
>-        logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? DiagnosticLoggingKeys::successfulSpeculativeWarmupWithRevalidationKey() : DiagnosticLoggingKeys::successfulSpeculativeWarmupWithoutRevalidationKey());
>+        logSpeculativeLoadingDiagnosticMessage(frameID, preloadedEntry->wasRevalidated() ? WebCore::DiagnosticLoggingKeys::successfulSpeculativeWarmupWithRevalidationKey() : WebCore::DiagnosticLoggingKeys::successfulSpeculativeWarmupWithoutRevalidationKey());
>         return true;
>     }
> 
>@@ -326,16 +324,16 @@ bool SpeculativeLoadManager::canRetrieve(const Key& storageKey, const WebCore::R
>     auto* pendingPreload = m_pendingPreloads.get(storageKey);
>     if (!pendingPreload) {
>         if (m_notPreloadedEntries.get(storageKey))
>-            logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::entryWronglyNotWarmedUpKey());
>+            logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::entryWronglyNotWarmedUpKey());
>         else
>-            logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::unknownEntryRequestKey());
>+            logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::unknownEntryRequestKey());
> 
>         return false;
>     }
> 
>     if (!canUsePendingPreload(*pendingPreload, request)) {
>         LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Retrieval: revalidation already in progress for '%s' but unusable due to HTTP headers mismatch:", storageKey.identifier().utf8().data());
>-        logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey());
>+        logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey());
>         return false;
>     }
> 
>@@ -360,17 +358,17 @@ void SpeculativeLoadManager::retrieve(const Key& storageKey, RetrieveCompletionH
>     addResult.iterator->value->append(WTFMove(completionHandler));
> }
> 
>-void SpeculativeLoadManager::registerLoad(const GlobalFrameID& frameID, const ResourceRequest& request, const Key& resourceKey)
>+void SpeculativeLoadManager::registerLoad(const GlobalFrameID& frameID, const WebCore::ResourceRequest& request, const Key& resourceKey)
> {
>     ASSERT(RunLoop::isMain());
>     ASSERT(request.url().protocolIsInHTTPFamily());
> 
>     if (request.httpMethod() != "GET")
>         return;
>-    if (!request.httpHeaderField(HTTPHeaderName::Range).isEmpty())
>+    if (!request.httpHeaderField(WebCore::HTTPHeaderName::Range).isEmpty())
>         return;
> 
>-    auto isMainResource = request.requester() == ResourceRequest::Requester::Main;
>+    auto isMainResource = request.requester() == WebCore::ResourceRequest::Requester::Main;
>     if (isMainResource) {
>         // Mark previous load in this frame as completed if necessary.
>         if (auto* pendingFrameLoad = m_pendingFrameLoads.get(frameID))
>@@ -399,7 +397,7 @@ void SpeculativeLoadManager::registerLoad(const GlobalFrameID& frameID, const Re
>         pendingFrameLoad->registerSubresourceLoad(request, resourceKey);
> }
> 
>-void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, std::optional<ResourceRequest>&& revalidationRequest)
>+void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, const GlobalFrameID& frameID, std::optional<WebCore::ResourceRequest>&& revalidationRequest)
> {
>     ASSERT(entry);
>     ASSERT(!entry->needsValidation());
>@@ -408,9 +406,9 @@ void SpeculativeLoadManager::addPreloadedEntry(std::unique_ptr<Entry> entry, con
>         auto preloadedEntry = m_preloadedEntries.take(key);
>         ASSERT(preloadedEntry);
>         if (preloadedEntry->wasRevalidated())
>-            logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey());
>+            logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::wastedSpeculativeWarmupWithRevalidationKey());
>         else
>-            logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::wastedSpeculativeWarmupWithoutRevalidationKey());
>+            logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::wastedSpeculativeWarmupWithoutRevalidationKey());
>     }));
> }
> 
>@@ -464,7 +462,7 @@ void SpeculativeLoadManager::revalidateSubresource(const SubresourceInfo& subres
>     if (!key.range().isEmpty())
>         return;
> 
>-    ResourceRequest revalidationRequest = constructRevalidationRequest(key, subresourceInfo, entry.get());
>+    WebCore::ResourceRequest revalidationRequest = constructRevalidationRequest(key, subresourceInfo, entry.get());
> 
>     LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Speculatively revalidating '%s':", key.identifier().utf8().data());
> 
>@@ -477,7 +475,7 @@ void SpeculativeLoadManager::revalidateSubresource(const SubresourceInfo& subres
> 
>         if (satisfyPendingRequests(key, revalidatedEntry.get())) {
>             if (revalidatedEntry)
>-                logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::successfulSpeculativeWarmupWithRevalidationKey());
>+                logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::successfulSpeculativeWarmupWithRevalidationKey());
>             return;
>         }
> 
>@@ -537,7 +535,7 @@ void SpeculativeLoadManager::preloadEntry(const Key& key, const SubresourceInfo&
> 
>         if (satisfyPendingRequests(key, entry.get())) {
>             if (entry)
>-                logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::successfulSpeculativeWarmupWithoutRevalidationKey());
>+                logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::successfulSpeculativeWarmupWithoutRevalidationKey());
>             return;
>         }
>         
>@@ -560,7 +558,7 @@ void SpeculativeLoadManager::startSpeculativeRevalidation(const GlobalFrameID& f
>         else {
>             LOG(NetworkCacheSpeculativePreloading, "(NetworkProcess) Not preloading '%s' because it is marked as transient", key.identifier().utf8().data());
>             m_notPreloadedEntries.add(key, std::make_unique<ExpiringEntry>([this, key, frameID] {
>-                logSpeculativeLoadingDiagnosticMessage(frameID, DiagnosticLoggingKeys::entryRightlyNotWarmedUpKey());
>+                logSpeculativeLoadingDiagnosticMessage(frameID, WebCore::DiagnosticLoggingKeys::entryRightlyNotWarmedUpKey());
>                 m_notPreloadedEntries.remove(key);
>             }));
>         }
>@@ -571,7 +569,7 @@ void SpeculativeLoadManager::retrieveSubresourcesEntry(const Key& storageKey, WT
> {
>     ASSERT(storageKey.type() == "Resource");
>     auto subresourcesStorageKey = makeSubresourcesKey(storageKey, m_storage.salt());
>-    m_storage.retrieve(subresourcesStorageKey, static_cast<unsigned>(ResourceLoadPriority::Medium), [completionHandler = WTFMove(completionHandler)](auto record, auto timings) {
>+    m_storage.retrieve(subresourcesStorageKey, static_cast<unsigned>(WebCore::ResourceLoadPriority::Medium), [completionHandler = WTFMove(completionHandler)](auto record, auto timings) {
>         if (!record) {
>             completionHandler(nullptr);
>             return false;
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>index d679cd356641663bac475bd9536ca0505a439996..81839576d1a2d0330337a0d616d1bed0a861efaa 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>@@ -582,4 +582,6 @@ bool Manager::getWord(uint8_t const *& p, uint8_t const * const end, String& wor
> } // namespace NetworkCapture
> } // namespace WebKit
> 
>+#undef DEBUG_CLASS
>+
> #endif // ENABLE(NETWORK_CAPTURE)
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp
>index e90620f0f2ca7ff4b7b8f8f7dcfa478ab6e894bd..51bdf36995780e9dd01e0a9dc3838e4a02fcf53c 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp
>@@ -153,4 +153,6 @@ void Recorder::writeEvents()
> } // namespace NetworkCapture
> } // namespace WebKit
> 
>+#undef DEBUG_CLASS
>+
> #endif // ENABLE(NETWORK_CAPTURE)
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp
>index a04af69c7d3a388d4f3ca680f815ed8deec6d478..96dc5f2e7f9930996fecd0cb4ff112819c456dd2 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp
>@@ -48,4 +48,6 @@ Ref<NetworkDataTask> Replayer::replayResource(NetworkSession& session, NetworkDa
> } // namespace NetworkCapture
> } // namespace WebKit
> 
>+#undef DEBUG_CLASS
>+
> #endif // ENABLE(NETWORK_CAPTURE)
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp b/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp
>index 67c4bb83a551e6d74802400f1c8debdfcb4ff055..3db77e732c5d9a004ce9a95c67493e8f33fa931d 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp
>@@ -288,4 +288,6 @@ void NetworkDataTaskReplay::didFinish(const WebCore::ResourceError& error)
> } // namespace NetworkCapture
> } // namespace WebKit
> 
>+#undef DEBUG_CLASS
>+
> #endif // ENABLE(NETWORK_CAPTURE)
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>index 3c6154fadf391db17c86127192c5caadfdd5b908..f2cc733593cadc05cf46307e6820f4b920469410 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>@@ -47,7 +47,7 @@
> 
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
> @interface NSURLSessionTask (Staging)
>-@property (nullable, readwrite, retain) NSURL *_siteForCookies;
>+@property (readwrite, retain) NSURL *_siteForCookies;
> @property (readwrite) BOOL _isTopLevelNavigation;
> @end
> #endif
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>index 786f6b6f63c5637419f9db90cf2784464ce12ed8..d1e9a37c8ed138b94e539c9a62a98485f120fc8f 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>@@ -56,7 +56,7 @@ using namespace WebKit;
> 
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
> @interface NSURLSessionConfiguration (WKStaging)
>-@property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
>+@property (copy) NSSet *_suppressedAutoAddedHTTPHeaders;
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
> // FIXME: Remove this once rdar://problem/40650244 is in a build.
> @property (copy) NSDictionary *_socketStreamProperties;
>@@ -143,7 +143,7 @@ static WebCore::NetworkLoadPriority toNetworkLoadPriority(float priority)
>     return _session->dataTaskForIdentifier(task.taskIdentifier, storedCredentialsPolicy);
> }
> 
>-- (void)URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable NSError *)error
>+- (void)URLSession:(NSURLSession *)session didBecomeInvalidWithError:(NSError *)error
> {
>     ASSERT(!_session);
> }
>@@ -298,7 +298,7 @@ static NSURLRequest* updateIgnoreStrictTransportSecuritySettingIfNecessary(NSURL
>     }
> }
> 
>-- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask willCacheResponse:(NSCachedURLResponse *)proposedResponse completionHandler:(void (^)(NSCachedURLResponse * _Nullable cachedResponse))completionHandler
>+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask willCacheResponse:(NSCachedURLResponse *)proposedResponse completionHandler:(void (^)(NSCachedURLResponse *cachedResponse))completionHandler
> {
>     if (!_session) {
>         completionHandler(nil);
>diff --git a/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm b/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
>index 629e1f3cdae9bfd484a42f091fbda0b0715e0c31..d55a68d60eb362e10d70ca0308ba3ec27643524b 100644
>--- a/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
>+++ b/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
>@@ -40,8 +40,6 @@
> 
> #define ENABLE_MANUAL_NETWORK_SANDBOXING 0
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
>diff --git a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>index bd7a24e8abe7a6ff4cde9a99cb5339b87fc73d46..a555ded1c87d23943977d8e5c4c4a8e8a3302a8f 100644
>--- a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>+++ b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>@@ -47,8 +47,6 @@
> #import <wtf/MemoryPressureHandler.h>
> #import <wtf/text/WTFString.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
>@@ -70,7 +68,7 @@ static void overrideSystemProxies(const String& httpProxy, const String& httpsPr
>     NSMutableDictionary *proxySettings = [NSMutableDictionary dictionary];
> 
>     if (!httpProxy.isNull()) {
>-        URL httpProxyURL(URL(), httpProxy);
>+        WebCore::URL httpProxyURL(WebCore::URL(), httpProxy);
>         if (httpProxyURL.isValid()) {
>             [proxySettings setObject:nsStringFromWebCoreString(httpProxyURL.host().toString()) forKey:(NSString *)kCFNetworkProxiesHTTPProxy];
>             if (httpProxyURL.port()) {
>@@ -83,7 +81,7 @@ static void overrideSystemProxies(const String& httpProxy, const String& httpsPr
>     }
> 
>     if (!httpsProxy.isNull()) {
>-        URL httpsProxyURL(URL(), httpsProxy);
>+        WebCore::URL httpsProxyURL(WebCore::URL(), httpsProxy);
>         if (httpsProxyURL.isValid()) {
> #if !PLATFORM(IOSMAC)
>             [proxySettings setObject:nsStringFromWebCoreString(httpsProxyURL.host().toString()) forKey:(NSString *)kCFNetworkProxiesHTTPSProxy];
>@@ -113,7 +111,7 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
>         overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy);
> }
> 
>-void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
>+void NetworkProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
> {
>     [NSURLRequest setAllowsSpecificHTTPSCertificate:(__bridge NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];
> }
>diff --git a/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm b/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm
>index 154678c8e2f2f04c72673b73e3a083f6a46b915d..fb549e864b2b69590a1600145618342d66b1681d 100644
>--- a/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm
>+++ b/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm
>@@ -39,14 +39,12 @@
> #import <pal/SessionID.h>
> #import <wtf/MainThread.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
> {
>     auto sessionID = parameters.networkSessionParameters.sessionID;
>-    if (NetworkStorageSession::storageSession(sessionID))
>+    if (WebCore::NetworkStorageSession::storageSession(sessionID))
>         return;
> 
>     String base;
>@@ -62,9 +60,9 @@ void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStorePara
>     if (!sessionID.isEphemeral() && !parameters.uiProcessCookieStorageIdentifier.isEmpty())
>         uiProcessCookieStorage = cookieStorageFromIdentifyingData(parameters.uiProcessCookieStorageIdentifier);
> 
>-    NetworkStorageSession::ensureSession(sessionID, base + '.' + String::number(sessionID.sessionID()), WTFMove(uiProcessCookieStorage));
>+    WebCore::NetworkStorageSession::ensureSession(sessionID, base + '.' + String::number(sessionID.sessionID()), WTFMove(uiProcessCookieStorage));
> 
>-    auto* session = NetworkStorageSession::storageSession(sessionID);
>+    auto* session = WebCore::NetworkStorageSession::storageSession(sessionID);
>     for (const auto& cookie : parameters.pendingCookies)
>         session->setCookie(cookie);
> 
>diff --git a/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp b/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>index 90234fb06ac8d178b67bb60f90fa5ec8f6f0c057..b68e3f45013ee66df566f80dd138a707ba4c362f 100644
>--- a/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>+++ b/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>@@ -34,8 +34,6 @@
> #include <pal/SessionID.h>
> #include <wtf/UUID.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
> 
> #define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkMDNSRegister::" fmt, this, ##__VA_ARGS__)
>@@ -97,13 +95,13 @@ static void registerMDNSNameCallback(DNSServiceRef, DNSRecordRef record, DNSServ
>     RELEASE_LOG_IF_ALLOWED_IN_CALLBACK(request->sessionID, "registerMDNSNameCallback with error %d", errorCode);
> 
>     if (errorCode) {
>-        request->connection->send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { request->requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        request->connection->send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { request->requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
>     request->connection->send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { request->requestIdentifier, request->name }, 0);
> }
> 
>-void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::SessionID sessionID, DocumentIdentifier documentIdentifier, const String& ipAddress)
>+void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::SessionID sessionID, WebCore::DocumentIdentifier documentIdentifier, const String& ipAddress)
> {
>     DNSServiceRef service;
>     auto iterator = m_services.find(documentIdentifier);
>@@ -111,13 +109,13 @@ void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::Sess
>         auto error = DNSServiceCreateConnection(&service);
>         if (error) {
>             RELEASE_LOG_IF_ALLOWED(sessionID, "registerMDNSName DNSServiceCreateConnection error %d", error);
>-            m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+            m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>             return;
>         }
>         error = DNSServiceSetDispatchQueue(service, dispatch_get_main_queue());
>         if (error) {
>             RELEASE_LOG_IF_ALLOWED(sessionID, "registerMDNSName DNSServiceCreateConnection error %d", error);
>-            m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+            m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>             return;
>         }
>         ASSERT(service);
>@@ -132,7 +130,7 @@ void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::Sess
> 
>     if (ip == ( in_addr_t)(-1)) {
>         RELEASE_LOG_IF_ALLOWED(sessionID, "registerMDNSName inet_addr error");
>-        m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::BadParameter) }, 0);
>+        m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::BadParameter) }, 0);
>         return;
>     }
> 
>@@ -152,7 +150,7 @@ void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::Sess
>         reinterpret_cast<void*>(pendingRegistrationRequestCount));
>     if (error) {
>         RELEASE_LOG_IF_ALLOWED(sessionID, "registerMDNSName DNSServiceRegisterRecord error %d", error);
>-        m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
>     pendingRegistrationRequests().add(pendingRegistrationRequestCount++, WTFMove(pendingRequest));
>@@ -178,7 +176,7 @@ struct PendingResolutionRequest {
> 
>     void timeout()
>     {
>-        connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::Timeout) }, 0);
>+        connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::Timeout) }, 0);
>         requestIdentifier = 0;
>     }
> 
>@@ -186,7 +184,7 @@ struct PendingResolutionRequest {
>     uint64_t requestIdentifier { 0 };
>     DNSServiceRef service { nullptr };
>     DNSServiceRef operationService { nullptr };
>-    Timer timeoutTimer;
>+    WebCore::Timer timeoutTimer;
>     PAL::SessionID sessionID;
> };
> 
>@@ -199,7 +197,7 @@ static void resolveMDNSNameCallback(DNSServiceRef, DNSServiceFlags, uint32_t, DN
> 
>     if (errorCode) {
>         RELEASE_LOG_IF_ALLOWED_IN_CALLBACK(request->sessionID, "resolveMDNSNameCallback MDNS error %d", errorCode);
>-        request->connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { request->requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        request->connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { request->requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
> 
>@@ -208,7 +206,7 @@ static void resolveMDNSNameCallback(DNSServiceRef, DNSServiceFlags, uint32_t, DN
>     char buffer[INET6_ADDRSTRLEN] = { 0 };
>     if (!inet_ntop(socketAddress->sa_family, address, buffer, sizeof(buffer))) {
>         RELEASE_LOG_IF_ALLOWED_IN_CALLBACK(request->sessionID, "resolveMDNSNameCallback inet_ntop error");
>-        request->connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { request->requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        request->connection->send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { request->requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
> 
>@@ -222,7 +220,7 @@ void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::Sessi
> 
>     if (auto error = DNSServiceCreateConnection(&pendingRequest->service)) {
>         RELEASE_LOG_IF_ALLOWED(sessionID, "resolveMDNSName DNSServiceCreateConnection error %d", error);
>-        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
> 
>@@ -237,7 +235,7 @@ void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::Sessi
>     pendingRequest->operationService = service;
>     if (error) {
>         RELEASE_LOG_IF_ALLOWED(sessionID, "resolveMDNSName DNSServiceGetAddrInfo error %d", error);
>-        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>         return;
>     }
>     pendingRequest.release();
>@@ -245,7 +243,7 @@ void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::Sessi
>     error = DNSServiceSetDispatchQueue(service, dispatch_get_main_queue());
>     if (error) {
>         RELEASE_LOG_IF_ALLOWED(sessionID, "resolveMDNSName DNSServiceSetDispatchQueue error %d", error);
>-        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::DNSSD) }, 0);
>+        m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::DNSSD) }, 0);
>     }
> }
> #else
>@@ -253,16 +251,16 @@ void NetworkMDNSRegister::unregisterMDNSNames(WebCore::DocumentIdentifier)
> {
> }
> 
>-void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::SessionID sessionID, DocumentIdentifier documentIdentifier, const String& ipAddress)
>+void NetworkMDNSRegister::registerMDNSName(uint64_t requestIdentifier, PAL::SessionID sessionID, WebCore::DocumentIdentifier documentIdentifier, const String& ipAddress)
> {
>     RELEASE_LOG_IF_ALLOWED(sessionID, "registerMDNSName not implemented");
>-    m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::NotImplemented) }, 0);
>+    m_connection.connection().send(Messages::WebMDNSRegister::FinishedRegisteringMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::NotImplemented) }, 0);
> }
> 
> void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::SessionID sessionID, const String& name)
> {
>     RELEASE_LOG_IF_ALLOWED(sessionID, "resolveMDNSName not implemented");
>-    m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(MDNSRegisterError::NotImplemented) }, 0);
>+    m_connection.connection().send(Messages::WebMDNSRegister::FinishedResolvingMDNSName { requestIdentifier, makeUnexpected(WebCore::MDNSRegisterError::NotImplemented) }, 0);
> }
> 
> #endif
>@@ -270,3 +268,6 @@ void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::Sessi
> } // namespace WebKit
> 
> #endif // ENABLE(WEB_RTC)
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>+#undef RELEASE_LOG_IF_ALLOWED_IN_CALLBACK
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>index 3368cec9df8290c22b9871bcdde6cebb85d04a26..c91a75f94d0ce606c540a714c38bf8b94fb788dc 100644
>--- a/Source/WebKit/Sources.txt
>+++ b/Source/WebKit/Sources.txt
>@@ -21,66 +21,66 @@
> // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
> // THE POSSIBILITY OF SUCH DAMAGE.
> 
>-NetworkProcess/NetworkActivityTracker.cpp @no-unify
>-NetworkProcess/NetworkConnectionToWebProcess.cpp @no-unify
>-NetworkProcess/NetworkContentRuleListManager.cpp @no-unify
>-NetworkProcess/NetworkCORSPreflightChecker.cpp @no-unify
>-NetworkProcess/NetworkDataTask.cpp @no-unify
>-NetworkProcess/NetworkDataTaskBlob.cpp @no-unify
>-NetworkProcess/NetworkLoad.cpp @no-unify
>-NetworkProcess/NetworkLoadChecker.cpp @no-unify
>-NetworkProcess/NetworkProcess.cpp @no-unify
>-NetworkProcess/NetworkProcessCreationParameters.cpp @no-unify
>-NetworkProcess/NetworkProcessPlatformStrategies.cpp @no-unify
>-NetworkProcess/NetworkResourceLoader.cpp @no-unify
>-NetworkProcess/NetworkResourceLoadParameters.cpp @no-unify
>-NetworkProcess/NetworkSession.cpp @no-unify
>-NetworkProcess/NetworkSocketStream.cpp @no-unify
>-NetworkProcess/PingLoad.cpp @no-unify
>-NetworkProcess/PreconnectTask.cpp @no-unify
>-
>-NetworkProcess/cache/CacheStorageEngine.cpp @no-unify
>-NetworkProcess/cache/CacheStorageEngineCache.cpp @no-unify
>-NetworkProcess/cache/CacheStorageEngineCaches.cpp @no-unify
>-NetworkProcess/cache/CacheStorageEngineConnection.cpp @no-unify
>-NetworkProcess/cache/NetworkCache.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheBlobStorage.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheCoders.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheCodersCocoa.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheData.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheEntry.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheFileSystem.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheKey.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheStatistics.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheStorage.cpp @no-unify
>-NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp @no-unify
>-
>-NetworkProcess/capture/NetworkCaptureEvent.cpp @no-unify
>-NetworkProcess/capture/NetworkCaptureManager.cpp @no-unify
>-NetworkProcess/capture/NetworkCaptureRecorder.cpp @no-unify
>-NetworkProcess/capture/NetworkCaptureReplayer.cpp @no-unify
>-NetworkProcess/capture/NetworkCaptureResource.cpp @no-unify
>-NetworkProcess/capture/NetworkDataTaskReplay.cpp @no-unify
>-
>-NetworkProcess/Cookies/WebCookieManager.cpp @no-unify
>-
>-NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp @no-unify
>-
>-NetworkProcess/Downloads/Download.cpp @no-unify
>-NetworkProcess/Downloads/DownloadManager.cpp @no-unify
>-NetworkProcess/Downloads/PendingDownload.cpp @no-unify
>-
>-NetworkProcess/FileAPI/NetworkBlobRegistry.cpp @no-unify
>-
>-NetworkProcess/webrtc/LibWebRTCSocketClient.cpp @no-unify
>-NetworkProcess/webrtc/NetworkMDNSRegister.cpp @no-unify
>-NetworkProcess/webrtc/NetworkRTCMonitor.cpp @no-unify
>-NetworkProcess/webrtc/NetworkRTCProvider.cpp @no-unify
>-NetworkProcess/webrtc/NetworkRTCResolver.cpp @no-unify
>-NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp @no-unify
>-NetworkProcess/webrtc/NetworkRTCSocket.cpp @no-unify
>+NetworkProcess/NetworkActivityTracker.cpp
>+NetworkProcess/NetworkConnectionToWebProcess.cpp
>+NetworkProcess/NetworkContentRuleListManager.cpp
>+NetworkProcess/NetworkCORSPreflightChecker.cpp
>+NetworkProcess/NetworkDataTask.cpp
>+NetworkProcess/NetworkDataTaskBlob.cpp
>+NetworkProcess/NetworkLoad.cpp
>+NetworkProcess/NetworkLoadChecker.cpp
>+NetworkProcess/NetworkProcess.cpp
>+NetworkProcess/NetworkProcessCreationParameters.cpp
>+NetworkProcess/NetworkProcessPlatformStrategies.cpp
>+NetworkProcess/NetworkResourceLoader.cpp
>+NetworkProcess/NetworkResourceLoadParameters.cpp
>+NetworkProcess/NetworkSession.cpp
>+NetworkProcess/NetworkSocketStream.cpp
>+NetworkProcess/PingLoad.cpp
>+NetworkProcess/PreconnectTask.cpp
>+
>+NetworkProcess/cache/CacheStorageEngine.cpp
>+NetworkProcess/cache/CacheStorageEngineCache.cpp
>+NetworkProcess/cache/CacheStorageEngineCaches.cpp
>+NetworkProcess/cache/CacheStorageEngineConnection.cpp
>+NetworkProcess/cache/NetworkCache.cpp
>+NetworkProcess/cache/NetworkCacheBlobStorage.cpp
>+NetworkProcess/cache/NetworkCacheCoders.cpp
>+NetworkProcess/cache/NetworkCacheCodersCocoa.cpp
>+NetworkProcess/cache/NetworkCacheData.cpp
>+NetworkProcess/cache/NetworkCacheEntry.cpp
>+NetworkProcess/cache/NetworkCacheFileSystem.cpp
>+NetworkProcess/cache/NetworkCacheKey.cpp
>+NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>+NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>+NetworkProcess/cache/NetworkCacheStatistics.cpp
>+NetworkProcess/cache/NetworkCacheStorage.cpp
>+NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
>+
>+NetworkProcess/capture/NetworkCaptureEvent.cpp
>+NetworkProcess/capture/NetworkCaptureManager.cpp
>+NetworkProcess/capture/NetworkCaptureRecorder.cpp
>+NetworkProcess/capture/NetworkCaptureReplayer.cpp
>+NetworkProcess/capture/NetworkCaptureResource.cpp
>+NetworkProcess/capture/NetworkDataTaskReplay.cpp
>+
>+NetworkProcess/Cookies/WebCookieManager.cpp
>+
>+NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
>+
>+NetworkProcess/Downloads/Download.cpp
>+NetworkProcess/Downloads/DownloadManager.cpp
>+NetworkProcess/Downloads/PendingDownload.cpp
>+
>+NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>+
>+NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
>+NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>+NetworkProcess/webrtc/NetworkRTCMonitor.cpp
>+NetworkProcess/webrtc/NetworkRTCProvider.cpp
>+NetworkProcess/webrtc/NetworkRTCResolver.cpp
>+NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp
>+NetworkProcess/webrtc/NetworkRTCSocket.cpp
> 
> Platform/Logging.cpp
> Platform/Module.cpp
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index e235c22b76dcb717b77b3c3b91ea7dd2bbdcd206..c834db29aee73363a9971ef5dd6105937cf43d98 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -21,29 +21,29 @@
> // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
> // THE POSSIBILITY OF SUCH DAMAGE.
> 
>-NetworkProcess/cache/NetworkCacheDataCocoa.mm @no-unify
>-NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm @no-unify
>+NetworkProcess/cache/NetworkCacheDataCocoa.mm
>+NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
> 
>-NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm @no-unify
>-NetworkProcess/cocoa/NetworkDataTaskCocoa.mm @no-unify
>-NetworkProcess/cocoa/NetworkProcessCocoa.mm @no-unify
>-NetworkProcess/cocoa/NetworkSessionCocoa.mm @no-unify
>+NetworkProcess/cocoa/NetworkActivityTrackerCocoa.mm
>+NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>+NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+NetworkProcess/cocoa/NetworkSessionCocoa.mm
> 
>-NetworkProcess/Cookies/mac/WebCookieManagerMac.mm @no-unify
>+NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
> 
>-NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm @no-unify
>+NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
> 
>-NetworkProcess/Downloads/cocoa/DownloadCocoa.mm @no-unify
>+NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
> 
>-NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm @no-unify
>+NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
> 
>-NetworkProcess/ios/NetworkProcessIOS.mm @no-unify
>+NetworkProcess/ios/NetworkProcessIOS.mm
> 
>-NetworkProcess/mac/NetworkProcessMac.mm @no-unify
>-NetworkProcess/mac/RemoteNetworkingContext.mm @no-unify
>+NetworkProcess/mac/NetworkProcessMac.mm
>+NetworkProcess/mac/RemoteNetworkingContext.mm
> 
>-NetworkProcess/watchos/NetworkProximityAssertion.mm @no-unify
>-NetworkProcess/watchos/NetworkProximityManager.mm @no-unify
>+NetworkProcess/watchos/NetworkProximityAssertion.mm
>+NetworkProcess/watchos/NetworkProximityManager.mm
> 
> Platform/cf/ModuleCF.cpp
> 
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 6bd98ba4602cff129c24187fc3d2dd6642197da4..2d0d5cd85ccbd724baa3e16572ceb7e0eac94f18 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -803,7 +803,6 @@
> 		2DA944AF1884E9BA00ED86DB /* WebPageProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */; };
> 		2DA944B01884E9BA00ED86DB /* WebProcessProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */; };
> 		2DA944BA1884EA3C00ED86DB /* WebPageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944B61884EA3500ED86DB /* WebPageIOS.mm */; };
>-		2DA944BD188511E700ED86DB /* NetworkProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944BC188511E700ED86DB /* NetworkProcessIOS.mm */; };
> 		2DABA7721A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7711A817B1700EF0F1A /* WKPageRenderingProgressEventsInternal.h */; };
> 		2DABA7741A817EE600EF0F1A /* WKPluginLoadPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7731A817EE600EF0F1A /* WKPluginLoadPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		2DABA7761A82B42100EF0F1A /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DABA7751A82B42100EF0F1A /* APIHistoryClient.h */; };
>@@ -900,7 +899,6 @@
> 		330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934441315B9220097A7BC /* WebCookieManagerMessages.h */; };
> 		330934491315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934451315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp */; };
> 		3309344A1315B9220097A7BC /* WebCookieManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934461315B9220097A7BC /* WebCookieManagerProxyMessages.h */; };
>-		3309344F1315B94D0097A7BC /* WebCookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3309344C1315B94D0097A7BC /* WebCookieManager.cpp */; };
> 		330934501315B94D0097A7BC /* WebCookieManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3309344D1315B94D0097A7BC /* WebCookieManager.h */; };
> 		330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 330934521315B9750097A7BC /* WebCookieManagerProxy.cpp */; };
> 		330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 330934531315B9750097A7BC /* WebCookieManagerProxy.h */; };
>@@ -1004,10 +1002,7 @@
> 		3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FB08E421F60B240005E5312 /* iOS.xcassets */; };
> 		3FFDDB961F577F480050E593 /* WKFullScreenWindowControllerIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F915C0F1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.h */; };
> 		3FFDDB971F5780E10050E593 /* WKFullScreenWindowControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F915C0E1F564DED00183CE9 /* WKFullScreenWindowControllerIOS.mm */; };
>-		4103FBA52061C8FE00C2EAF8 /* NetworkLoadChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4103FBA22061BDB800C2EAF8 /* NetworkLoadChecker.cpp */; };
> 		410482CE1DDD324F00F006D0 /* RTCNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 410482CC1DDD2FB500F006D0 /* RTCNetwork.h */; };
>-		4112B5551FA0EA7A00E67875 /* NetworkRTCResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112B5471F9FD3AB00E67875 /* NetworkRTCResolver.cpp */; };
>-		4112B5551FA0EA7A00E67986 /* NetworkRTCResolverCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112B5471F9FD3AB00E67986 /* NetworkRTCResolverCocoa.cpp */; };
> 		4112EDDB20E407A500BEA92A /* com.apple.BocomSubmitCtrl.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4112EDD920E4077500BEA92A /* com.apple.BocomSubmitCtrl.sb */; };
> 		4112EDDC20E407A500BEA92A /* com.apple.NPSafeInput.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4112EDD820E4077500BEA92A /* com.apple.NPSafeInput.sb */; };
> 		4112EDDD20E407A500BEA92A /* com.apple.NPSafeSubmit.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4112EDD720E4077500BEA92A /* com.apple.NPSafeSubmit.sb */; };
>@@ -1017,8 +1012,6 @@
> 		411A8DDB20DDD1AC0060D34F /* WKMockMediaDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 411A8DD920DDB6050060D34F /* WKMockMediaDevice.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		411A8DDC20DDD23F0060D34F /* WKMockMediaDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411A8DDA20DDB6050060D34F /* WKMockMediaDevice.cpp */; };
> 		411B22641E371BA6004F7363 /* LibWebRTCNetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 411B22621E371244004F7363 /* LibWebRTCNetwork.h */; };
>-		413075A91DE85F2C0039EC69 /* NetworkRTCSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 413075981DE84FB00039EC69 /* NetworkRTCSocket.cpp */; };
>-		413075AA1DE85F300039EC69 /* NetworkRTCMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4130759A1DE84FB00039EC69 /* NetworkRTCMonitor.cpp */; };
> 		413075AB1DE85F330039EC69 /* NetworkRTCSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 413075991DE84FB00039EC69 /* NetworkRTCSocket.h */; };
> 		413075AC1DE85F370039EC69 /* NetworkRTCMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4130759B1DE84FB00039EC69 /* NetworkRTCMonitor.h */; };
> 		413075AD1DE85F580039EC69 /* LibWebRTCSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 413075A01DE85EE70039EC69 /* LibWebRTCSocket.h */; };
>@@ -1031,7 +1024,6 @@
> 		413075B41DE85F580039EC69 /* LibWebRTCProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 413075A81DE85EE70039EC69 /* LibWebRTCProvider.h */; };
> 		4131F3D11F96BCCC0059995A /* ServiceWorkerClientFetch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4131F3D01F96BCC80059995A /* ServiceWorkerClientFetch.cpp */; };
> 		4131F3E21F9880840059995A /* WebServiceWorkerFetchTaskClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4131F3E01F98712C0059995A /* WebServiceWorkerFetchTaskClient.cpp */; };
>-		4135FBD11F4FB8090074C47B /* CacheStorageEngineCaches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4135FBCF1F4FB7F20074C47B /* CacheStorageEngineCaches.cpp */; };
> 		413CCD5020DEBC740065A21A /* com.google.googletalkbrowserplugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 413CCD4F20DEBC2F0065A21A /* com.google.googletalkbrowserplugin.sb */; };
> 		4143751C20EAEA2D00FAD06C /* cn.microdone.cmb.safari.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 4143751B20EAEA1E00FAD06C /* cn.microdone.cmb.safari.sb */; };
> 		414DD37920BF43F5006959FB /* com.cisco.webex.plugin.gpc64.sb in Resources */ = {isa = PBXBuildFile; fileRef = 414DD37820BF43EA006959FB /* com.cisco.webex.plugin.gpc64.sb */; };
>@@ -1042,36 +1034,27 @@
> 		41897ECF1F415D620016FA42 /* WebCacheStorageConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41897ECE1F415D5C0016FA42 /* WebCacheStorageConnection.cpp */; };
> 		41897ED01F415D650016FA42 /* WebCacheStorageProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41897ECC1F415D5C0016FA42 /* WebCacheStorageProvider.cpp */; };
> 		41897ED11F415D680016FA42 /* WebCacheStorageConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 41897ECD1F415D5C0016FA42 /* WebCacheStorageConnection.h */; };
>-		41897ED71F415D8A0016FA42 /* CacheStorageEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41897ED61F415D860016FA42 /* CacheStorageEngine.cpp */; };
> 		41897ED81F415D8A0016FA42 /* CacheStorageEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 41897ED21F415D850016FA42 /* CacheStorageEngine.h */; };
>-		41897ED91F415D8A0016FA42 /* CacheStorageEngineConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41897ED31F415D850016FA42 /* CacheStorageEngineConnection.cpp */; };
> 		41897EDA1F415D8A0016FA42 /* CacheStorageEngineConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 41897ED41F415D850016FA42 /* CacheStorageEngineConnection.h */; };
>-		41C8581A1F5136CA0065E085 /* CacheStorageEngineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41C858191F510DEE0065E085 /* CacheStorageEngineCache.cpp */; };
> 		41D129DA1F3D101800D15E47 /* WebCacheStorageProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D129D91F3D101400D15E47 /* WebCacheStorageProvider.h */; };
> 		41DC45961E3D6E2200B11F51 /* NetworkRTCProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DC45941E3D6E1E00B11F51 /* NetworkRTCProvider.h */; };
>-		41DC45971E3D6E2200B11F51 /* NetworkRTCProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DC45951E3D6E1E00B11F51 /* NetworkRTCProvider.cpp */; };
>-		41DC459B1E3DBB2800B11F51 /* LibWebRTCSocketClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DC45991E3DBB2400B11F51 /* LibWebRTCSocketClient.cpp */; };
> 		41DC459C1E3DBB2800B11F51 /* LibWebRTCSocketClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DC459A1E3DBB2400B11F51 /* LibWebRTCSocketClient.h */; };
> 		41DC459E1E3DBDA100B11F51 /* WebRTCSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DC459D1E3DBCF000B11F51 /* WebRTCSocket.cpp */; };
> 		41DC459F1E3DBDA500B11F51 /* WebRTCSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F31E3BFE7F001AE678 /* WebRTCSocket.h */; };
> 		41DC45A11E3DC53F00B11F51 /* WebRTCResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DC45A01E3DC53C00B11F51 /* WebRTCResolver.cpp */; };
> 		41F12A9E2069BB4400FF26E8 /* WebMDNSRegister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41B7ED6E20681DCF0087D853 /* WebMDNSRegister.cpp */; };
>-		41F12A9F2069BB4C00FF26E8 /* NetworkMDNSRegister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41B7ED6F206965900087D853 /* NetworkMDNSRegister.cpp */; };
> 		41FABD2A1F4DE001006A6C97 /* CacheStorageEngineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FABD281F4DDFDC006A6C97 /* CacheStorageEngineCache.h */; };
> 		41FAF5F51E3C0649001AE678 /* WebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F41E3C0641001AE678 /* WebRTCResolver.h */; };
> 		41FAF5F81E3C1021001AE678 /* LibWebRTCResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 41FAF5F61E3C0B47001AE678 /* LibWebRTCResolver.h */; };
> 		41FAF5F91E3C1025001AE678 /* LibWebRTCResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FAF5F71E3C0B47001AE678 /* LibWebRTCResolver.cpp */; };
>-		41FBE826206DF7FA000F0741 /* NetworkContentRuleListManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41FBE824206DA79C000F0741 /* NetworkContentRuleListManager.cpp */; };
> 		460F488F1F996F7100CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 460F488D1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessageReceiver.cpp */; };
> 		460F48901F996F7100CF4B87 /* WebSWContextManagerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 460F488E1F996F6C00CF4B87 /* WebSWContextManagerConnectionMessages.h */; };
>-		462107D81F38DBDB00DD7810 /* PingLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 462107D71F38DBD300DD7810 /* PingLoad.cpp */; };
> 		463FD4801EB9459600A2982C /* WKProcessTerminationReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 463FD47F1EB9458400A2982C /* WKProcessTerminationReason.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		463FD4821EB94EC000A2982C /* ProcessTerminationReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 463FD4811EB94EAD00A2982C /* ProcessTerminationReason.h */; };
> 		466BC03B1FA266DA002FA9C1 /* WebSWContextManagerConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 466BC0381FA266C9002FA9C1 /* WebSWContextManagerConnection.cpp */; };
> 		466BC03C1FA266DA002FA9C1 /* WebSWContextManagerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 466BC0391FA266C9002FA9C1 /* WebSWContextManagerConnection.h */; };
> 		46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */; };
> 		46A2B6091E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */; };
>-		46DF063B1F3905F8001980BB /* NetworkCORSPreflightChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DF06391F3905E5001980BB /* NetworkCORSPreflightChecker.cpp */; };
> 		46DF063C1F3905F8001980BB /* NetworkCORSPreflightChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DF063A1F3905E5001980BB /* NetworkCORSPreflightChecker.h */; };
> 		4A3CC18A19B063E700D14AEF /* UserMediaPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */; };
> 		4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
>@@ -1141,7 +1124,6 @@
> 		512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */ = {isa = PBXBuildFile; fileRef = 512F58F412A88A5400629530 /* WKProtectionSpace.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */; };
> 		513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; };
>-		513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A16491630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp */; };
> 		513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */; };
> 		513E462D1AD837560016234A /* WKSharingServicePickerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */; };
> 		513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */; };
>@@ -1172,8 +1154,6 @@
> 		5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
> 		5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
> 		516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* APIError.h */; };
>-		51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */; };
>-		51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7DF16138E2900D03ED3 /* NetworkProcess.cpp */; };
> 		5179556A162876F300FA43B6 /* NetworkProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7E016138E2900D03ED3 /* NetworkProcess.h */; };
> 		5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7EA16138E7200D03ED3 /* NetworkProcessProxy.cpp */; };
> 		5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7EB16138E7200D03ED3 /* NetworkProcessProxy.h */; };
>@@ -1270,7 +1250,6 @@
> 		51FAEC3A1B0657630009C4E7 /* ChildProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */; };
> 		51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */; };
> 		51FB08FF1639DE1A00EC324A /* WebLoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF65616392F1500132A7A /* WebLoaderStrategy.cpp */; };
>-		51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */; };
> 		51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; };
> 		5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
> 		5272D4C91E735F0900EB4290 /* WKProtectionSpaceNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -1280,27 +1259,16 @@
> 		52D5A1B11C57496200DE34A3 /* VideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1AC1C57494E00DE34A3 /* VideoFullscreenManagerProxy.mm */; };
> 		52D5A1B71C574A0200DE34A3 /* VideoFullscreenManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1B41C5749F200DE34A3 /* VideoFullscreenManager.mm */; };
> 		52F060E11654318500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 52F060DD1654317500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp */; };
>-		5302583B1DCBBD2200DA89C2 /* NetworkCaptureResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5302582E1DCBBD1D00DA89C2 /* NetworkCaptureResource.cpp */; };
> 		5302583C1DCBBD2200DA89C2 /* NetworkCaptureResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302582F1DCBBD1D00DA89C2 /* NetworkCaptureResource.h */; };
>-		5302583D1DCBBD2200DA89C2 /* NetworkCaptureEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258301DCBBD1D00DA89C2 /* NetworkCaptureEvent.cpp */; };
> 		5302583E1DCBBD2200DA89C2 /* NetworkCaptureEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258311DCBBD1D00DA89C2 /* NetworkCaptureEvent.h */; };
> 		5302583F1DCBBD2200DA89C2 /* NetworkCaptureLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258321DCBBD1D00DA89C2 /* NetworkCaptureLogging.h */; };
>-		530258401DCBBD2200DA89C2 /* NetworkCaptureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258331DCBBD1D00DA89C2 /* NetworkCaptureManager.cpp */; };
> 		530258411DCBBD2200DA89C2 /* NetworkCaptureManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258341DCBBD1D00DA89C2 /* NetworkCaptureManager.h */; };
>-		530258421DCBBD2200DA89C2 /* NetworkCaptureRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258351DCBBD1D00DA89C2 /* NetworkCaptureRecorder.cpp */; };
> 		530258431DCBBD2200DA89C2 /* NetworkCaptureRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258361DCBBD1D00DA89C2 /* NetworkCaptureRecorder.h */; };
>-		530258441DCBBD2200DA89C2 /* NetworkCaptureReplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258371DCBBD1D00DA89C2 /* NetworkCaptureReplayer.cpp */; };
> 		530258451DCBBD2200DA89C2 /* NetworkCaptureReplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 530258381DCBBD1D00DA89C2 /* NetworkCaptureReplayer.h */; };
>-		530258461DCBBD2200DA89C2 /* NetworkDataTaskReplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530258391DCBBD1D00DA89C2 /* NetworkDataTaskReplay.cpp */; };
> 		530258471DCBBD2200DA89C2 /* NetworkDataTaskReplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 5302583A1DCBBD1D00DA89C2 /* NetworkDataTaskReplay.h */; };
>-		5315876C2076B762004BF9F3 /* NetworkActivityTrackerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5315876B2076B713004BF9F3 /* NetworkActivityTrackerCocoa.mm */; };
>-		532159531DBAE7180054AA3C /* NetworkSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 532159521DBAE6FC0054AA3C /* NetworkSession.cpp */; };
>-		532159541DBAE71D0054AA3C /* NetworkDataTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 532159511DBAE6FC0054AA3C /* NetworkDataTask.cpp */; };
> 		532159551DBAE7290054AA3C /* NetworkSessionCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 532159501DBAE6D70054AA3C /* NetworkSessionCocoa.h */; };
> 		532159561DBAE72D0054AA3C /* NetworkDataTaskCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5321594F1DBAE6D70054AA3C /* NetworkDataTaskCocoa.h */; };
> 		535BCB922069C49C00CCCE02 /* NetworkActivityTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */; };
>-		5379DB72207E9470007D8C33 /* NetworkActivityTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53F3CAA5206C443E0086490E /* NetworkActivityTracker.cpp */; };
>-		53BA47D01DC2EF5E004DF4AD /* NetworkDataTaskBlob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */; };
> 		53BA47D11DC2EF5E004DF4AD /* NetworkDataTaskBlob.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */; };
> 		53DEA3661DDE423100E82648 /* json.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 53DEA3651DDE422E00E82648 /* json.hpp */; };
> 		570AB8F320AE3BD700B8BE87 /* SecKeyProxyStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */; };
>@@ -1317,22 +1285,14 @@
> 		5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17741E7C879C00E9123C /* NetworkSocketStreamMessageReceiver.cpp */; };
> 		5C0B17791E7C882100E9123C /* WebSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17761E7C879C00E9123C /* WebSocketStreamMessageReceiver.cpp */; };
> 		5C0B177C1E7C885400E9123C /* WebSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177A1E7C884F00E9123C /* WebSocketStream.cpp */; };
>-		5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B177D1E7C886700E9123C /* NetworkSocketStream.cpp */; };
>-		5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */; };
> 		5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */; };
> 		5C1426EE1C23F80900D41183 /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E41C23F80500D41183 /* NetworkProcessSupplement.h */; };
>-		5C1426EF1C23F80900D41183 /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E51C23F80500D41183 /* NetworkResourceLoadParameters.cpp */; };
> 		5C1426F01C23F80900D41183 /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */; };
>-		5C1427011C23F84C00D41183 /* Download.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F31C23F84300D41183 /* Download.cpp */; };
> 		5C1427021C23F84C00D41183 /* Download.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F41C23F84300D41183 /* Download.h */; };
> 		5C1427051C23F84C00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F71C23F84300D41183 /* DownloadID.h */; };
>-		5C1427061C23F84C00D41183 /* DownloadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F81C23F84300D41183 /* DownloadManager.cpp */; };
> 		5C1427071C23F84C00D41183 /* DownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F91C23F84300D41183 /* DownloadManager.h */; };
>-		5C1427131C23F89E00D41183 /* DownloadCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C1427091C23F86900D41183 /* DownloadCocoa.mm */; };
> 		5C1427181C23F8B700D41183 /* LegacyCustomProtocolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1427141C23F8B000D41183 /* LegacyCustomProtocolManager.h */; };
>-		5C14271D1C23F8CF00D41183 /* LegacyCustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C14271B1C23F8CC00D41183 /* LegacyCustomProtocolManagerCocoa.mm */; };
> 		5C19A5201FD0B29500EEA323 /* URLSchemeTaskParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C19A51F1FD0B14700EEA323 /* URLSchemeTaskParameters.h */; };
>-		5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */; };
> 		5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
> 		5C26958520043212005C439B /* WKOpenPanelParametersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C26958420042F12005C439B /* WKOpenPanelParametersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5C298DA01C3DF02100470AFE /* PendingDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C298D9E1C3DEF2900470AFE /* PendingDownload.h */; };
>@@ -1340,7 +1300,6 @@
> 		5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5C6CE6D11F59BC7A0007C6CB /* PageClientImplCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */; };
> 		5C7706741D1138380012700F /* WebSocketProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7706731D111D8B0012700F /* WebSocketProvider.cpp */; };
>-		5C85C7881C3F23CE0061A4FA /* PendingDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C85C7861C3F23C50061A4FA /* PendingDownload.cpp */; };
> 		5C8DD37E1FE4502000F2A556 /* APIWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8DD37D1FE4501100F2A556 /* APIWebsitePolicies.cpp */; };
> 		5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */; };
> 		5C9E56821DF7F1AB00C9EE33 /* WKWebsitePolicies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C9E56801DF7F05500C9EE33 /* WKWebsitePolicies.cpp */; };
>@@ -1350,7 +1309,6 @@
> 		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 */; };
>-		5CBC9B8D1C65279C00A8FDCF /* NetworkDataTaskCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */; };
> 		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 */; };
>@@ -1361,7 +1319,6 @@
> 		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 */; };
>-		5CFECB041E1ED1CC00F88504 /* LegacyCustomProtocolManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CFECB031E1ED1C800F88504 /* LegacyCustomProtocolManager.cpp */; };
> 		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 */; };
>@@ -1458,7 +1415,6 @@
> 		7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
> 		7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		7CA3793E1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA3793D1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7CAB937A1D459E510070F540 /* NetworkCacheCodersCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAB93791D459E4B0070F540 /* NetworkCacheCodersCocoa.cpp */; };
> 		7CB100F11FA3858A001729EE /* WebPreferencesKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB100EE1FA2D74A001729EE /* WebPreferencesKeys.cpp */; };
> 		7CB100F21FA3858E001729EE /* WebPreferencesDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CDE73A31F9DAB6500390312 /* WebPreferencesDefinitions.h */; };
> 		7CB100F31FA3858E001729EE /* WebPreferencesKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB100EF1FA2D74B001729EE /* WebPreferencesKeys.h */; };
>@@ -1504,18 +1460,14 @@
> 		7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FF917275C57008ACB91 /* PageBanner.h */; };
> 		7CF47FFE17276AE3008ACB91 /* WKBundlePageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CF47FFC17276AE3008ACB91 /* WKBundlePageBannerMac.mm */; };
> 		7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7EC4F0F918E4A945008056AF /* NetworkProcessCocoa.mm */; };
> 		83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */; };
> 		8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 831042891BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h */; };
>-		8310428C1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8310428A1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp */; };
> 		8313F7EC1F7DAE0800B944EB /* SharedStringHashStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 8313F7E91F7DAE0300B944EB /* SharedStringHashStore.h */; };
> 		8313F7EE1F7DAE0800B944EB /* SharedStringHashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 8313F7E71F7DAE0300B944EB /* SharedStringHashTable.h */; };
> 		831EEBBD1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 831EEBBB1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.h */; };
>-		831EEBBE1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 831EEBBC1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.cpp */; };
> 		832994A71F96F50200AC57B1 /* WebSWOriginStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832994A51F96F4FD00AC57B1 /* WebSWOriginStore.cpp */; };
> 		832994A81F96F50200AC57B1 /* WebSWOriginStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 832994A61F96F4FE00AC57B1 /* WebSWOriginStore.h */; };
> 		832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */; };
>-		832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp */; };
> 		832ED18B1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832ED1891E2FE13B006BA64A /* PerActivityStateCPUUsageSampler.cpp */; };
> 		832ED18C1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 832ED18A1E2FE13B006BA64A /* PerActivityStateCPUUsageSampler.h */; };
> 		834B250F1A831A8D00CFB150 /* NetworkCacheFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */; };
>@@ -1531,15 +1483,12 @@
> 		83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */; };
> 		83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83891B6B1A68C30B0030F386 /* DiagnosticLoggingClient.mm */; };
> 		839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 839149631BEA838500D2D953 /* NetworkLoadParameters.h */; };
>-		839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839901FF1BE9A01B000F3653 /* NetworkLoad.cpp */; };
> 		839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */ = {isa = PBXBuildFile; fileRef = 839901FE1BE9A01B000F3653 /* NetworkLoad.h */; };
> 		839A2F311E2067450039057E /* HighPerformanceGraphicsUsageSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839A2F2F1E2067390039057E /* HighPerformanceGraphicsUsageSampler.cpp */; };
> 		839A2F321E2067450039057E /* HighPerformanceGraphicsUsageSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 839A2F301E2067390039057E /* HighPerformanceGraphicsUsageSampler.h */; };
>-		83A0ED341F747CCD003299EB /* PreconnectTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83A0ED331F747CC7003299EB /* PreconnectTask.cpp */; };
> 		83A0ED351F747CCF003299EB /* PreconnectTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A0ED321F747CC6003299EB /* PreconnectTask.h */; };
> 		83B3CB0F20E2AAFE00441E9B /* ResourceLoadStatisticsMemoryStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83681DCB20E2904B00C249CD /* ResourceLoadStatisticsMemoryStore.cpp */; };
> 		83B3CB1020E2AB0100441E9B /* ResourceLoadStatisticsMemoryStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 83681DCA20E2904A00C249CD /* ResourceLoadStatisticsMemoryStore.h */; };
>-		83BDCCB91AC5FDB6003F6441 /* NetworkCacheStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83BDCCB81AC5FDB6003F6441 /* NetworkCacheStatistics.cpp */; };
> 		83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D454D61BE9D3C4006C93BD /* NetworkLoadClient.h */; };
> 		83EE575B1DB7D61100C74C50 /* WebValidationMessageClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83EE57591DB7D60600C74C50 /* WebValidationMessageClient.cpp */; };
> 		83EE575C1DB7D61100C74C50 /* WebValidationMessageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83EE575A1DB7D60600C74C50 /* WebValidationMessageClient.h */; };
>@@ -1628,9 +1577,7 @@
> 		A1046EA22079263100F0C5D8 /* WKPDFView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1046EA02079263100F0C5D8 /* WKPDFView.mm */; };
> 		A105D0D1212734B20034F6C7 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = A105D0D0212734B10034F6C7 /* NetworkBlobRegistry.h */; };
> 		A11455AC211FCFCA00CA935B /* NetworkProximityAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AA211FCFCA00CA935B /* NetworkProximityAssertion.h */; };
>-		A11455AD211FCFCA00CA935B /* NetworkProximityAssertion.mm in Sources */ = {isa = PBXBuildFile; fileRef = A11455AB211FCFCA00CA935B /* NetworkProximityAssertion.mm */; };
> 		A11455B0211FD25200CA935B /* NetworkProximityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A11455AE211FD25200CA935B /* NetworkProximityManager.h */; };
>-		A11455B1211FD25200CA935B /* NetworkProximityManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A11455AF211FD25200CA935B /* NetworkProximityManager.mm */; };
> 		A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */ = {isa = PBXBuildFile; fileRef = A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */; };
> 		A115DC72191D82DA00DA8072 /* _WKWebViewPrintFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A118A9EF1907AD6F00F7C92B /* QuickLookDocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = A118A9ED1907AD6F00F7C92B /* QuickLookDocumentData.h */; };
>@@ -1890,7 +1837,6 @@
> 		BC8147D512F66D31007B2C32 /* InjectedBundleNavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */; };
> 		BC8147D612F66D31007B2C32 /* InjectedBundleNavigationAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8147D412F66D31007B2C32 /* InjectedBundleNavigationAction.cpp */; };
> 		BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; };
>-		BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; };
> 		BC8283DA16B4DB9300A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
> 		BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283EF16B4F8E200A278FE /* PluginServiceEntryPoint.mm */; };
> 		BC82844F16B5089800A278FE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
>@@ -2116,7 +2062,6 @@
> 		E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */; };
> 		E115C716190F8A2500ECC516 /* com.apple.WebKit.Storage.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Storage.sb */; };
> 		E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
>-		E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
> 		E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
> 		E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */; };
> 		E1513C67166EABB200149FCB /* ChildProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E1513C65166EABB200149FCB /* ChildProcessProxy.h */; };
>@@ -2126,7 +2071,6 @@
> 		E170876B16D6CA6900F99226 /* BlobRegistryProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E170876916D6CA6900F99226 /* BlobRegistryProxy.cpp */; };
> 		E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E170876A16D6CA6900F99226 /* BlobRegistryProxy.h */; };
> 		E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6948169B77C8009B6670 /* SecItemShim.h */; };
>-		E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1798C7716E6818800240139 /* NetworkBlobRegistry.cpp */; };
> 		E179FD9C134D38060015B883 /* ArgumentCodersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E179FD9B134D38060015B883 /* ArgumentCodersMac.h */; };
> 		E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */; };
> 		E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6909169B563F009B6670 /* SecItemShimProxy.cpp */; };
>@@ -2139,30 +2083,19 @@
> 		E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */; };
> 		E1AEA23014687BDB00804569 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */; };
> 		E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B78470163F24690007B692 /* RemoteNetworkingContext.h */; };
>-		E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */; };
> 		E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = E1CC1B8E12D7EADF00625838 /* PrintInfo.h */; };
> 		E1D26A53175964D90095BFD1 /* WebContentProcess.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */; };
> 		E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */; };
> 		E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
> 		E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; };
> 		E413F59D1AC1ADC400345360 /* NetworkCacheEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */; };
>-		E413F59F1AC1AF9D00345360 /* NetworkCacheEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */; };
>-		E42E060F1AA7523400B11699 /* NetworkCacheIOChannelCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E42E060D1AA750E500B11699 /* NetworkCacheIOChannelCocoa.mm */; };
> 		E42E06101AA7523B00B11699 /* NetworkCacheIOChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = E42E060B1AA7440D00B11699 /* NetworkCacheIOChannel.h */; };
> 		E42E06121AA75ABD00B11699 /* NetworkCacheData.h in Headers */ = {isa = PBXBuildFile; fileRef = E42E06111AA75ABD00B11699 /* NetworkCacheData.h */; };
>-		E42E06141AA75B7000B11699 /* NetworkCacheDataCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = E42E06131AA75B7000B11699 /* NetworkCacheDataCocoa.mm */; };
>-		E4436ECA1A0D03FA00EAD204 /* NetworkCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EBE1A0CFDB200EAD204 /* NetworkCache.cpp */; };
> 		E4436ECC1A0D040B00EAD204 /* NetworkCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EBF1A0CFDB200EAD204 /* NetworkCache.h */; };
>-		E4436ECD1A0D040B00EAD204 /* NetworkCacheKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC01A0CFDB200EAD204 /* NetworkCacheKey.cpp */; };
> 		E4436ECE1A0D040B00EAD204 /* NetworkCacheKey.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */; };
> 		E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */; };
>-		E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */; };
>-		E4697CCD1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4697CCC1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp */; };
>-		E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */; };
>-		E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */; };
> 		E489D28C1A0A2DB80078C06A /* NetworkCacheCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */; };
> 		E49D40D71AD3FB170066B7B9 /* NetworkCacheBlobStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E49D40D61AD3FB170066B7B9 /* NetworkCacheBlobStorage.h */; };
>-		E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49D40D81AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp */; };
> 		E4E864921B16750100C82F40 /* VersionChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E8648F1B1673FB00C82F40 /* VersionChecks.mm */; };
> 		E4E864931B16750700C82F40 /* VersionChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E8648E1B1673FB00C82F40 /* VersionChecks.h */; };
> 		E52CF55220A35C3A00DADA27 /* WebDataListSuggestionPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = E52CF55020A35C3A00DADA27 /* WebDataListSuggestionPicker.h */; };
>@@ -2195,7 +2128,6 @@
> 		F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
> 		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 */; };
>-		F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */; };
> 		F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */; };
> 		FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */; };
> 		FEDBDCD61E68D20000A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDBDCD41E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp */; };
>@@ -11210,20 +11142,13 @@
> 				990D28BC1C6539DA00986977 /* AutomationSessionClient.mm in Sources */,
> 				46A2B6081E5676A600C3DEDA /* BackgroundProcessResponsivenessTimer.cpp in Sources */,
> 				E170876B16D6CA6900F99226 /* BlobRegistryProxy.cpp in Sources */,
>-				41897ED71F415D8A0016FA42 /* CacheStorageEngine.cpp in Sources */,
>-				41C8581A1F5136CA0065E085 /* CacheStorageEngineCache.cpp in Sources */,
>-				4135FBD11F4FB8090074C47B /* CacheStorageEngineCaches.cpp in Sources */,
>-				41897ED91F415D8A0016FA42 /* CacheStorageEngineConnection.cpp in Sources */,
> 				517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */,
> 				51FAEC3B1B0657680009C4E7 /* ChildProcessMessageReceiver.cpp in Sources */,
> 				E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
> 				B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
> 				83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */,
> 				C1817363205844A900DFDA65 /* DisplayLink.cpp in Sources */,
>-				5C1427011C23F84C00D41183 /* Download.cpp in Sources */,
> 				A1DF631218E0B7C8003A3E2A /* DownloadClient.mm in Sources */,
>-				5C1427131C23F89E00D41183 /* DownloadCocoa.mm in Sources */,
>-				5C1427061C23F84C00D41183 /* DownloadManager.cpp in Sources */,
> 				1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */,
> 				1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */,
> 				1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */,
>@@ -11273,9 +11198,7 @@
> 				1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
> 				0F0C365E18C110A500F607D7 /* LayerRepresentation.mm in Sources */,
> 				1AFDE64519510B5500C48FFA /* LegacyBundleForClass.mm in Sources */,
>-				5CFECB041E1ED1CC00F88504 /* LegacyCustomProtocolManager.cpp in Sources */,
> 				7A821F4E1E2F67A800604577 /* LegacyCustomProtocolManagerClient.mm in Sources */,
>-				5C14271D1C23F8CF00D41183 /* LegacyCustomProtocolManagerCocoa.mm in Sources */,
> 				2984F588164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp in Sources */,
> 				7A821F4A1E2F65E900604577 /* LegacyCustomProtocolManagerProxy.cpp in Sources */,
> 				2984F57C164B915F004BC0C6 /* LegacyCustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
>@@ -11283,7 +11206,6 @@
> 				413075B31DE85F580039EC69 /* LibWebRTCProvider.cpp in Sources */,
> 				41FAF5F91E3C1025001AE678 /* LibWebRTCResolver.cpp in Sources */,
> 				413075AE1DE85F580039EC69 /* LibWebRTCSocket.cpp in Sources */,
>-				41DC459B1E3DBB2800B11F51 /* LibWebRTCSocketClient.cpp in Sources */,
> 				413075B11DE85F580039EC69 /* LibWebRTCSocketFactory.cpp in Sources */,
> 				1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
> 				1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
>@@ -11294,70 +11216,18 @@
> 				1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */,
> 				1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */,
> 				1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */,
>-				5379DB72207E9470007D8C33 /* NetworkActivityTracker.cpp in Sources */,
>-				5315876C2076B762004BF9F3 /* NetworkActivityTrackerCocoa.mm in Sources */,
>-				E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */,
>-				E4436ECA1A0D03FA00EAD204 /* NetworkCache.cpp in Sources */,
>-				E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */,
>-				E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */,
>-				7CAB937A1D459E510070F540 /* NetworkCacheCodersCocoa.cpp in Sources */,
>-				E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */,
>-				E42E06141AA75B7000B11699 /* NetworkCacheDataCocoa.mm in Sources */,
>-				E413F59F1AC1AF9D00345360 /* NetworkCacheEntry.cpp in Sources */,
>-				E4697CCD1B25EB8F001B0A6C /* NetworkCacheFileSystem.cpp in Sources */,
>-				E42E060F1AA7523400B11699 /* NetworkCacheIOChannelCocoa.mm in Sources */,
>-				E4436ECD1A0D040B00EAD204 /* NetworkCacheKey.cpp in Sources */,
>-				831EEBBE1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.cpp in Sources */,
>-				832AE2531BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp in Sources */,
>-				83BDCCB91AC5FDB6003F6441 /* NetworkCacheStatistics.cpp in Sources */,
>-				E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */,
>-				8310428C1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp in Sources */,
>-				5302583D1DCBBD2200DA89C2 /* NetworkCaptureEvent.cpp in Sources */,
>-				530258401DCBBD2200DA89C2 /* NetworkCaptureManager.cpp in Sources */,
>-				530258421DCBBD2200DA89C2 /* NetworkCaptureRecorder.cpp in Sources */,
>-				530258441DCBBD2200DA89C2 /* NetworkCaptureReplayer.cpp in Sources */,
>-				5302583B1DCBBD2200DA89C2 /* NetworkCaptureResource.cpp in Sources */,
>-				513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */,
> 				51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */,
>-				41FBE826206DF7FA000F0741 /* NetworkContentRuleListManager.cpp in Sources */,
> 				52F060E11654318500F3281B /* NetworkContentRuleListManagerMessageReceiver.cpp in Sources */,
>-				46DF063B1F3905F8001980BB /* NetworkCORSPreflightChecker.cpp in Sources */,
>-				532159541DBAE71D0054AA3C /* NetworkDataTask.cpp in Sources */,
>-				53BA47D01DC2EF5E004DF4AD /* NetworkDataTaskBlob.cpp in Sources */,
>-				5CBC9B8D1C65279C00A8FDCF /* NetworkDataTaskCocoa.mm in Sources */,
>-				530258461DCBBD2200DA89C2 /* NetworkDataTaskReplay.cpp in Sources */,
>-				839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */,
>-				4103FBA52061C8FE00C2EAF8 /* NetworkLoadChecker.cpp in Sources */,
>-				41F12A9F2069BB4C00FF26E8 /* NetworkMDNSRegister.cpp in Sources */,
> 				51F060E11654318500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp in Sources */,
>-				51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */,
>-				7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */,
> 				5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */,
> 				517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */,
>-				5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */,
>-				2DA944BD188511E700ED86DB /* NetworkProcessIOS.mm in Sources */,
>-				51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */,
> 				5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */,
>-				E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */,
> 				5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */,
> 				513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
>-				A11455AD211FCFCA00CA935B /* NetworkProximityAssertion.mm in Sources */,
>-				A11455B1211FD25200CA935B /* NetworkProximityManager.mm in Sources */,
>-				51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
> 				E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
>-				5C1426EF1C23F80900D41183 /* NetworkResourceLoadParameters.cpp in Sources */,
>-				413075AA1DE85F300039EC69 /* NetworkRTCMonitor.cpp in Sources */,
> 				51F060E11654318500F3281E /* NetworkRTCMonitorMessageReceiver.cpp in Sources */,
>-				41DC45971E3D6E2200B11F51 /* NetworkRTCProvider.cpp in Sources */,
> 				51F060E11654318500F3282E /* NetworkRTCProviderMessageReceiver.cpp in Sources */,
>-				4112B5551FA0EA7A00E67875 /* NetworkRTCResolver.cpp in Sources */,
>-				4112B5551FA0EA7A00E67986 /* NetworkRTCResolverCocoa.cpp in Sources */,
>-				413075A91DE85F2C0039EC69 /* NetworkRTCSocket.cpp in Sources */,
> 				51F060E11654318500F3281D /* NetworkRTCSocketMessageReceiver.cpp in Sources */,
>-				BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
>-				532159531DBAE7180054AA3C /* NetworkSession.cpp in Sources */,
>-				5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
>-				5C0B17811E7C8C2600E9123C /* NetworkSocketStream.cpp in Sources */,
> 				5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */,
> 				3131261E148FF82C00BA2A39 /* NotificationPermissionRequestManager.cpp in Sources */,
> 				31A2EC501489980500810D71 /* NotificationPermissionRequestManagerProxy.cpp in Sources */,
>@@ -11376,9 +11246,7 @@
> 				2D2ADF1016364D8200197E47 /* PDFPluginChoiceAnnotation.mm in Sources */,
> 				2D429BFD1721E2C700EC681F /* PDFPluginPasswordField.mm in Sources */,
> 				2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
>-				5C85C7881C3F23CE0061A4FA /* PendingDownload.cpp in Sources */,
> 				832ED18B1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.cpp in Sources */,
>-				462107D81F38DBDB00DD7810 /* PingLoad.cpp in Sources */,
> 				0F5E200318E77051003EC3E5 /* PlatformCAAnimationRemote.mm in Sources */,
> 				2DA049B3180CCCD300AAFA9E /* PlatformCALayerRemote.cpp in Sources */,
> 				2D8710161828415D0018FA01 /* PlatformCALayerRemoteCustom.mm in Sources */,
>@@ -11412,7 +11280,6 @@
> 				1A8EFA701252B84100F7067F /* PluginProxyMessageReceiver.cpp in Sources */,
> 				BC82844D16B5081C00A278FE /* PluginServiceEntryPoint.mm in Sources */,
> 				1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */,
>-				83A0ED341F747CCD003299EB /* PreconnectTask.cpp in Sources */,
> 				37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */,
> 				86F9536418FF583C001DB2EF /* ProcessAssertionIOS.mm in Sources */,
> 				1AE117F611DBB30900981615 /* ProcessLauncher.cpp in Sources */,
>@@ -11426,7 +11293,6 @@
> 				1AA3D75B1651B44F008713D0 /* RemoteLayerTreeHost.mm in Sources */,
> 				0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */,
> 				0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */,
>-				E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */,
> 				1A5704FB1BE1751100874AF1 /* RemoteObjectInvocation.mm in Sources */,
> 				1AC1337F18590AE400F3EC05 /* RemoteObjectRegistry.mm in Sources */,
> 				1AC1338518590C4600F3EC05 /* RemoteObjectRegistryMessageReceiver.cpp in Sources */,
>@@ -11689,8 +11555,6 @@
> 				A1EA023F1DAC31DB0096021F /* WebContextMenuListenerProxy.cpp in Sources */,
> 				51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */,
> 				51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */,
>-				3309344F1315B94D0097A7BC /* WebCookieManager.cpp in Sources */,
>-				F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,
> 				330934471315B9220097A7BC /* WebCookieManagerMessageReceiver.cpp in Sources */,
> 				330934551315B9750097A7BC /* WebCookieManagerProxy.cpp in Sources */,
> 				33AA1066131F060000D4A575 /* WebCookieManagerProxyClient.cpp in Sources */,

Actions: View | Formatted Diff | Diff

Attachments on bug 188719: 347438 | 347454