Diff
Modified: trunk/Source/WebKit/ChangeLog (239142 => 239143)
--- trunk/Source/WebKit/ChangeLog 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/ChangeLog 2018-12-13 02:19:24 UTC (rev 239143)
@@ -4,6 +4,24 @@
https://bugs.webkit.org/show_bug.cgi?id=192449
<rdar://problem/46595508>
+ Reviewed by Darin Adler.
+
+ Part 4: Handling NetworkProcess folder.
+
+ * NetworkProcess/Cookies/mac/WebCookieManagerMac.mm:
+ * NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ * NetworkProcess/ServiceWorker/WebSWServerConnection.cpp:
+ * NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:
+ * NetworkProcess/ios/NetworkProcessIOS.mm:
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ * NetworkProcess/mac/RemoteNetworkingContext.mm:
+
+2018-12-12 Chris Fleizach <cfleiz...@apple.com>
+
+ [meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
+ https://bugs.webkit.org/show_bug.cgi?id=192449
+ <rdar://problem/46595508>
+
Reviewed by Tim Horton.
Fix iosmac build.
Modified: trunk/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm 2018-12-13 02:19:24 UTC (rev 239143)
@@ -31,10 +31,9 @@
#import <pal/spi/cf/CFNetworkSPI.h>
#import <wtf/ProcessPrivilege.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
Modified: trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp 2018-12-13 02:19:24 UTC (rev 239143)
@@ -41,10 +41,9 @@
#include <WebCore/ThreadSafeDataBuffer.h>
#include <WebCore/UniqueIDBDatabaseConnection.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(NetworkConnectionToWebProcess& connection, uint64_t serverConnectionIdentifier, PAL::SessionID sessionID)
{
return adoptRef(*new WebIDBConnectionToClient(connection, serverConnectionIdentifier, sessionID));
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp 2018-12-13 02:19:24 UTC (rev 239143)
@@ -53,11 +53,10 @@
#include <WebCore/ServiceWorkerUpdateViaCache.h>
#include <wtf/MainThread.h>
+namespace WebKit {
using namespace PAL;
using namespace WebCore;
-namespace WebKit {
-
#define SWSERVERCONNECTION_RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)
#define SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)
Modified: trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp 2018-12-13 02:19:24 UTC (rev 239143)
@@ -33,10 +33,9 @@
#include "WebSWContextManagerConnectionMessages.h"
#include <WebCore/ServiceWorkerContextData.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
WebSWServerToContextConnection::WebSWServerToContextConnection(const SecurityOriginData& securityOrigin, Ref<IPC::Connection>&& connection)
: SWServerToContextConnection(securityOrigin)
, m_ipcConnection(WTFMove(connection))
Modified: trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm 2018-12-13 02:19:24 UTC (rev 239143)
@@ -41,10 +41,9 @@
#define ENABLE_MANUAL_NETWORK_SANDBOXING 0
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
InitWebCoreThreadSystemInterface();
Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2018-12-13 02:19:24 UTC (rev 239143)
@@ -47,10 +47,9 @@
#import <wtf/MemoryPressureHandler.h>
#import <wtf/text/WTFString.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
// Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).
Modified: trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm (239142 => 239143)
--- trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-12-13 02:09:28 UTC (rev 239142)
+++ trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm 2018-12-13 02:19:24 UTC (rev 239143)
@@ -39,10 +39,9 @@
#import <pal/SessionID.h>
#import <wtf/MainThread.h>
+namespace WebKit {
using namespace WebCore;
-namespace WebKit {
-
void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
{
auto sessionID = parameters.networkSessionParameters.sessionID;
