Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-08-24 08:06:59 UTC (rev 235286)
@@ -1,5 +1,52 @@
2018-08-20 Michael Catanzaro <[email protected]>
+ Use unified build for NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=185011
+
+ Reviewed by Alex Christensen.
+
+ * 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:
+ * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm:
+ (WebKit::Download::platformCancelNetworkLoad):
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:didBecomeInvalidWithError:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:willCacheResponse:completionHandler:]):
+ Fix the build with unified sources.
+
+ * Sources.txt: Un-@no-unify NetworkProcess/*.
+ * SourcesCocoa.txt: Un-@no-unify NetworkProcess/*.
+
+2018-08-20 Michael Catanzaro <[email protected]>
+
[CMake] Sync unified build with Cocoa ports
https://bugs.webkit.org/show_bug.cgi?id=188732
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -38,10 +38,9 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
const char* WebCookieManager::supplementName()
{
return "WebCookieManager";
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/Download.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/Download.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/Download.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -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 @@
#endif
} // namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -36,10 +36,9 @@
#include <pal/SessionID.h>
#include <wtf/StdLibExtras.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
DownloadManager::DownloadManager(Client& client)
: m_client(client)
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -32,10 +32,9 @@
#include "NetworkProcess.h"
#include "WebCoreArgumentCoders.h"
+namespace WebKit {
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))
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2018-08-24 08:06:59 UTC (rev 235286)
@@ -62,8 +62,7 @@
void Download::platformCancelNetworkLoad()
{
ASSERT(m_downloadTask);
- [m_downloadTask cancelByProducingResumeData: ^(NSData * _Nullable resumeData)
- {
+ [m_downloadTask cancelByProducingResumeData:^(NSData *resumeData) {
if (resumeData && resumeData.bytes && resumeData.length)
didCancel(IPC::DataReference(reinterpret_cast<const uint8_t*>(resumeData.bytes), resumeData.length));
else
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -34,10 +34,9 @@
#include <wtf/NeverDestroyed.h>
#include <wtf/RunLoop.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
NetworkBlobRegistry& NetworkBlobRegistry::singleton()
{
ASSERT(RunLoop::isMain());
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkCORSPreflightChecker.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -170,3 +170,5 @@
}
} // Namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -58,10 +58,9 @@
#include <WebCore/SecurityPolicy.h>
#include <pal/SessionID.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
Ref<NetworkConnectionToWebProcess> NetworkConnectionToWebProcess::create(IPC::Connection::Identifier connectionIdentifier)
{
return adoptRef(*new NetworkConnectionToWebProcess(connectionIdentifier));
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkContentRuleListManager.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -32,10 +32,9 @@
#include "NetworkProcessProxyMessages.h"
#include "WebCompiledContentRuleList.h"
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
NetworkContentRuleListManager::NetworkContentRuleListManager() = default;
NetworkContentRuleListManager::~NetworkContentRuleListManager()
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -44,10 +44,9 @@
#include "NetworkDataTaskCurl.h"
#endif
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
{
if (parameters.request.url().protocolIsBlob())
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -52,10 +52,9 @@
#include <wtf/MainThread.h>
#include <wtf/RunLoop.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
static const unsigned bufferSize = 512 * 1024;
static const int httpOK = 200;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkLoadChecker.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -431,3 +431,5 @@
}
} // namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcess.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -95,10 +95,9 @@
#include "NetworkSessionCocoa.h"
#endif
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
NetworkProcess& NetworkProcess::singleton()
{
static NeverDestroyed<NetworkProcess> networkProcess;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -29,10 +29,9 @@
#include <WebCore/BlobRegistryImpl.h>
#include <wtf/NeverDestroyed.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void NetworkProcessPlatformStrategies::initialize()
{
static NeverDestroyed<NetworkProcessPlatformStrategies> platformStrategies;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -31,10 +31,9 @@
#include "WebCoreArgumentCoders.h"
#include <WebCore/SecurityOriginData.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
{
encoder << identifier;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -65,12 +65,11 @@
#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__)
namespace WebKit {
+using namespace WebCore;
struct NetworkResourceLoader::SynchronousLoadData {
SynchronousLoadData(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply&& reply)
@@ -1123,3 +1122,6 @@
}
} // namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
+#undef RELEASE_LOG_ERROR_IF_ALLOWED
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSession.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -41,11 +41,9 @@
#include "NetworkSessionCurl.h"
#endif
-
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
Ref<NetworkSession> NetworkSession::create(NetworkSessionCreationParameters&& parameters)
{
#if PLATFORM(COCOA)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/NetworkSocketStream.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -32,10 +32,9 @@
#include <WebCore/SocketStreamError.h>
#include <WebCore/SocketStreamHandleImpl.h>
+namespace WebKit {
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)
{
return adoptRef(*new NetworkSocketStream(WTFMove(url), sessionID, credentialPartition, identifier, connection, WTFMove(auditData)));
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/PingLoad.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/PingLoad.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/PingLoad.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -175,3 +175,5 @@
}
} // namespace WebKit
+
+#undef RELEASE_LOG_IF_ALLOWED
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -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;
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCache.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -44,15 +44,14 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/StringHash.h>
+namespace WebKit {
+namespace CacheStorage {
+
using namespace WebCore;
using namespace WebCore::DOMCacheEngine;
-using namespace WebKit::NetworkCache;
+using namespace NetworkCache;
-namespace WebKit {
-
-namespace CacheStorage {
-
static inline String computeKeyURL(const URL& url)
{
URL keyURL { url };
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineCaches.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -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)
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/CacheStorageEngineConnection.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -33,11 +33,10 @@
#include "WebCoreArgumentCoders.h"
#include <WebCore/CacheQueryOptions.h>
+namespace WebKit {
using namespace WebCore::DOMCacheEngine;
-using namespace WebKit::CacheStorage;
+using namespace CacheStorage;
-namespace WebKit {
-
#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) \
if (!result.has_value())\
@@ -166,3 +165,6 @@
}
}
+
+#undef RELEASE_LOG_IF_ALLOWED
+#undef RELEASE_LOG_FUNCTION_IF_ALLOWED_IN_CALLBACK
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -47,11 +47,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());
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureEvent.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -504,4 +504,6 @@
} // namespace NetworkCapture
} // namespace WebKit
+#undef JSON_NOEXCEPTIONS
+
#endif // ENABLE(NETWORK_CAPTURE)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureManager.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -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";
@@ -582,4 +582,6 @@
} // namespace NetworkCapture
} // namespace WebKit
+#undef DEBUG_CLASS
+
#endif // ENABLE(NETWORK_CAPTURE)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureRecorder.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -153,4 +153,6 @@
} // namespace NetworkCapture
} // namespace WebKit
+#undef DEBUG_CLASS
+
#endif // ENABLE(NETWORK_CAPTURE)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkCaptureReplayer.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -48,4 +48,6 @@
} // namespace NetworkCapture
} // namespace WebKit
+#undef DEBUG_CLASS
+
#endif // ENABLE(NETWORK_CAPTURE)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/capture/NetworkDataTaskReplay.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -288,4 +288,6 @@
} // namespace NetworkCapture
} // namespace WebKit
+#undef DEBUG_CLASS
+
#endif // ENABLE(NETWORK_CAPTURE)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-08-24 08:06:59 UTC (rev 235286)
@@ -50,7 +50,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
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-08-24 08:06:59 UTC (rev 235286)
@@ -56,7 +56,7 @@
#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 @@
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 @@
}
}
-- (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);
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/webrtc/NetworkMDNSRegister.cpp 2018-08-24 08:06:59 UTC (rev 235286)
@@ -34,10 +34,9 @@
#include <pal/SessionID.h>
#include <wtf/UUID.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
#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__)
@@ -269,4 +268,7 @@
} // namespace WebKit
+#undef RELEASE_LOG_IF_ALLOWED
+#undef RELEASE_LOG_IF_ALLOWED_IN_CALLBACK
+
#endif // ENABLE(WEB_RTC)
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Sources.txt (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Sources.txt 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Sources.txt 2018-08-24 08:06:59 UTC (rev 235286)
@@ -21,57 +21,57 @@
// 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/NetworkCORSPreflightChecker.cpp @no-unify
-NetworkProcess/NetworkConnectionToWebProcess.cpp @no-unify
-NetworkProcess/NetworkContentRuleListManager.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/NetworkResourceLoadParameters.cpp @no-unify
-NetworkProcess/NetworkResourceLoader.cpp @no-unify
-NetworkProcess/NetworkSession.cpp @no-unify
-NetworkProcess/NetworkSocketStream.cpp @no-unify
-NetworkProcess/PingLoad.cpp @no-unify
-NetworkProcess/PreconnectTask.cpp @no-unify
+NetworkProcess/NetworkActivityTracker.cpp
+NetworkProcess/NetworkCORSPreflightChecker.cpp
+NetworkProcess/NetworkConnectionToWebProcess.cpp
+NetworkProcess/NetworkContentRuleListManager.cpp
+NetworkProcess/NetworkDataTask.cpp
+NetworkProcess/NetworkDataTaskBlob.cpp
+NetworkProcess/NetworkLoad.cpp
+NetworkProcess/NetworkLoadChecker.cpp
+NetworkProcess/NetworkProcess.cpp
+NetworkProcess/NetworkProcessCreationParameters.cpp
+NetworkProcess/NetworkProcessPlatformStrategies.cpp
+NetworkProcess/NetworkResourceLoadParameters.cpp
+NetworkProcess/NetworkResourceLoader.cpp
+NetworkProcess/NetworkSession.cpp
+NetworkProcess/NetworkSocketStream.cpp
+NetworkProcess/PingLoad.cpp
+NetworkProcess/PreconnectTask.cpp
-NetworkProcess/Cookies/WebCookieManager.cpp @no-unify
+NetworkProcess/Cookies/WebCookieManager.cpp
-NetworkProcess/Downloads/Download.cpp @no-unify
-NetworkProcess/Downloads/DownloadManager.cpp @no-unify
-NetworkProcess/Downloads/PendingDownload.cpp @no-unify
+NetworkProcess/Downloads/Download.cpp
+NetworkProcess/Downloads/DownloadManager.cpp
+NetworkProcess/Downloads/PendingDownload.cpp
-NetworkProcess/FileAPI/NetworkBlobRegistry.cpp @no-unify
+NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
-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/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/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/NetworkCacheStatistics.cpp
+NetworkProcess/cache/NetworkCacheStorage.cpp
+NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp
-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/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 @no-unify
+NetworkProcess/webrtc/NetworkMDNSRegister.cpp
// TODO: We should unify these files once GTK's PluginProcess2 is removed.
Platform/Logging.cpp @no-unify
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt (235285 => 235286)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt 2018-08-24 08:06:41 UTC (rev 235285)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/SourcesCocoa.txt 2018-08-24 08:06:59 UTC (rev 235286)
@@ -21,38 +21,38 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
// THE POSSIBILITY OF SUCH DAMAGE.
-NetworkProcess/cache/NetworkCacheCodersCocoa.cpp @no-unify
-NetworkProcess/cache/NetworkCacheDataCocoa.mm @no-unify
-NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm @no-unify
+NetworkProcess/cache/NetworkCacheCodersCocoa.cpp
+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/LegacyCustomProtocolManager.cpp @no-unify
+NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
+NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
-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
-NetworkProcess/webrtc/LibWebRTCSocketClient.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCMonitor.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCProvider.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCResolver.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp @no-unify
-NetworkProcess/webrtc/NetworkRTCSocket.cpp @no-unify
+NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
+NetworkProcess/webrtc/NetworkRTCMonitor.cpp
+NetworkProcess/webrtc/NetworkRTCProvider.cpp
+NetworkProcess/webrtc/NetworkRTCResolver.cpp
+NetworkProcess/webrtc/NetworkRTCResolverCocoa.cpp
+NetworkProcess/webrtc/NetworkRTCSocket.cpp
Platform/cf/ModuleCF.cpp
