Skip to content

Commit 7c431fa

Browse files
huskyrollhuskyroll
committed
Unreviewed, rolling out r239029.
This patch caused internal build failures. Reverted changeset: "[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 https://trac.webkit.org/changeset/239029 Canonical link: https://commits.webkit.org/207142@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent b8878e3 commit 7c431fa

57 files changed

Lines changed: 564 additions & 504 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/WebKit/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2018-12-10 Matt Lewis <jlewis3@apple.com>
2+
3+
Unreviewed, rolling out r239029.
4+
5+
This patch caused internal build failures.
6+
7+
Reverted changeset:
8+
9+
"[meta][WebKit] Remove using namespace WebCore and WebKit in
10+
the global scope for unified source builds"
11+
https://bugs.webkit.org/show_bug.cgi?id=192449
12+
https://trac.webkit.org/changeset/239029
13+
114
2018-12-10 Chris Dumez <cdumez@apple.com>
215

316
Add SPI to allow the client to set the user-agent at main frame level, from the UIProcess

‎Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
#import <pal/spi/cf/CFNetworkSPI.h>
3232
#import <wtf/ProcessPrivilege.h>
3333

34-
namespace WebKit {
3534
using namespace WebCore;
3635

36+
namespace WebKit {
37+
3738
void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
3839
{
3940
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));

‎Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141
#include <WebCore/ThreadSafeDataBuffer.h>
4242
#include <WebCore/UniqueIDBDatabaseConnection.h>
4343

44-
namespace WebKit {
4544
using namespace WebCore;
4645

46+
namespace WebKit {
47+
4748
Ref<WebIDBConnectionToClient> WebIDBConnectionToClient::create(NetworkConnectionToWebProcess& connection, uint64_t serverConnectionIdentifier, PAL::SessionID sessionID)
4849
{
4950
return adoptRef(*new WebIDBConnectionToClient(connection, serverConnectionIdentifier, sessionID));

‎Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@
5353
#include <WebCore/ServiceWorkerUpdateViaCache.h>
5454
#include <wtf/MainThread.h>
5555

56-
namespace WebKit {
5756
using namespace PAL;
5857
using namespace WebCore;
5958

59+
namespace WebKit {
60+
6061
#define SWSERVERCONNECTION_RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)
6162
#define SWSERVERCONNECTION_RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(m_sessionID.isAlwaysOnLoggingAllowed(), ServiceWorker, "%p - WebSWServerConnection::" fmt, this, ##__VA_ARGS__)
6263

‎Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
#include "WebSWContextManagerConnectionMessages.h"
3434
#include <WebCore/ServiceWorkerContextData.h>
3535

36-
namespace WebKit {
3736
using namespace WebCore;
3837

38+
namespace WebKit {
39+
3940
WebSWServerToContextConnection::WebSWServerToContextConnection(const SecurityOriginData& securityOrigin, Ref<IPC::Connection>&& connection)
4041
: SWServerToContextConnection(securityOrigin)
4142
, m_ipcConnection(WTFMove(connection))

‎Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141

4242
#define ENABLE_MANUAL_NETWORK_SANDBOXING 0
4343

44-
namespace WebKit {
4544
using namespace WebCore;
4645

46+
namespace WebKit {
47+
4748
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
4849
{
4950
InitWebCoreThreadSystemInterface();

‎Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
#import <wtf/MemoryPressureHandler.h>
4848
#import <wtf/text/WTFString.h>
4949

50-
namespace WebKit {
5150
using namespace WebCore;
5251

52+
namespace WebKit {
53+
5354
void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
5455
{
5556
// Having a window server connection in this process would result in spin logs (<rdar://problem/13239119>).

‎Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
#import <pal/SessionID.h>
4040
#import <wtf/MainThread.h>
4141

42-
namespace WebKit {
4342
using namespace WebCore;
4443

44+
namespace WebKit {
45+
4546
void RemoteNetworkingContext::ensureWebsiteDataStoreSession(WebsiteDataStoreParameters&& parameters)
4647
{
4748
auto sessionID = parameters.networkSessionParameters.sessionID;

‎Source/WebKit/PluginProcess/PluginControllerProxy.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@
5151
#include "LayerHostingContext.h"
5252
#endif
5353

54-
namespace WebKit {
5554
using namespace WebCore;
5655

56+
namespace WebKit {
57+
5758
PluginControllerProxy::PluginControllerProxy(WebProcessConnection* connection, const PluginCreationParameters& creationParameters)
5859
: m_connection(connection)
5960
, m_pluginInstanceID(creationParameters.pluginInstanceID)

‎Source/WebKit/PluginProcess/PluginProcess.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
#include <crt_externs.h>
5050
#endif
5151

52-
namespace WebKit {
53-
5452
using namespace WebCore;
5553

54+
namespace WebKit {
55+
5656
NO_RETURN static void callExit(IPC::Connection*)
5757
{
5858
_exit(EXIT_SUCCESS);

0 commit comments

Comments
 (0)