Attachment 357211 Details for Bug 192449 – patch, part 6

[patch] patch, part 6

patch (text/plain), 4.69 KB, created by chris fleizach on 2018-12-12 22:59:11 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-12-12 22:59:11 PST

Size: 4.69 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239152)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -6,6 +6,23 @@
> 
>         Reviewed by Darin Adler.
> 
>+        Part 6: Files in plugin process and UI process.
>+
>+        * PluginProcess/PluginControllerProxy.cpp:
>+        * PluginProcess/PluginProcess.cpp:
>+        * PluginProcess/WebProcessConnection.cpp:
>+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
>+        * UIProcess/WebStorage/LocalStorageDatabase.cpp:
>+        * UIProcess/mac/WebPageProxyMac.mm:
>+
>+2018-12-12  Chris Fleizach  <cfleizach@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 Darin Adler.
>+
>         Part 5: Files in WebProcess folder.
> 
>         * WebProcess/Cache/WebCacheStorageConnection.cpp:
>Index: Source/WebKit/PluginProcess/PluginControllerProxy.cpp
>===================================================================
>--- Source/WebKit/PluginProcess/PluginControllerProxy.cpp	(revision 239152)
>+++ Source/WebKit/PluginProcess/PluginControllerProxy.cpp	(working copy)
>@@ -51,10 +51,9 @@
> #include "LayerHostingContext.h"
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> PluginControllerProxy::PluginControllerProxy(WebProcessConnection* connection, const PluginCreationParameters& creationParameters)
>     : m_connection(connection)
>     , m_pluginInstanceID(creationParameters.pluginInstanceID)
>Index: Source/WebKit/PluginProcess/PluginProcess.cpp
>===================================================================
>--- Source/WebKit/PluginProcess/PluginProcess.cpp	(revision 239152)
>+++ Source/WebKit/PluginProcess/PluginProcess.cpp	(working copy)
>@@ -49,10 +49,10 @@
> #include <crt_externs.h>
> #endif
> 
>+namespace WebKit {
>+
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> NO_RETURN static void callExit(IPC::Connection*)
> {
>     _exit(EXIT_SUCCESS);
>Index: Source/WebKit/PluginProcess/WebProcessConnection.cpp
>===================================================================
>--- Source/WebKit/PluginProcess/WebProcessConnection.cpp	(revision 239152)
>+++ Source/WebKit/PluginProcess/WebProcessConnection.cpp	(working copy)
>@@ -44,10 +44,9 @@
> #include <unistd.h>
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static IPC::Connection* currentConnection;
> 
> RefPtr<WebProcessConnection> WebProcessConnection::create(IPC::Connection::Identifier connectionIdentifier)
>Index: Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	(revision 239152)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	(working copy)
>@@ -38,10 +38,9 @@
> #import <pal/spi/cocoa/QuartzCoreSPI.h>
> #import <wtf/SoftLinking.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)
> {
> #if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
>Index: Source/WebKit/UIProcess/WebStorage/LocalStorageDatabase.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebStorage/LocalStorageDatabase.cpp	(revision 239152)
>+++ Source/WebKit/UIProcess/WebStorage/LocalStorageDatabase.cpp	(working copy)
>@@ -38,13 +38,12 @@
> #include <wtf/text/StringHash.h>
> #include <wtf/text/WTFString.h>
> 
>-using namespace WebCore;
>-
> static const auto databaseUpdateInterval = 1_s;
> 
> static const int maximumItemsToUpdate = 100;
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> Ref<LocalStorageDatabase> LocalStorageDatabase::create(Ref<WorkQueue>&& queue, Ref<LocalStorageDatabaseTracker>&& tracker, const SecurityOriginData& securityOrigin)
> {
>Index: Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(revision 239152)
>+++ Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(working copy)
>@@ -67,8 +67,6 @@
> #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process().connection())
> #define MESSAGE_CHECK_URL(url) MESSAGE_CHECK_BASE(checkURLReceivedFromCurrentOrPreviousWebProcess(url), m_process->connection())
> 
>-using namespace WebCore;
>-
> @interface NSApplication ()
> - (BOOL)isSpeaking;
> - (void)speakString:(NSString *)string;
>@@ -107,7 +105,8 @@
> #endif
> 
> namespace WebKit {
>-
>+using namespace WebCore;
>+    
> static inline bool expectsLegacyImplicitRubberBandControl()
> {
>     if (MacApplication::isSafari()) {

Actions: View | Formatted Diff | Diff

Attachments on bug 192449: 356865 | 356866 | 356867 | 356868 | 356869 | 356870 | 356871 | 356872 | 356908 | 356926 | 356929 | 356950 | 356951 | 356989 | 356993 | 356995 | 357000 | 357014 | 357021 | 357109 | 357112 | 357115 | 357136 | 357139 | 357145 | 357152 | 357189 | 357191 | 357195 | 357211 | 357214 | 357218 | 357232 | 357237 | 357278 | 357318 | 357329