Attachment 356908 Details for Bug 192449 – patch

[patch] patch

patch (text/plain), 50.54 KB, created by chris fleizach on 2018-12-08 22:33:42 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-12-08 22:33:42 PST

Size: 50.54 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239007)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,86 @@
>+2018-12-08  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
>+
>+        Reviewed by Darin Adler.
>+
>+        * 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:
>+        * PluginProcess/PluginControllerProxy.cpp:
>+        * PluginProcess/PluginProcess.cpp:
>+        * PluginProcess/WebProcessConnection.cpp:
>+        * Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
>+        * Shared/API/c/cf/WKErrorCF.cpp:
>+        (WKErrorCreateWithCFError):
>+        (WKErrorCopyCFError):
>+        * Shared/API/c/cg/WKImageCG.cpp:
>+        (WKImageCreateCGImage):
>+        (WKImageCreateFromCGImage):
>+        * Shared/ChildProcess.cpp:
>+        * Shared/ContextMenuContextData.cpp:
>+        * Shared/EditorState.cpp:
>+        * Shared/Plugins/NPIdentifierData.cpp:
>+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:
>+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
>+        * Shared/SessionState.cpp:
>+        * Shared/SessionTracker.cpp:
>+        * Shared/ShareableBitmap.cpp:
>+        * Shared/ShareableResource.cpp:
>+        * Shared/VisibleContentRectUpdateInfo.cpp:
>+        * Shared/WebBackForwardListItem.cpp:
>+        * Shared/WebContextMenuItemData.cpp:
>+        * Shared/WebCoreArgumentCoders.cpp:
>+        * Shared/WebHitTestResultData.cpp:
>+        * Shared/WebImage.cpp:
>+        * Shared/WebMediaSessionMetadata.cpp:
>+        * Shared/WebMemorySampler.cpp:
>+        * Shared/WebMouseEvent.cpp:
>+        * Shared/WebRenderObject.cpp:
>+        * Shared/WebSQLiteDatabaseTracker.cpp:
>+        * Shared/WebWheelEvent.cpp:
>+        * Shared/cf/ArgumentCodersCF.cpp:
>+        * Shared/ios/WebPlatformTouchPointIOS.cpp:
>+        * UIProcess/API/APIContentRuleListStore.cpp:
>+        * UIProcess/API/APIHitTestResult.cpp:
>+        * UIProcess/API/APINavigation.cpp:
>+        * UIProcess/API/APIOpenPanelParameters.cpp:
>+        * UIProcess/API/APIPageConfiguration.cpp:
>+        * UIProcess/API/C/WKPage.cpp:
>+        (WKPageLoadURLWithShouldOpenExternalURLsPolicy):
>+        (WKPageLoadURLWithUserData):
>+        (WKPageLoadURLRequestWithUserData):
>+        (WKPageSetPaginationMode):
>+        (WKPageGetPaginationMode):
>+        (WKPageSetPageLoaderClient):
>+        (WKPageSetPagePolicyClient):
>+        * UIProcess/API/C/cg/WKIconDatabaseCG.cpp:
>+        * UIProcess/Cocoa/WebViewImpl.h:
>+        * UIProcess/Cocoa/WebViewImpl.mm:
>+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
>+        * UIProcess/WebStorage/LocalStorageDatabase.cpp:
>+        * UIProcess/ios/WKContentView.mm:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        * UIProcess/ios/WebProcessProxyIOS.mm:
>+        * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
>+        (WKFullScreenViewControllerPlaybackSessionModelClient::setParent): Deleted.
>+        (WKFullScreenViewControllerPlaybackSessionModelClient::setInterface): Deleted.
>+        (WKFullScreenViewControllerVideoFullscreenModelClient::setParent): Deleted.
>+        (WKFullScreenViewControllerVideoFullscreenModelClient::setInterface): Deleted.
>+        (WKFullScreenViewControllerVideoFullscreenModelClient::interface const): Deleted.
>+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
>+        * UIProcess/mac/WebPageProxyMac.mm:
>+        * WebProcess/Cache/WebCacheStorageConnection.cpp:
>+        * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
>+        (mediaTimeToCurrentTime):
>+        (-[WKAnimationDelegate initWithLayerID:layerTreeHost:]):
>+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
>+
> 2018-12-07  Rob Buis  <rbuis@igalia.com>
> 
>         Remove unused API in NetworkProcess
>Index: Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm	(revision 239007)
>+++ Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm	(working copy)
>@@ -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));
>Index: Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp	(revision 239007)
>+++ Source/WebKit/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp	(working copy)
>@@ -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));
>Index: Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	(revision 239007)
>+++ Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerConnection.cpp	(working copy)
>@@ -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__)
> 
>Index: Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp	(revision 239007)
>+++ Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp	(working copy)
>@@ -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))
>Index: Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm	(revision 239007)
>+++ Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm	(working copy)
>@@ -41,10 +41,9 @@
> 
> #define ENABLE_MANUAL_NETWORK_SANDBOXING 0
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
> {
>     InitWebCoreThreadSystemInterface();
>Index: Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	(revision 239007)
>+++ Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm	(working copy)
>@@ -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>).
>Index: Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm	(revision 239007)
>+++ Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm	(working copy)
>@@ -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;
>Index: Source/WebKit/PluginProcess/PluginControllerProxy.cpp
>===================================================================
>--- Source/WebKit/PluginProcess/PluginControllerProxy.cpp	(revision 239007)
>+++ 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 239007)
>+++ 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 239007)
>+++ 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/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb
>===================================================================
>--- Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb	(revision 239007)
>+++ Source/WebKit/Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb	(working copy)
>@@ -40,10 +40,9 @@
> #include <WebCore/Settings.h>
> #include <WebCore/TextEncodingRegistry.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebPreferencesStore::ValueMap& WebPreferencesStore::defaults()
> {
>     static NeverDestroyed<ValueMap> defaults;
>Index: Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp	(revision 239007)
>+++ Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp	(working copy)
>@@ -29,16 +29,14 @@
> #include "APIError.h"
> #include "WKAPICast.h"
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError)
> {
>-    return toAPI(&API::Error::create(ResourceError(cfError)).leakRef());
>+    return WebKit::toAPI(&API::Error::create(WebCore::ResourceError(cfError)).leakRef());
> }
> 
> CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error)
> {
>-    RetainPtr<CFErrorRef> cfError = toImpl(error)->platformError().cfError();
>+    WTF::RetainPtr<CFErrorRef> cfError = WebKit::toImpl(error)->platformError().cfError();
>     return cfError.leakRef();
> }
>+
>Index: Source/WebKit/Shared/API/c/cg/WKImageCG.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(revision 239007)
>+++ Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(working copy)
>@@ -32,12 +32,9 @@
> #include <WebCore/ColorSpace.h>
> #include <WebCore/GraphicsContext.h>
> 
>-using namespace WebKit;
>-using namespace WebCore;
>-
> CGImageRef WKImageCreateCGImage(WKImageRef imageRef)
> {
>-    WebImage* webImage = toImpl(imageRef);
>+    WebKit::WebImage* webImage = WebKit::toImpl(imageRef);
>     if (!webImage)
>         return nullptr;
> 
>@@ -49,12 +46,13 @@
>     if (!imageRef)
>         return nullptr;
>     
>-    IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
>-    auto webImage = WebImage::create(imageSize, toImageOptions(options));
>+    WebCore::IntSize imageSize(CGImageGetWidth(imageRef), CGImageGetHeight(imageRef));
>+    auto webImage = WebKit::WebImage::create(imageSize, WebKit::toImageOptions(options));
> 
>     auto graphicsContext = webImage->bitmap().createGraphicsContext();
>-    FloatRect rect(FloatPoint(0, 0), imageSize);
>+    WebCore::FloatRect rect(WebCore::FloatPoint(0, 0), imageSize);
>     graphicsContext->clearRect(rect);
>     graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
>     return toAPI(webImage.leakRef());
> }
>+
>Index: Source/WebKit/Shared/ChildProcess.cpp
>===================================================================
>--- Source/WebKit/Shared/ChildProcess.cpp	(revision 239007)
>+++ Source/WebKit/Shared/ChildProcess.cpp	(working copy)
>@@ -39,10 +39,9 @@
> #include <wtf/MemoryPressureHandler.h>
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ChildProcess::ChildProcess()
>     : m_terminationCounter(0)
>     , m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired)
>Index: Source/WebKit/Shared/ContextMenuContextData.cpp
>===================================================================
>--- Source/WebKit/Shared/ContextMenuContextData.cpp	(revision 239007)
>+++ Source/WebKit/Shared/ContextMenuContextData.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <WebCore/ContextMenuContext.h>
> #include <WebCore/GraphicsContext.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ContextMenuContextData::ContextMenuContextData()
>     : m_type(Type::ContextMenu)
> #if ENABLE(SERVICE_CONTROLS)
>Index: Source/WebKit/Shared/EditorState.cpp
>===================================================================
>--- Source/WebKit/Shared/EditorState.cpp	(revision 239007)
>+++ Source/WebKit/Shared/EditorState.cpp	(working copy)
>@@ -29,10 +29,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <wtf/text/TextStream.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void EditorState::encode(IPC::Encoder& encoder) const
> {
>     encoder << shouldIgnoreSelectionChanges;
>Index: Source/WebKit/Shared/Plugins/NPIdentifierData.cpp
>===================================================================
>--- Source/WebKit/Shared/Plugins/NPIdentifierData.cpp	(revision 239007)
>+++ Source/WebKit/Shared/Plugins/NPIdentifierData.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/IdentifierRep.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> NPIdentifierData::NPIdentifierData()
>     : m_isString(false)
>     , m_number(0)
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm	(revision 239007)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm	(working copy)
>@@ -77,10 +77,9 @@
> @end
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static CGColorRef cgColorFromColor(const Color& color)
> {
>     if (!color.isValid())
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(revision 239007)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(working copy)
>@@ -38,11 +38,10 @@
> #include <wtf/text/CString.h>
> #include <wtf/text/TextStream.h>
> 
>-using namespace WebCore;
>-
> #if ENABLE(ASYNC_SCROLLING)
> 
> namespace IPC {
>+using namespace WebCore;
> 
> template<> struct ArgumentCoder<ScrollingStateNode> {
>     static void encode(Encoder&, const ScrollingStateNode&);
>Index: Source/WebKit/Shared/SessionState.cpp
>===================================================================
>--- Source/WebKit/Shared/SessionState.cpp	(revision 239007)
>+++ Source/WebKit/Shared/SessionState.cpp	(working copy)
>@@ -29,10 +29,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/BackForwardItemIdentifier.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> bool isValidEnum(WebCore::ShouldOpenExternalURLsPolicy policy)
> {
>     switch (policy) {
>Index: Source/WebKit/Shared/SessionTracker.cpp
>===================================================================
>--- Source/WebKit/Shared/SessionTracker.cpp	(revision 239007)
>+++ Source/WebKit/Shared/SessionTracker.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include <wtf/NeverDestroyed.h>
> #include <wtf/RunLoop.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static String& identifierBase()
> {
>     ASSERT(RunLoop::isMain());
>Index: Source/WebKit/Shared/ShareableBitmap.cpp
>===================================================================
>--- Source/WebKit/Shared/ShareableBitmap.cpp	(revision 239007)
>+++ Source/WebKit/Shared/ShareableBitmap.cpp	(working copy)
>@@ -30,10 +30,9 @@
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/GraphicsContext.h>
> 
>+namespace WebKit {
> using namespace WebCore;
>-
>-namespace WebKit {
>-
>+    
> ShareableBitmap::Handle::Handle()
> {
> }
>Index: Source/WebKit/Shared/ShareableResource.cpp
>===================================================================
>--- Source/WebKit/Shared/ShareableResource.cpp	(revision 239007)
>+++ Source/WebKit/Shared/ShareableResource.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include "ArgumentCoders.h"
> #include <WebCore/SharedBuffer.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> ShareableResource::Handle::Handle()
> {
> }
>Index: Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp
>===================================================================
>--- Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp	(revision 239007)
>+++ Source/WebKit/Shared/VisibleContentRectUpdateInfo.cpp	(working copy)
>@@ -30,10 +30,9 @@
> #include <WebCore/LengthBox.h>
> #include <wtf/text/TextStream.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const
> {
>     encoder << m_exposedContentRect;
>Index: Source/WebKit/Shared/WebBackForwardListItem.cpp
>===================================================================
>--- Source/WebKit/Shared/WebBackForwardListItem.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebBackForwardListItem.cpp	(working copy)
>@@ -32,10 +32,9 @@
> #include <wtf/DebugUtilities.h>
> #include <wtf/URL.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> Ref<WebBackForwardListItem> WebBackForwardListItem::create(BackForwardListItemState&& backForwardListItemState, uint64_t pageID)
> {
>     return adoptRef(*new WebBackForwardListItem(WTFMove(backForwardListItemState), pageID));
>Index: Source/WebKit/Shared/WebContextMenuItemData.cpp
>===================================================================
>--- Source/WebKit/Shared/WebContextMenuItemData.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebContextMenuItemData.cpp	(working copy)
>@@ -34,10 +34,9 @@
> #include <wtf/text/CString.h>
> #include <WebCore/ContextMenu.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebContextMenuItemData::WebContextMenuItemData()
>     : m_type(WebCore::ActionType)
>     , m_action(WebCore::ContextMenuItemTagNoAction)
>Index: Source/WebKit/Shared/WebCoreArgumentCoders.cpp
>===================================================================
>--- Source/WebKit/Shared/WebCoreArgumentCoders.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebCoreArgumentCoders.cpp	(working copy)
>@@ -112,11 +112,10 @@
> #include <WebCore/MediaConstraints.h>
> #endif
> 
>+namespace IPC {
> using namespace WebCore;
> using namespace WebKit;
> 
>-namespace IPC {
>-
> static void encodeSharedBuffer(Encoder& encoder, const SharedBuffer* buffer)
> {
>     SharedMemory::Handle handle;
>Index: Source/WebKit/Shared/WebHitTestResultData.cpp
>===================================================================
>--- Source/WebKit/Shared/WebHitTestResultData.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebHitTestResultData.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include <wtf/URL.h>
> #include <wtf/text/WTFString.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebHitTestResultData::WebHitTestResultData()
> {
> }
>Index: Source/WebKit/Shared/WebImage.cpp
>===================================================================
>--- Source/WebKit/Shared/WebImage.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebImage.cpp	(working copy)
>@@ -26,10 +26,9 @@
> #include "config.h"
> #include "WebImage.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
> {
>     return WebImage::create(size, options, { });
>Index: Source/WebKit/Shared/WebMediaSessionMetadata.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMediaSessionMetadata.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebMediaSessionMetadata.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #if ENABLE(MEDIA_SESSION)
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> Ref<WebMediaSessionMetadata> WebMediaSessionMetadata::create(const MediaSessionMetadata& metadata)
> {
>     return adoptRef(*new WebMediaSessionMetadata(metadata));
>Index: Source/WebKit/Shared/WebMemorySampler.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMemorySampler.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebMemorySampler.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <wtf/text/CString.h>
> #include <wtf/text/StringBuilder.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> static const char separator = '\t';
> 
> static void appendSpaces(StringBuilder& string, int count)
>Index: Source/WebKit/Shared/WebMouseEvent.cpp
>===================================================================
>--- Source/WebKit/Shared/WebMouseEvent.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebMouseEvent.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebMouseEvent::WebMouseEvent()
>     : WebEvent()
>     , m_button(static_cast<uint32_t>(NoButton))
>Index: Source/WebKit/Shared/WebRenderObject.cpp
>===================================================================
>--- Source/WebKit/Shared/WebRenderObject.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebRenderObject.cpp	(working copy)
>@@ -37,10 +37,9 @@
> #include <WebCore/RenderView.h>
> #include <WebCore/RenderWidget.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> RefPtr<WebRenderObject> WebRenderObject::create(WebPage* page)
> {
>     Frame* mainFrame = page->mainFrame();
>Index: Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp
>===================================================================
>--- Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebSQLiteDatabaseTracker.cpp	(working copy)
>@@ -33,10 +33,9 @@
> #include <WebCore/SQLiteDatabaseTracker.h>
> #include <wtf/MainThread.h>
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(NetworkProcess& process)
>     : m_process(process)
>     , m_hysteresis([this](PAL::HysteresisState state) { hysteresisUpdated(state); })
>Index: Source/WebKit/Shared/WebWheelEvent.cpp
>===================================================================
>--- Source/WebKit/Shared/WebWheelEvent.cpp	(revision 239007)
>+++ Source/WebKit/Shared/WebWheelEvent.cpp	(working copy)
>@@ -28,10 +28,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {    
> using namespace WebCore;
> 
>-namespace WebKit {    
>-
> WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, Modifiers modifiers, WallTime timestamp)
>     : WebEvent(type, modifiers, timestamp)
>     , m_position(position)
>Index: Source/WebKit/Shared/cf/ArgumentCodersCF.cpp
>===================================================================
>--- Source/WebKit/Shared/cf/ArgumentCodersCF.cpp	(revision 239007)
>+++ Source/WebKit/Shared/cf/ArgumentCodersCF.cpp	(working copy)
>@@ -63,10 +63,9 @@
> extern "C" CFDataRef SecAccessControlCopyData(SecAccessControlRef access_control);
> #endif
> 
>+namespace IPC {
> using namespace WebCore;
> 
>-namespace IPC {
>-
> CFTypeRef tokenNullTypeRef()
> {
>     static CFStringRef tokenNullType = CFSTR("WKNull");
>Index: Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp
>===================================================================
>--- Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp	(revision 239007)
>+++ Source/WebKit/Shared/ios/WebPlatformTouchPointIOS.cpp	(working copy)
>@@ -30,10 +30,9 @@
> 
> #include "WebCoreArgumentCoders.h"
> 
>+namespace WebKit {
> using namespace WebCore;
> 
>-namespace WebKit {
>-
> void WebPlatformTouchPoint::encode(IPC::Encoder& encoder) const
> {
>     encoder << m_identifier;
>Index: Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp	(working copy)
>@@ -45,11 +45,11 @@
> #include <wtf/persistence/PersistentDecoder.h>
> #include <wtf/persistence/PersistentEncoder.h>
> 
>+
>+namespace API {
> using namespace WebKit::NetworkCache;
> using namespace WebCore::FileSystem;
> 
>-namespace API {
>-    
> ContentRuleListStore& ContentRuleListStore::legacyDefaultStore()
> {
>     const bool legacyFilename = true;
>Index: Source/WebKit/UIProcess/API/APIHitTestResult.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIHitTestResult.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/APIHitTestResult.cpp	(working copy)
>@@ -20,10 +20,9 @@
> #include "config.h"
> #include "APIHitTestResult.h"
> 
>+namespace API {
> using namespace WebCore;
> 
>-namespace API {
>-
> Ref<HitTestResult> HitTestResult::create(const WebKit::WebHitTestResultData& hitTestResultData)
> {
>     return adoptRef(*new HitTestResult(hitTestResultData));
>Index: Source/WebKit/UIProcess/API/APINavigation.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APINavigation.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/APINavigation.cpp	(working copy)
>@@ -30,11 +30,10 @@
> #include "WebNavigationState.h"
> #include <wtf/DebugUtilities.h>
> 
>+namespace API {
> using namespace WebCore;
> using namespace WebKit;
> 
>-namespace API {
>-
> Navigation::Navigation(WebNavigationState& state)
>     : m_navigationID(state.generateNavigationID())
> {
>Index: Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp	(working copy)
>@@ -31,10 +31,9 @@
> #include "APIString.h"
> #include <wtf/Vector.h>
> 
>+namespace API {
> using namespace WebCore;
> 
>-namespace API {
>-
> Ref<OpenPanelParameters> OpenPanelParameters::create(const FileChooserSettings& settings)
> {
>     return adoptRef(*new OpenPanelParameters(settings));
>Index: Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIPageConfiguration.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/APIPageConfiguration.cpp	(working copy)
>@@ -38,11 +38,10 @@
> #include "APIApplicationManifest.h"
> #endif
> 
>+namespace API {
> using namespace WebCore;
> using namespace WebKit;
> 
>-namespace API {
>-
> Ref<PageConfiguration> PageConfiguration::create()
> {
>     return adoptRef(*new PageConfiguration);
>Index: Source/WebKit/UIProcess/API/C/WKPage.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKPage.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/C/WKPage.cpp	(working copy)
>@@ -97,10 +97,10 @@
> #include "VersionChecks.h"
> #endif
> 
>+namespace API {
> using namespace WebCore;
> using namespace WebKit;
>-
>-namespace API {
>+    
> template<> struct ClientTraits<WKPageLoaderClientBase> {
>     typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3, WKPageLoaderClientV4, WKPageLoaderClientV5, WKPageLoaderClientV6> Versions;
> };
>@@ -130,9 +130,9 @@
> template<> struct ClientTraits<WKPageFindMatchesClientBase> {
>     typedef std::tuple<WKPageFindMatchesClientV0> Versions;
> };
>+    
>+} // namespace API
> 
>-}
>-
> WKTypeID WKPageGetTypeID()
> {
>     return toAPI(WebPageProxy::APIType);
>@@ -160,13 +160,13 @@
> 
> void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef pageRef, WKURLRef URLRef, bool shouldOpenExternalURLs)
> {
>-    ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy = shouldOpenExternalURLs ? ShouldOpenExternalURLsPolicy::ShouldAllow : ShouldOpenExternalURLsPolicy::ShouldNotAllow;
>+    WebCore::ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy = shouldOpenExternalURLs ? WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow : WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow;
>     toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), shouldOpenExternalURLsPolicy);
> }
> 
> void WKPageLoadURLWithUserData(WKPageRef pageRef, WKURLRef URLRef, WKTypeRef userDataRef)
> {
>-    toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
>+    toImpl(pageRef)->loadRequest(URL(URL(), toWTFString(URLRef)), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
> }
> 
> void WKPageLoadURLRequest(WKPageRef pageRef, WKURLRequestRef urlRequestRef)
>@@ -178,7 +178,7 @@
> void WKPageLoadURLRequestWithUserData(WKPageRef pageRef, WKURLRequestRef urlRequestRef, WKTypeRef userDataRef)
> {
>     auto resourceRequest = toImpl(urlRequestRef)->resourceRequest();
>-    toImpl(pageRef)->loadRequest(WTFMove(resourceRequest), ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
>+    toImpl(pageRef)->loadRequest(WTFMove(resourceRequest), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow, toImpl(userDataRef));
> }
> 
> void WKPageLoadFile(WKPageRef pageRef, WKURLRef fileURL, WKURLRef resourceDirectoryURL)
>@@ -691,22 +691,22 @@
> 
> void WKPageSetPaginationMode(WKPageRef pageRef, WKPaginationMode paginationMode)
> {
>-    Pagination::Mode mode;
>+    WebCore::Pagination::Mode mode;
>     switch (paginationMode) {
>     case kWKPaginationModeUnpaginated:
>-        mode = Pagination::Unpaginated;
>+        mode = WebCore::Pagination::Unpaginated;
>         break;
>     case kWKPaginationModeLeftToRight:
>-        mode = Pagination::LeftToRightPaginated;
>+        mode = WebCore::Pagination::LeftToRightPaginated;
>         break;
>     case kWKPaginationModeRightToLeft:
>-        mode = Pagination::RightToLeftPaginated;
>+        mode = WebCore::Pagination::RightToLeftPaginated;
>         break;
>     case kWKPaginationModeTopToBottom:
>-        mode = Pagination::TopToBottomPaginated;
>+        mode = WebCore::Pagination::TopToBottomPaginated;
>         break;
>     case kWKPaginationModeBottomToTop:
>-        mode = Pagination::BottomToTopPaginated;
>+        mode = WebCore::Pagination::BottomToTopPaginated;
>         break;
>     default:
>         return;
>@@ -717,15 +717,15 @@
> WKPaginationMode WKPageGetPaginationMode(WKPageRef pageRef)
> {
>     switch (toImpl(pageRef)->paginationMode()) {
>-    case Pagination::Unpaginated:
>+    case WebCore::Pagination::Unpaginated:
>         return kWKPaginationModeUnpaginated;
>-    case Pagination::LeftToRightPaginated:
>+    case WebCore::Pagination::LeftToRightPaginated:
>         return kWKPaginationModeLeftToRight;
>-    case Pagination::RightToLeftPaginated:
>+    case WebCore::Pagination::RightToLeftPaginated:
>         return kWKPaginationModeRightToLeft;
>-    case Pagination::TopToBottomPaginated:
>+    case WebCore::Pagination::TopToBottomPaginated:
>         return kWKPaginationModeTopToBottom;
>-    case Pagination::BottomToTopPaginated:
>+    case WebCore::Pagination::BottomToTopPaginated:
>         return kWKPaginationModeBottomToTop;
>     }
> 
>@@ -1107,7 +1107,7 @@
>             m_client.didReceiveServerRedirectForProvisionalLoadForFrame(toAPI(&page), toAPI(&frame), toAPI(userData), m_client.base.clientInfo);
>         }
> 
>-        void didFailProvisionalLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const ResourceError& error, API::Object* userData) override
>+        void didFailProvisionalLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const WebCore::ResourceError& error, API::Object* userData) override
>         {
>             if (!m_client.didFailProvisionalLoadWithErrorForFrame)
>                 return;
>@@ -1123,7 +1123,7 @@
>             m_client.didFinishLoadForFrame(toAPI(&page), toAPI(&frame), toAPI(userData), m_client.base.clientInfo);
>         }
> 
>-        void didFailLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const ResourceError& error, API::Object* userData) override
>+        void didFailLoadWithErrorForFrame(WebPageProxy& page, WebFrameProxy& frame, API::Navigation*, const WebCore::ResourceError& error, API::Object* userData) override
>         {
>             if (!m_client.didFailLoadWithErrorForFrame)
>                 return;
>@@ -1230,7 +1230,7 @@
>                 m_client.decidePolicyForNavigationAction(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(originalRequest.ptr()), toAPI(request.ptr()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
>         }
> 
>-        void decidePolicyForNewWindowAction(WebPageProxy& page, WebFrameProxy& frame, const NavigationActionData& navigationActionData, const ResourceRequest& resourceRequest, const String& frameName, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
>+        void decidePolicyForNewWindowAction(WebPageProxy& page, WebFrameProxy& frame, const NavigationActionData& navigationActionData, const WebCore::ResourceRequest& resourceRequest, const String& frameName, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
>         {
>             if (!m_client.decidePolicyForNewWindowAction) {
>                 listener->use();
>@@ -1242,7 +1242,7 @@
>             m_client.decidePolicyForNewWindowAction(toAPI(&page), toAPI(&frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.ptr()), toAPI(frameName.impl()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
>         }
> 
>-        void decidePolicyForResponse(WebPageProxy& page, WebFrameProxy& frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, bool canShowMIMEType, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
>+        void decidePolicyForResponse(WebPageProxy& page, WebFrameProxy& frame, const WebCore::ResourceResponse& resourceResponse, const WebCore::ResourceRequest& resourceRequest, bool canShowMIMEType, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
>         {
>             if (!m_client.decidePolicyForResponse_deprecatedForUseWithV0 && !m_client.decidePolicyForResponse) {
>                 listener->use();
>@@ -1258,7 +1258,7 @@
>                 m_client.decidePolicyForResponse(toAPI(&page), toAPI(&frame), toAPI(response.ptr()), toAPI(request.ptr()), canShowMIMEType, toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
>         }
> 
>-        void unableToImplementPolicy(WebPageProxy& page, WebFrameProxy& frame, const ResourceError& error, API::Object* userData) override
>+        void unableToImplementPolicy(WebPageProxy& page, WebFrameProxy& frame, const WebCore::ResourceError& error, API::Object* userData) override
>         {
>             if (!m_client.unableToImplementPolicy)
>                 return;
>@@ -1271,7 +1271,8 @@
> }
> 
> namespace WebKit {
>-
>+using namespace WebCore;
>+    
> class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
> public:
>     static Ref<RunBeforeUnloadConfirmPanelResultListener> create(Function<void(bool)>&& completionHandler)
>@@ -2699,3 +2700,4 @@
> #endif // not ENABLE(APPLICATION_MANIFEST)
> }
> #endif
>+
>Index: Source/WebKit/UIProcess/API/C/cg/WKIconDatabaseCG.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/cg/WKIconDatabaseCG.cpp	(revision 239007)
>+++ Source/WebKit/UIProcess/API/C/cg/WKIconDatabaseCG.cpp	(working copy)
>@@ -31,7 +31,6 @@
> #include <WebCore/Image.h>
> 
> using namespace WebKit;
>-using namespace WebCore;
> 
> CGImageRef WKIconDatabaseTryGetCGImageForURL(WKIconDatabaseRef, WKURLRef, WKSize)
> {
>@@ -42,3 +41,4 @@
> {
>     return nullptr;
> }
>+
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.h	(revision 239007)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.h	(working copy)
>@@ -134,6 +134,7 @@
> class PageClient;
> class PageClientImpl;
> class DrawingAreaProxy;
>+class SafeBrowsingWarning;
> class ViewGestureController;
> class ViewSnapshot;
> class WebBackForwardListItem;
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(revision 239007)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(working copy)
>@@ -61,8 +61,10 @@
> #import "WKImmediateActionController.h"
> #import "WKPrintingView.h"
> #import "WKSafeBrowsingWarning.h"
>+#import "WKShareSheet.h"
> #import "WKTextInputWindowController.h"
> #import "WKViewLayoutStrategy.h"
>+#import "WKWebViewInternal.h"
> #import "WKWebViewPrivate.h"
> #import "WebBackForwardList.h"
> #import "WebEditCommandProxy.h"
>Index: Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	(revision 239007)
>+++ 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 239007)
>+++ 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/ios/WKContentView.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentView.mm	(revision 239007)
>+++ Source/WebKit/UIProcess/ios/WKContentView.mm	(working copy)
>@@ -62,10 +62,11 @@
> #import <wtf/RetainPtr.h>
> #import <wtf/text/TextStream.h>
> 
>+
>+namespace WebKit {
> using namespace WebCore;
> using namespace WebKit;
> 
>-namespace WebKit {
> class HistoricalVelocityData {
> public:
>     struct VelocityData {
>Index: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(revision 239007)
>+++ Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(working copy)
>@@ -142,11 +142,10 @@
> 
> #endif
> 
>+namespace WebKit {
> using namespace WebCore;
> using namespace WebKit;
> 
>-namespace WebKit {
>-
> WKSelectionDrawingInfo::WKSelectionDrawingInfo()
>     : type(SelectionType::None)
> {
>Index: Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm	(revision 239007)
>+++ Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm	(working copy)
>@@ -40,9 +40,6 @@
> #import <pal/spi/cocoa/AVKitSPI.h>
> #import <wtf/RetainPtr.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> static const NSTimeInterval showHideAnimationDuration = 0.1;
> static const NSTimeInterval pipHideAnimationDuration = 0.2;
> static const NSTimeInterval autoHideDelay = 4.0;
>@@ -56,7 +53,7 @@
> - (void)failedToEnterPictureInPicture;
> @end
> 
>-class WKFullScreenViewControllerPlaybackSessionModelClient : PlaybackSessionModelClient {
>+class WKFullScreenViewControllerPlaybackSessionModelClient : WebCore::PlaybackSessionModelClient {
> public:
>     void setParent(WKFullScreenViewController *parent) { m_parent = parent; }
> 
>@@ -74,7 +71,7 @@
>         m_parent.pictureInPictureActive = active;
>     }
> 
>-    void setInterface(PlaybackSessionInterfaceAVKit* interface)
>+    void setInterface(WebCore::PlaybackSessionInterfaceAVKit* interface)
>     {
>         if (m_interface == interface)
>             return;
>@@ -88,14 +85,14 @@
> 
> private:
>     WKFullScreenViewController *m_parent { nullptr };
>-    RefPtr<PlaybackSessionInterfaceAVKit> m_interface;
>+    RefPtr<WebCore::PlaybackSessionInterfaceAVKit> m_interface;
> };
> 
>-class WKFullScreenViewControllerVideoFullscreenModelClient : VideoFullscreenModelClient {
>+class WKFullScreenViewControllerVideoFullscreenModelClient : WebCore::VideoFullscreenModelClient {
> public:
>     void setParent(WKFullScreenViewController *parent) { m_parent = parent; }
> 
>-    void setInterface(VideoFullscreenInterfaceAVKit* interface)
>+    void setInterface(WebCore::VideoFullscreenInterfaceAVKit* interface)
>     {
>         if (m_interface == interface)
>             return;
>@@ -107,7 +104,7 @@
>             m_interface->videoFullscreenModel()->addClient(*this);
>     }
> 
>-    VideoFullscreenInterfaceAVKit* interface() const { return m_interface.get(); }
>+    WebCore::VideoFullscreenInterfaceAVKit* interface() const { return m_interface.get(); }
> 
>     void willEnterPictureInPicture() final
>     {
>@@ -126,7 +123,7 @@
> 
> private:
>     WKFullScreenViewController *m_parent { nullptr };
>-    RefPtr<VideoFullscreenInterfaceAVKit> m_interface;
>+    RefPtr<WebCore::VideoFullscreenInterfaceAVKit> m_interface;
> };
> 
> #pragma mark - _WKExtrinsicButton
>@@ -152,7 +149,7 @@
> 
> @interface WKFullScreenViewController () <UIGestureRecognizerDelegate, UIToolbarDelegate>
> @property (weak, nonatomic) WKWebView *_webView; // Cannot be retained, see <rdar://problem/14884666>.
>-@property (readonly, nonatomic) WebFullScreenManagerProxy* _manager;
>+@property (readonly, nonatomic) WebKit::WebFullScreenManagerProxy* _manager;
> @property (readonly, nonatomic) WebCore::FloatBoxExtent _effectiveFullscreenInsets;
> @end
> 
>@@ -260,7 +257,7 @@
> 
> - (void)videoControlsManagerDidChange
> {
>-    WebPageProxy* page = [self._webView _page];
>+    WebKit::WebPageProxy* page = [self._webView _page];
>     auto* videoFullscreenManager = page ? page->videoFullscreenManager() : nullptr;
>     auto* videoFullscreenInterface = videoFullscreenManager ? videoFullscreenManager->controlsManagerInterface() : nullptr;
>     auto* playbackSessionInterface = videoFullscreenInterface ? &videoFullscreenInterface->playbackSessionInterface() : nullptr;
>@@ -268,7 +265,7 @@
>     _playbackClient.setInterface(playbackSessionInterface);
>     _videoFullscreenClient.setInterface(videoFullscreenInterface);
> 
>-    PlaybackSessionModel* playbackSessionModel = playbackSessionInterface ? playbackSessionInterface->playbackSessionModel() : nullptr;
>+    WebCore::PlaybackSessionModel* playbackSessionModel = playbackSessionInterface ? playbackSessionInterface->playbackSessionModel() : nullptr;
>     self.playing = playbackSessionModel ? playbackSessionModel->isPlaying() : NO;
>     [_pipButton setHidden:!playbackSessionModel];
> }
>@@ -481,7 +478,7 @@
> #pragma mark - Internal Interface
> 
> @dynamic _manager;
>-- (WebFullScreenManagerProxy*)_manager
>+- (WebKit::WebFullScreenManagerProxy*)_manager
> {
>     if (auto* page = [self._webView _page])
>         return page->fullScreenManager();
>@@ -507,11 +504,11 @@
> 
> - (void)_togglePiPAction:(id)sender
> {
>-    WebPageProxy* page = [self._webView _page];
>+    WebKit::WebPageProxy* page = [self._webView _page];
>     if (!page)
>         return;
> 
>-    PlaybackSessionManagerProxy* playbackSessionManager = page->playbackSessionManager();
>+    WebKit::PlaybackSessionManagerProxy* playbackSessionManager = page->playbackSessionManager();
>     if (!playbackSessionManager)
>         return;
> 
>@@ -519,7 +516,7 @@
>     if (!playbackSessionInterface)
>         return;
> 
>-    PlaybackSessionModel* playbackSessionModel = playbackSessionInterface->playbackSessionModel();
>+    WebCore::PlaybackSessionModel* playbackSessionModel = playbackSessionInterface->playbackSessionModel();
>     if (!playbackSessionModel)
>         return;
> 
>Index: Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm	(revision 239007)
>+++ Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm	(working copy)
>@@ -53,8 +53,6 @@
> #import <wtf/cocoa/NSURLExtras.h>
> #import <wtf/spi/cocoa/SecuritySPI.h>
> 
>-using namespace WebKit;
>-using namespace WebCore;
> 
> #if !HAVE(URL_FORMATTING)
> SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(LinkPresentation)
>@@ -61,6 +59,8 @@
> #endif
> 
> namespace WebKit {
>+using namespace WebKit;
>+using namespace WebCore;
> 
> static CGSize sizeExpandedToSize(CGSize initial, CGSize other)
> {
>@@ -1049,4 +1049,5 @@
> 
> @end
> 
>+
> #endif // PLATFORM(IOS_FAMILY) && ENABLE(FULLSCREEN_API)
>Index: Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(revision 239007)
>+++ 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(m_process->checkURLReceivedFromWebProcess(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()) {
>Index: Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>===================================================================
>--- Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp	(revision 239007)
>+++ Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp	(working copy)
>@@ -35,11 +35,10 @@
> #include "WebProcess.h"
> #include <wtf/MainThread.h>
> 
>+namespace WebKit {
> using namespace WebCore::DOMCacheEngine;
>-using namespace WebKit::CacheStorage;
>+using namespace CacheStorage;
> 
>-namespace WebKit {
>-
> WebCacheStorageConnection::WebCacheStorageConnection(WebCacheStorageProvider& provider, PAL::SessionID sessionID)
>     : m_provider(provider)
>     , m_sessionID(sessionID)
>Index: Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm	(revision 239007)
>+++ Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm	(working copy)
>@@ -40,12 +40,9 @@
> #import <wtf/RetainPtr.h>
> #import <wtf/text/TextStream.h>
> 
>-using namespace WTF;
>-using namespace WebCore;
>-
> static MonotonicTime mediaTimeToCurrentTime(CFTimeInterval t)
> {
>-    return MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
>+    return WTF::MonotonicTime::now() + Seconds(t - CACurrentMediaTime());
> }
> 
> static NSString * const WKExplicitBeginTimeFlag = @"WKPlatformCAAnimationExplicitBeginTimeFlag";
>@@ -55,7 +52,7 @@
> 
> @implementation WKAnimationDelegate
> 
>-- (instancetype)initWithLayerID:(GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
>+- (instancetype)initWithLayerID:(WebCore::GraphicsLayer::PlatformLayerID)layerID layerTreeHost:(WebKit::RemoteLayerTreeHost*)layerTreeHost
> {
>     if ((self = [super init])) {
>         _layerID = layerID;
>@@ -98,6 +95,7 @@
> @end
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> void PlatformCAAnimationRemote::KeyframeValue::encode(IPC::Encoder& encoder) const
> {
>Index: Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(revision 239007)
>+++ Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm	(working copy)
>@@ -48,8 +48,6 @@
> #import <pal/spi/mac/NSAccessibilitySPI.h>
> #import <wtf/ObjCRuntimeExtras.h>
> 
>-using namespace WebCore;
>-using namespace WebKit;
> 
> @implementation WKAccessibilityWebPageObject
> 
>@@ -218,7 +216,7 @@
>     
>     // Some plugins may be able to figure out the scroll position and inset on their own.
>     bool applyContentOffset = true;
>-    if (auto pluginView = WebPage::pluginViewForFrame(m_page->mainFrame()))
>+    if (auto pluginView = WebKit::WebPage::pluginViewForFrame(m_page->mainFrame()))
>         applyContentOffset = !pluginView->plugin()->pluginHandlesContentOffsetForAccessibilityHitTest();
> 
>     if (applyContentOffset) {

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