Attachment 338830 Details for Bug 185011 – Patch

[patch] Patch

bug-185011-20180425190312.patch (text/plain), 27.74 KB, created by Michael Catanzaro on 2018-04-25 17:03:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-04-25 17:03:13 PDT

Size: 27.74 KB

patch

obsolete

>Subversion Revision: 231014
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8df44d7843f190a8c92fbed89d6744f727cb01f8..0f5813d9019263dda81a606a89b3e454a2ee4d12 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,42 @@
>+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Use unified build for NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=185011
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * NetworkProcess/Cookies/WebCookieManager.cpp:
>+        * 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/NetworkLoadChecker.cpp:
>+        * NetworkProcess/NetworkProcess.cpp:
>+        * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
>+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        * NetworkProcess/NetworkSession.cpp:
>+        * NetworkProcess/NetworkSocketStream.cpp:
>+        * NetworkProcess/PingLoad.cpp:
>+        * NetworkProcess/cache/CacheStorageEngine.cpp:
>+        * NetworkProcess/cache/CacheStorageEngineCache.cpp:
>+        * NetworkProcess/cache/CacheStorageEngineCaches.cpp:
>+        * NetworkProcess/cache/CacheStorageEngineConnection.cpp:
>+        * NetworkProcess/cache/NetworkCache.cpp:
>+        * NetworkProcess/capture/NetworkCaptureEvent.cpp:
>+        * NetworkProcess/capture/NetworkCaptureManager.cpp:
>+        * NetworkProcess/capture/NetworkCaptureRecorder.cpp:
>+        * NetworkProcess/capture/NetworkCaptureReplayer.cpp:
>+        * NetworkProcess/capture/NetworkDataTaskReplay.cpp:
>+        * NetworkProcess/webrtc/NetworkMDNSRegister.cpp:
>+        * Sources.txt: Added.
>+
> 2018-04-25  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Fix entitlements and sandbox configurations in WebKit after r230778
>diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
>index b9398200c69e86f14dc596fbea52a054770495cd..3afeea248af23d98a9b1b7135cf6de1b41a6ed38 100644
>--- a/Source/WebKit/CMakeLists.txt
>+++ b/Source/WebKit/CMakeLists.txt
>@@ -96,58 +96,11 @@ set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
>     ${ICU_INCLUDE_DIRS}
> )
> 
>-set(WebKit_SOURCES
>-    NetworkProcess/Cookies/WebCookieManager.cpp
>-
>-    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/NetworkProcessCreationParameters.cpp
>-    NetworkProcess/NetworkProcessPlatformStrategies.cpp
>-    NetworkProcess/NetworkResourceLoadParameters.cpp
>-    NetworkProcess/NetworkResourceLoader.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/NetworkCacheData.cpp
>-    NetworkProcess/cache/NetworkCacheEntry.cpp
>-    NetworkProcess/cache/NetworkCacheFileSystem.cpp
>-    NetworkProcess/cache/NetworkCacheKey.cpp
>-    NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>-    NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>-    NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
>-    NetworkProcess/cache/NetworkCacheStatistics.cpp
>-    NetworkProcess/cache/NetworkCacheStorage.cpp
>-
>-    NetworkProcess/capture/NetworkCaptureEvent.cpp
>-    NetworkProcess/capture/NetworkCaptureManager.cpp
>-    NetworkProcess/capture/NetworkCaptureRecorder.cpp
>-    NetworkProcess/capture/NetworkCaptureReplayer.cpp
>-    NetworkProcess/capture/NetworkCaptureResource.cpp
>-    NetworkProcess/capture/NetworkDataTaskReplay.cpp
>-
>-    NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>+list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
>+    "Sources.txt"
>+)
> 
>+set(WebKit_SOURCES
>     Platform/Logging.cpp
>     Platform/Module.cpp
> 
>diff --git a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>index fe92bc1c98fff3cf76038426cb9795c1cee88205..bfb50e07de194fbfcfda202fa9713ed1cd3a0518 100644
>--- a/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>+++ b/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp
>@@ -39,9 +39,8 @@
> #include <wtf/text/StringHash.h>
> #include <wtf/text/WTFString.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> const char* WebCookieManager::supplementName()
> {
>diff --git a/Source/WebKit/NetworkProcess/Downloads/Download.cpp b/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>index 9a0677e177e50f9f8d34d8f071f274c9cb2aba66..c357d8c2aacc06d2e2eb0be8d143f0f7d6d77172 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/Download.cpp
>@@ -43,11 +43,10 @@
> #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 {
>+using namespace WebCore;
> 
> Download::Download(DownloadManager& downloadManager, DownloadID downloadID, NetworkDataTask& download, const PAL::SessionID& sessionID, const String& suggestedName)
>     : m_downloadManager(downloadManager)
>@@ -182,3 +181,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..630cea568e082b6f14778d4ed900b931ff9fcd56 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp
>@@ -36,9 +36,8 @@
> #include <pal/SessionID.h>
> #include <wtf/StdLibExtras.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> DownloadManager::DownloadManager(Client& client)
>     : m_client(client)
>diff --git a/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp b/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>index 203428cd2e37993a7ca8f61dd784a99548b52617..f9c8d28248415b635076835b325cd790c2dc01fa 100644
>--- a/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>+++ b/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp
>@@ -32,9 +32,8 @@
> #include "NetworkProcess.h"
> #include "WebCoreArgumentCoders.h"
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
>     : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
>diff --git a/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp b/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>index f0824d736be2fcbccf1fb01a012bd7db7bffed48..fda8b9115fea584f18b4e00c0a681a27d3b84c29 100644
>--- a/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>+++ b/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
>@@ -34,9 +34,8 @@
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> NetworkBlobRegistry& NetworkBlobRegistry::singleton()
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>index 973263d6e9483d2c40914ce3d38de948d3406f0a..4aca7ad41d862afaa8ecc416b099bf38b5a61695 100644
>--- a/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp
>@@ -133,3 +133,5 @@ void NetworkCORSPreflightChecker::cannotShowURL()
> }
> 
> } // Namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index c13903df9183c8cbf9a6d89d8001560d8a1b8444..136e8e202617c5cf5c54703e72ef285027802c20 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -59,9 +59,8 @@
> #include <WebCore/SecurityPolicy.h>
> #include <pal/SessionID.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> Ref<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(IPC::Connection::Identifier connectionIdentifier)
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>index c56a5577d5df7efb74238bd24daf62a357dc4ad9..e37ae76fd68f6bae4cd5f0ff92bb2e6de8d63fd9 100644
>--- a/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp
>@@ -32,9 +32,8 @@
> #include "NetworkProcessProxyMessages.h"
> #include "WebCompiledContentRuleList.h"
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> NetworkContentRuleListManager::NetworkContentRuleListManager() = default;
> NetworkContentRuleListManager::~NetworkContentRuleListManager()
>diff --git a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>index 16bfbd2f0822ba803d756f7f5ca3c99d39d6a19b..aa1195c965d9d2d1ec36ed41703e24ce2a254e59 100644
>--- a/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkDataTask.cpp
>@@ -44,9 +44,8 @@
> #include "NetworkDataTaskCurl.h"
> #endif
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>index 6e1d6fc7e73be0b7a3218f8d75dde3afa03fba01..47b43c5674265aa7f8b654c5f1715cc49e6d84fd 100644
>--- a/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp
>@@ -52,9 +52,8 @@
> #include <wtf/MainThread.h>
> #include <wtf/RunLoop.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> static const unsigned bufferSize = 512 * 1024;
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>index 50efd7aabd6d6bf755c1ed0f15f8d04d9cec9982..833d2b00e883330bf29e9f511cfd0917d99739c0 100644
>--- a/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp
>@@ -323,3 +323,5 @@ void NetworkLoadChecker::processContentExtensionRulesForLoad(ResourceRequest&& r
> #endif // ENABLE(CONTENT_EXTENSIONS)
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 3b0ff20185115445ba81e870b4295057d536db90..3f7e3ec8fa09c27d6927ba78c5dd844ca5e44820 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -96,9 +96,8 @@
> #include "NetworkSessionCocoa.h"
> #endif
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> NetworkProcess& NetworkProcess::singleton()
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp b/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>index e6d679f8fef8bbc5e5beba3d362d197e4f5b9a42..ef8f52cad665669fc678da6b94ce0482f6b5ccb6 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp
>@@ -29,9 +29,8 @@
> #include <WebCore/BlobRegistryImpl.h>
> #include <wtf/NeverDestroyed.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> void NetworkProcessPlatformStrategies::initialize()
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>index 07e8e71dc3eb8f7555dc06c0df42ff6d6f0aae0f..24d8a85dcc4bd32be0e1cda6d1eb078c860eed82 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
>@@ -31,9 +31,8 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/SecurityOriginData.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index c23eca442a81591200d12e377baa42b3a67246e0..93884666c17e13af46cd4b57a851cb7f5d0a7040 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -58,12 +58,11 @@
> #include <WebCore/PlatformCookieJar.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__)
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> struct NetworkResourceLoader::SynchronousLoadData {
>     SynchronousLoadData(RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>&& reply)
>@@ -1048,3 +1047,6 @@ void NetworkResourceLoader::logCookieInformation(const String& label, const void
> #endif
> 
> } // 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 7b47cbf71820ba72ebf8aaebb967301093d0784c..fab023fdff9ef4c82d97b91341ac3c08dc808d24 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSession.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSession.cpp
>@@ -41,10 +41,8 @@
> #include "NetworkSessionCurl.h"
> #endif
> 
>-
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> Ref<NetworkSession> NetworkSession::create(NetworkSessionCreationParameters&& parameters)
> {
>diff --git a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>index 8a77e46be367b34e5470fe4920c4eb2f8a8fffe4..42d36bc4cc3fe432f3524c83b0c9f884e8d7443c 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp
>@@ -32,9 +32,8 @@
> #include <WebCore/SocketStreamError.h>
> #include <WebCore/SocketStreamHandleImpl.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> Ref<NetworkSocketStream> NetworkSocketStream::create(WebCore::URL&& url, PAL::SessionID sessionID, const String& credentialPartition, uint64_t identifier, IPC::Connection& connection, SourceApplicationAuditToken&& auditData)
> {
>diff --git a/Source/WebKit/NetworkProcess/PingLoad.cpp b/Source/WebKit/NetworkProcess/PingLoad.cpp
>index 4d0951d3306b06fb23322db061aafed1b582703e..eaf99721b309a9de11c1dce847447ceefed552b9 100644
>--- a/Source/WebKit/NetworkProcess/PingLoad.cpp
>+++ b/Source/WebKit/NetworkProcess/PingLoad.cpp
>@@ -164,3 +164,5 @@ const URL& PingLoad::currentURL() const
> }
> 
> } // namespace WebKit
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>index 45c47a1be40451a2492721c98fcf9460af62b99a..9b2e890c3f8bd86c7ef228c5eb004df33a976319 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>@@ -39,13 +39,13 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/StringHash.h>
> 
>-using namespace WebCore::DOMCacheEngine;
>-using namespace WebKit::NetworkCache;
>-
> namespace WebKit {
> 
> namespace CacheStorage {
> 
>+using namespace WebCore::DOMCacheEngine;
>+using namespace NetworkCache;
>+
> static HashMap<PAL::SessionID, RefPtr<Engine>>& globalEngineMap()
> {
>     static NeverDestroyed<HashMap<PAL::SessionID, RefPtr<Engine>>> map;
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>index d7ed89acc4817200be7630b7d2b76f5eda894f94..fab7e515e66470bffe0e0506ad43e2b6c3f469a0 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp
>@@ -43,15 +43,14 @@
> #include <wtf/text/StringBuilder.h>
> #include <wtf/text/StringHash.h>
> 
>-
>-using namespace WebCore;
>-using namespace WebCore::DOMCacheEngine;
>-using namespace WebKit::NetworkCache;
>-
> namespace WebKit {
> 
> namespace CacheStorage {
> 
>+using namespace WebCore;
>+using namespace WebCore::DOMCacheEngine;
>+using namespace NetworkCache;
>+
> static inline String computeKeyURL(const URL& url)
> {
>     URL keyURL { url };
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp
>index cd1c24acbacc69320115c52fa1d94cc7921eab27..796d39dfbccd43595b15da948d59f74bedb98159 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp
>@@ -33,12 +33,11 @@
> #include <wtf/UUID.h>
> #include <wtf/text/StringBuilder.h>
> 
>-using namespace WebCore::DOMCacheEngine;
>-using namespace WebKit::NetworkCache;
>-
> namespace WebKit {
> 
> namespace CacheStorage {
>+using namespace WebCore::DOMCacheEngine;
>+using namespace NetworkCache;
> 
> static inline String cachesListFilename(const String& cachesRootPath)
> {
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>index 535f05ad2adf93ae7e7649b2ebfd29bf8808b02b..070de2a3a24e5483b78a470970e2ad7253ceaa35 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp
>@@ -33,10 +33,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/CacheQueryOptions.h>
> 
>-using namespace WebCore::DOMCacheEngine;
>-using namespace WebKit::CacheStorage;
>-
> namespace WebKit {
>+using namespace WebCore::DOMCacheEngine;
>+using namespace CacheStorage;
> 
> #define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), CacheStorage, "%p - CacheStorageEngineConnection::" fmt, &m_connection.connection(), ##__VA_ARGS__)
> #define RELEASE_LOG_FUNCTION_IF_ALLOWED_IN_CALLBACK(functionName, fmt, resultGetter) \
>@@ -164,3 +163,6 @@ void CacheStorageEngineConnection::engineRepresentation(PAL::SessionID sessionID
> }
> 
> }
>+
>+#undef RELEASE_LOG_IF_ALLOWED
>+#undef RELEASE_LOG_FUNCTION_IF_ALLOWED_IN_CALLBACK
>diff --git a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
>index 73a25f4d2f7bc112fd2680100afb0962ac30fd10..9e5abafb8d61903d41f7372c8852b673eafaa9c9 100644
>--- a/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
>@@ -48,11 +48,11 @@
> #include <notify.h>
> #endif
> 
>-using namespace WebCore::FileSystem;
>-
> namespace WebKit {
> namespace NetworkCache {
> 
>+using namespace WebCore::FileSystem;
>+
> static const AtomicString& resourceType()
> {
>     ASSERT(WTF::RunLoop::isMain());
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp
>index fa4ed1a3d36bc83fa50fefd1dcc8797d2efc6488..966168b4e0781248e55681ff4b777e6e16030945 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp
>@@ -504,4 +504,6 @@ OptionalCaptureEvent stringToEvent(const char* jsonStr)
> } // namespace NetworkCapture
> } // namespace WebKit
> 
>+#undef JSON_NOEXCEPTIONS
>+
> #endif // ENABLE(NETWORK_CAPTURE)
>diff --git a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>index 5613be882fd6cde9eded10427c52f4af534b1764..0c0a5015294481512f7399c3003ae6b41c9ca364 100644
>--- a/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>+++ b/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp
>@@ -42,11 +42,11 @@
> 
> #define DEBUG_CLASS Manager
> 
>-using namespace WebCore::FileSystem;
>-
> namespace WebKit {
> namespace NetworkCapture {
> 
>+using namespace WebCore::FileSystem;
>+
> static const char* kDirNameRecordReplay = "WebKitPerf/record_replay";
> static const char* kDirNameResources = "resources";
> static const char* kFileNameReportLoad = "report_load.txt";
>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/webrtc/NetworkMDNSRegister.cpp b/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>index 8f9ca1065d193052403616b77780af98c0d910f9..07f69f845fa73c1371fc96e319a9307c602b828a 100644
>--- a/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>+++ b/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp
>@@ -34,9 +34,8 @@
> #include <pal/SessionID.h>
> #include <wtf/UUID.h>
> 
>-using namespace WebCore;
>-
> namespace WebKit {
>+using namespace WebCore;
> 
> #define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkMDNSRegister::" fmt, this, ##__VA_ARGS__)
> #define RELEASE_LOG_IF_ALLOWED_IN_CALLBACK(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "NetworkMDNSRegister callback - " fmt, ##__VA_ARGS__)
>@@ -258,4 +257,7 @@ void NetworkMDNSRegister::resolveMDNSName(uint64_t requestIdentifier, PAL::Sessi
> 
> } // namespace WebKit
> 
>+#undef RELEASE_LOG_IF_ALLOWED
>+#undef RELEASE_LOG_IF_ALLOWED_IN_CALLBACK
>+
> #endif // ENABLE(WEB_RTC)
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7312e937e92bad6642f10c75d15b214e6676b8d5
>--- /dev/null
>+++ b/Source/WebKit/Sources.txt
>@@ -0,0 +1,73 @@
>+// Copyright (C) 2018 Igalia S.L.
>+//
>+// Redistribution and use in source and binary forms, with or without
>+// modification, are permitted provided that the following conditions
>+// are met:
>+// 1. Redistributions of source code must retain the above copyright
>+//    notice, this list of conditions and the following disclaimer.
>+// 2. Redistributions in binary form must reproduce the above copyright
>+//    notice, this list of conditions and the following disclaimer in the
>+//    documentation and/or other materials provided with the distribution.
>+//
>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+// THE POSSIBILITY OF SUCH DAMAGE.
>+
>+NetworkProcess/Cookies/WebCookieManager.cpp
>+
>+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/NetworkProcessCreationParameters.cpp
>+NetworkProcess/NetworkProcessPlatformStrategies.cpp
>+NetworkProcess/NetworkResourceLoadParameters.cpp
>+NetworkProcess/NetworkResourceLoader.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/NetworkCacheData.cpp
>+NetworkProcess/cache/NetworkCacheEntry.cpp
>+NetworkProcess/cache/NetworkCacheFileSystem.cpp
>+NetworkProcess/cache/NetworkCacheKey.cpp
>+NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>+NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
>+NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
>+NetworkProcess/cache/NetworkCacheStatistics.cpp
>+NetworkProcess/cache/NetworkCacheStorage.cpp
>+
>+NetworkProcess/capture/NetworkCaptureEvent.cpp
>+NetworkProcess/capture/NetworkCaptureManager.cpp
>+NetworkProcess/capture/NetworkCaptureRecorder.cpp
>+NetworkProcess/capture/NetworkCaptureReplayer.cpp
>+NetworkProcess/capture/NetworkCaptureResource.cpp
>+NetworkProcess/capture/NetworkDataTaskReplay.cpp
>+
>+NetworkProcess/webrtc/NetworkMDNSRegister.cpp

Actions: View | Formatted Diff | Diff

Attachments on bug 185011: 338830 | 347560