Attachment 356852 Details for Bug 192373 – patch for landing

[patch] patch for landing

patch (text/plain), 51.00 KB, created by chris fleizach on 2018-12-07 16:46:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-12-07 16:46:02 PST

Size: 51.00 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 238967)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,91 @@
>+2018-12-07  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Support keyboard access preference for iOS in WebKit
>+        https://bugs.webkit.org/show_bug.cgi?id=192373
>+        <rdar://problem/46462670>
>+
>+        Reviewed by Tim Horton.
>+
>+        A side effect of moving the WKFullKeyboardAccessWatcher file was the unified source compilation changed,
>+        which introduced namespacing and #importing build errors (hence the large set of changes here).
>+
>+        * 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:
>+        * Platform/spi/ios/AccessibilitySupportSPI.h:
>+        * PlatformMac.cmake:
>+        * PluginProcess/PluginControllerProxy.cpp:
>+        * PluginProcess/PluginProcess.cpp:
>+        * PluginProcess/WebProcessConnection.cpp:
>+        * Scripts/PreferencesTemplates/WebPreferencesStoreDefaultsMap.cpp.erb:
>+        * Shared/API/c/cf/WKErrorCF.cpp:
>+        * 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:
>+        * SourcesCocoa.txt:
>+        * UIProcess/API/APIContentRuleListStore.cpp:
>+        * UIProcess/API/APINavigation.cpp:
>+        * UIProcess/API/APIOpenPanelParameters.cpp:
>+        * UIProcess/API/APIPageConfiguration.cpp:
>+        * UIProcess/API/C/WKPage.cpp:
>+        * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h: Added.
>+        * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm: Added.
>+        (platformIsFullKeyboardAccessEnabled):
>+        (-[WKFullKeyboardAccessWatcher notifyAllProcessPools]):
>+        (-[WKFullKeyboardAccessWatcher retrieveKeyboardUIModeFromPreferences:]):
>+        (-[WKFullKeyboardAccessWatcher init]):
>+        (+[WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled]):
>+        * 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:
>+        (WebKit::WebProcessProxy::fullKeyboardAccessEnabled):
>+        * 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:
>+        (WebKit::sizeExpandedToSize): Deleted.
>+        (WebKit::safeInlineRect): Deleted.
>+        (WebKit::replaceViewWithView): Deleted.
>+        (WebKit::WKWebViewState::applyTo): Deleted.
>+        (WebKit::WKWebViewState::store): Deleted.
>+        * UIProcess/mac/WKFullKeyboardAccessWatcher.h: Removed.
>+        * UIProcess/mac/WKFullKeyboardAccessWatcher.mm: Removed.
>+        * UIProcess/mac/WebPageProxyMac.mm:
>+        * WebKit.xcodeproj/project.pbxproj:
>+        * WebProcess/Cache/WebCacheStorageConnection.cpp:
>+
> 2018-12-07  Youenn Fablet  <youenn@apple.com>
> 
>         Update libwebrtc up to 0d007d7c4f
>Index: Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/Cookies/mac/WebCookieManagerMac.mm	(revision 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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/Platform/spi/ios/AccessibilitySupportSPI.h
>===================================================================
>--- Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h	(revision 238950)
>+++ Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h	(working copy)
>@@ -38,5 +38,7 @@
> extern CFTimeInterval _AXSKeyRepeatDelay();
> extern CFStringRef kAXSWebAccessibilityEventsEnabledNotification;
> extern Boolean _AXSWebAccessibilityEventsEnabled();
>+extern CFStringRef kAXSFullKeyboardAccessEnabledNotification;
>+extern Boolean _AXSFullKeyboardAccessEnabled();
> 
> WTF_EXTERN_C_END
>Index: Source/WebKit/PlatformMac.cmake
>===================================================================
>--- Source/WebKit/PlatformMac.cmake	(revision 238950)
>+++ Source/WebKit/PlatformMac.cmake	(working copy)
>@@ -256,6 +256,7 @@
>     UIProcess/Cocoa/UIDelegate.mm
>     UIProcess/Cocoa/VersionChecks.mm
>     UIProcess/Cocoa/ViewGestureController.cpp
>+    UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
>     UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
>     UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
>     UIProcess/Cocoa/WebPageProxyCocoa.mm
>@@ -296,7 +297,6 @@
>     UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
>     UIProcess/mac/ViewGestureControllerMac.mm
>     UIProcess/mac/ViewSnapshotStore.mm
>-    UIProcess/mac/WKFullKeyboardAccessWatcher.mm
>     UIProcess/mac/WKFullScreenWindowController.mm
>     UIProcess/mac/WKImmediateActionController.mm
>     UIProcess/mac/WKInspectorViewController.mm
>Index: Source/WebKit/PluginProcess/PluginControllerProxy.cpp
>===================================================================
>--- Source/WebKit/PluginProcess/PluginControllerProxy.cpp	(revision 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ Source/WebKit/Shared/API/c/cf/WKErrorCF.cpp	(working copy)
>@@ -29,6 +29,8 @@
> #include "APIError.h"
> #include "WKAPICast.h"
> 
>+namespace WebKit {
>+
> using namespace WebCore;
> using namespace WebKit;
> 
>@@ -42,3 +44,5 @@
>     RetainPtr<CFErrorRef> cfError = toImpl(error)->platformError().cfError();
>     return cfError.leakRef();
> }
>+
>+}
>Index: Source/WebKit/Shared/API/c/cf/WKErrorCF.h
>===================================================================
>--- Source/WebKit/Shared/API/c/cf/WKErrorCF.h	(revision 238950)
>+++ Source/WebKit/Shared/API/c/cf/WKErrorCF.h	(working copy)
>@@ -33,9 +33,12 @@
> extern "C" {
> #endif
> 
>+namespace WebKit {
>+
> WK_EXPORT WKErrorRef WKErrorCreateWithCFError(CFErrorRef error);
> WK_EXPORT CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error) CF_RETURNS_RETAINED;
> 
>+}
> #ifdef __cplusplus
> }
> #endif
>Index: Source/WebKit/Shared/API/c/cg/WKImageCG.cpp
>===================================================================
>--- Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(revision 238950)
>+++ Source/WebKit/Shared/API/c/cg/WKImageCG.cpp	(working copy)
>@@ -32,6 +32,8 @@
> #include <WebCore/ColorSpace.h>
> #include <WebCore/GraphicsContext.h>
> 
>+namespace WebKit {
>+
> using namespace WebKit;
> using namespace WebCore;
> 
>@@ -58,3 +60,5 @@
>     graphicsContext->drawNativeImage(imageRef, imageSize, rect, rect);
>     return toAPI(webImage.leakRef());
> }
>+
>+}
>Index: Source/WebKit/Shared/API/c/cg/WKImageCG.h
>===================================================================
>--- Source/WebKit/Shared/API/c/cg/WKImageCG.h	(revision 238950)
>+++ Source/WebKit/Shared/API/c/cg/WKImageCG.h	(working copy)
>@@ -34,10 +34,14 @@
> extern "C" {
> #endif
> 
>+namespace WebKit {
>+
> WK_EXPORT CGImageRef WKImageCreateCGImage(WKImageRef image) CF_RETURNS_RETAINED;
> 
> WK_EXPORT WKImageRef WKImageCreateFromCGImage(CGImageRef imageRef, WKImageOptions options);
> 
>+}
>+
> #ifdef __cplusplus
> }
> #endif
>Index: Source/WebKit/Shared/ChildProcess.cpp
>===================================================================
>--- Source/WebKit/Shared/ChildProcess.cpp	(revision 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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/SourcesCocoa.txt
>===================================================================
>--- Source/WebKit/SourcesCocoa.txt	(revision 238950)
>+++ Source/WebKit/SourcesCocoa.txt	(working copy)
>@@ -338,6 +338,7 @@
> UIProcess/Cocoa/WebProcessProxyCocoa.mm
> UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
> UIProcess/Cocoa/WebViewImpl.mm
>+UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
> UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
> UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
> 
>@@ -425,7 +426,6 @@
> UIProcess/mac/WebPreferencesMac.mm
> UIProcess/mac/WebProcessProxyMac.mm
> UIProcess/mac/WindowServerConnection.mm
>-UIProcess/mac/WKFullKeyboardAccessWatcher.mm
> UIProcess/mac/WKFullScreenWindowController.mm
> UIProcess/mac/WKImmediateActionController.mm
> UIProcess/mac/WKInspectorViewController.mm
>Index: Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIContentRuleListStore.cpp	(revision 238950)
>+++ 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/APINavigation.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APINavigation.cpp	(revision 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ Source/WebKit/UIProcess/API/C/WKPage.cpp	(working copy)
>@@ -101,6 +101,7 @@
> using namespace WebKit;
> 
> namespace API {
>+
> template<> struct ClientTraits<WKPageLoaderClientBase> {
>     typedef std::tuple<WKPageLoaderClientV0, WKPageLoaderClientV1, WKPageLoaderClientV2, WKPageLoaderClientV3, WKPageLoaderClientV4, WKPageLoaderClientV5, WKPageLoaderClientV6> Versions;
> };
>Index: Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h	(nonexistent)
>+++ Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h	(working copy)
>@@ -0,0 +1,39 @@
>+/*
>+ * Copyright (C) 2011 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if PLATFORM(COCOA)
>+
>+@interface WKFullKeyboardAccessWatcher : NSObject {
>+@private
>+    BOOL fullKeyboardAccessEnabled;
>+}
>+
>++ (BOOL)fullKeyboardAccessEnabled;
>+
>+@end;
>+
>+#endif // PLATFORM(COCOA)
>Index: Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm	(nonexistent)
>+++ Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm	(working copy)
>@@ -0,0 +1,111 @@
>+/*
>+ * Copyright (C) 2011, 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#import "config.h"
>+#import "WKFullKeyboardAccessWatcher.h"
>+
>+#if PLATFORM(COCOA)
>+
>+#import "AccessibilitySupportSPI.h"
>+#import "WebProcessPool.h"
>+
>+#if PLATFORM(MAC)
>+static NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange";
>+static const CFStringRef AppleKeyboardUIMode = CFSTR("AppleKeyboardUIMode");
>+#endif
>+
>+@implementation WKFullKeyboardAccessWatcher
>+
>+static inline BOOL platformIsFullKeyboardAccessEnabled()
>+{
>+    BOOL fullKeyboardAccessEnabled = NO;
>+#if PLATFORM(MAC)
>+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
>+    
>+    Boolean keyExistsAndHasValidFormat;
>+    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
>+    if (keyExistsAndHasValidFormat) {
>+        // The keyboard access mode has two bits:
>+        // Bit 0 is set if user can set the focus to menus, the dock, and various windows using the keyboard.
>+        // Bit 1 is set if controls other than text fields are included in the tab order (WebKit also always includes lists).
>+        fullKeyboardAccessEnabled = (mode & 0x2);
>+    }
>+#elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
>+    fullKeyboardAccessEnabled = _AXSFullKeyboardAccessEnabled();
>+#endif
>+    
>+    return fullKeyboardAccessEnabled;
>+}
>+
>+- (void)notifyAllProcessPools
>+{
>+    for (auto* processPool : WebKit::WebProcessPool::allProcessPools())
>+        processPool->fullKeyboardAccessModeChanged(fullKeyboardAccessEnabled);
>+}
>+
>+- (void)retrieveKeyboardUIModeFromPreferences:(NSNotification *)notification
>+{
>+    BOOL oldValue = fullKeyboardAccessEnabled;
>+
>+    fullKeyboardAccessEnabled = platformIsFullKeyboardAccessEnabled();
>+    
>+    if (fullKeyboardAccessEnabled != oldValue)
>+        [self notifyAllProcessPools];
>+}
>+
>+- (id)init
>+{
>+    self = [super init];
>+    if (!self)
>+        return nil;
>+
>+    [self retrieveKeyboardUIModeFromPreferences:nil];
>+
>+    NSNotificationCenter *notificationCenter = nil;
>+    NSString *notitificationName = nil;
>+    
>+#if PLATFORM(MAC)
>+    notificationCenter = [NSDistributedNotificationCenter defaultCenter];
>+    notitificationName = KeyboardUIModeDidChangeNotification;
>+#elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
>+    notificationCenter = [NSNotificationCenter defaultCenter];
>+    notitificationName = (NSString *)kAXSFullKeyboardAccessEnabledNotification;
>+#endif
>+    
>+    if (notitificationName)
>+        [notificationCenter addObserver:self selector:@selector(retrieveKeyboardUIModeFromPreferences:) name:notitificationName object:nil];
>+
>+    return self;
>+}
>+
>++ (BOOL)fullKeyboardAccessEnabled
>+{
>+    static WKFullKeyboardAccessWatcher *watcher = [[WKFullKeyboardAccessWatcher alloc] init];
>+    return watcher->fullKeyboardAccessEnabled;
>+}
>+
>+@end
>+
>+#endif // PLATFORM(COCOA)
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.h	(revision 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ 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 238950)
>+++ Source/WebKit/UIProcess/ios/WKContentView.mm	(working copy)
>@@ -62,10 +62,11 @@
> #import <wtf/RetainPtr.h>
> #import <wtf/text/TextStream.h>
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> namespace WebKit {
>+using namespace WebCore;
>+
> class HistoricalVelocityData {
> public:
>     struct VelocityData {
>Index: Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(revision 238950)
>+++ Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	(working copy)
>@@ -142,10 +142,10 @@
> 
> #endif
> 
>-using namespace WebCore;
> using namespace WebKit;
> 
> namespace WebKit {
>+using namespace WebCore;
> 
> WKSelectionDrawingInfo::WKSelectionDrawingInfo()
>     : type(SelectionType::None)
>Index: Source/WebKit/UIProcess/ios/WebProcessProxyIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/WebProcessProxyIOS.mm	(revision 238950)
>+++ Source/WebKit/UIProcess/ios/WebProcessProxyIOS.mm	(working copy)
>@@ -28,8 +28,7 @@
> 
> #if PLATFORM(IOS_FAMILY)
> 
>-#import <WebCore/NotImplemented.h>
>-
>+#import "WKFullKeyboardAccessWatcher.h"
> #import "WebProcessMessages.h"
> 
> namespace WebKit {
>@@ -36,8 +35,7 @@
> 
> bool WebProcessProxy::fullKeyboardAccessEnabled()
> {
>-    notImplemented();
>-    return false;
>+    return [WKFullKeyboardAccessWatcher fullKeyboardAccessEnabled];
> }
> 
> } // namespace WebKit
>Index: Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm	(revision 238950)
>+++ Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm	(working copy)
>@@ -53,14 +53,15 @@
> #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)
> #endif
> 
>+using namespace WebKit;
>+
> namespace WebKit {
>+using namespace WebCore;
> 
> static CGSize sizeExpandedToSize(CGSize initial, CGSize other)
> {
>@@ -1049,4 +1050,5 @@
> 
> @end
> 
>+
> #endif // PLATFORM(IOS_FAMILY) && ENABLE(FULLSCREEN_API)
>Index: Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.h
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.h	(revision 238950)
>+++ Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.h	(nonexistent)
>@@ -1,42 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef WKFullKeyboardAccessWatcher_h
>-#define WKFullKeyboardAccessWatcher_h
>-
>-#if PLATFORM(MAC)
>-
>-@interface WKFullKeyboardAccessWatcher : NSObject {
>-@private
>-    BOOL fullKeyboardAccessEnabled;
>-}
>-
>-+ (BOOL)fullKeyboardAccessEnabled;
>-
>-@end;
>-
>-#endif // PLATFORM(MAC)
>-
>-#endif // WKFullKeyboardAccessWatcher_h
>
>Property changes on: Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.h
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.mm	(revision 238950)
>+++ Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.mm	(nonexistent)
>@@ -1,86 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#import "config.h"
>-#import "WKFullKeyboardAccessWatcher.h"
>-
>-#if PLATFORM(MAC)
>-
>-#import "WebProcessPool.h"
>-
>-NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange";
>-const CFStringRef AppleKeyboardUIMode = CFSTR("AppleKeyboardUIMode");
>-
>-@implementation WKFullKeyboardAccessWatcher
>-
>-- (void)notifyAllProcessPools
>-{
>-    for (auto* processPool : WebKit::WebProcessPool::allProcessPools())
>-        processPool->fullKeyboardAccessModeChanged(fullKeyboardAccessEnabled);
>-}
>-
>-- (void)retrieveKeyboardUIModeFromPreferences:(NSNotification *)notification
>-{
>-    BOOL oldValue = fullKeyboardAccessEnabled;
>-
>-    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
>-
>-    Boolean keyExistsAndHasValidFormat;
>-    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
>-    if (keyExistsAndHasValidFormat) {
>-        // The keyboard access mode has two bits:
>-        // Bit 0 is set if user can set the focus to menus, the dock, and various windows using the keyboard.
>-        // Bit 1 is set if controls other than text fields are included in the tab order (WebKit also always includes lists).
>-        fullKeyboardAccessEnabled = (mode & 0x2);
>-    }
>-
>-    if (fullKeyboardAccessEnabled != oldValue)
>-        [self notifyAllProcessPools];
>-}
>-
>-- (id)init
>-{
>-    self = [super init];
>-    if (!self)
>-        return nil;
>-
>-    [self retrieveKeyboardUIModeFromPreferences:nil];
>-
>-    [[NSDistributedNotificationCenter defaultCenter] 
>-        addObserver:self selector:@selector(retrieveKeyboardUIModeFromPreferences:) 
>-        name:KeyboardUIModeDidChangeNotification object:nil];
>-
>-    return self;
>-}
>-
>-+ (BOOL)fullKeyboardAccessEnabled
>-{
>-    static WKFullKeyboardAccessWatcher *watcher = [[WKFullKeyboardAccessWatcher alloc] init];
>-    return watcher->fullKeyboardAccessEnabled;
>-}
>-
>-@end
>-
>-#endif // PLATFORM(MAC)
>
>Property changes on: Source/WebKit/UIProcess/mac/WKFullKeyboardAccessWatcher.mm
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Index: Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WebPageProxyMac.mm	(revision 238950)
>+++ 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/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 238950)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -5329,6 +5329,8 @@
> 				51D124321E6DE521002B2820 /* WebURLSchemeHandlerCocoa.mm */,
> 				2DFC7DB91BCCC19500C1548C /* WebViewImpl.h */,
> 				2DFC7DBA1BCCC19500C1548C /* WebViewImpl.mm */,
>+				E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */,
>+				E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */,
> 				1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */,
> 				1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */,
> 				5CA26D80217ABBB600F97A35 /* WKSafeBrowsingWarning.h */,
>@@ -8160,8 +8162,6 @@
> 				51D130571382F10500351EDD /* WebProcessProxyMac.mm */,
> 				868160CD18763D4B0021E79D /* WindowServerConnection.h */,
> 				868160CF187645370021E79D /* WindowServerConnection.mm */,
>-				E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */,
>-				E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */,
> 				CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */,
> 				CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */,
> 				9321D5851A38EE3C008052BE /* WKImmediateActionController.h */,
>Index: Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp
>===================================================================
>--- Source/WebKit/WebProcess/Cache/WebCacheStorageConnection.cpp	(revision 238950)
>+++ 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;
> 
>-namespace WebKit {
>-
> WebCacheStorageConnection::WebCacheStorageConnection(WebCacheStorageProvider& provider, PAL::SessionID sessionID)
>     : m_provider(provider)
>     , m_sessionID(sessionID)

Actions: View | Formatted Diff | Diff

Attachments on bug 192373: 356563 | 356573 | 356574 | 356663 | 356664 | 356666 | 356675 | 356688 | 356766 | 356786 | 356787 | 356809 | 356833 | 356849 | 356852 | 356975 | 356986 | 357037 | 357421