Attachment 356367 Details for Bug 192301 – Patch

[patch] Patch

bug-192301-20181203184734.patch (text/plain), 102.28 KB, created by Fujii Hironori on 2018-12-03 01:47:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-12-03 01:47:36 PST

Size: 102.28 KB

patch

obsolete

>Subversion Revision: 238790
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 9783723a2578e59a8bac716a1d67f7d3ce1485e0..f3d8a2fcb8bb4bb143182a11ab3ee03aa73748d5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-12-03  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Remove "using namespace WebKit" under Source/WebKit/WebProcess/InjectedBundle/API
>+        https://bugs.webkit.org/show_bug.cgi?id=192301
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Removed "using namespace WebKit" statement, and use "WebKit::"
>+        namespace prefix instead.
>+
>+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp:
>+        * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp:
>+
> 2018-12-01  Chris Dumez  <cdumez@apple.com>
> 
>         [PSON] process-swapping may occur even though opener has handle to openee
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>index 1ce2524edbaf2fbf1aa5b8d97ec8a5e30b875756..2eea8cc8d8d63fe508b5ba2d40924974ddc2bbbe 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
>@@ -48,179 +48,177 @@
> #include <WebCore/ResourceLoadObserver.h>
> #include <WebCore/ServiceWorkerThreadProxy.h>
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleGetTypeID()
> {
>-    return toAPI(InjectedBundle::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundle::APIType);
> }
> 
> void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClientBase *wkClient)
> {
>-    toImpl(bundleRef)->setClient(std::make_unique<InjectedBundleClient>(wkClient));
>+    WebKit::toImpl(bundleRef)->setClient(std::make_unique<WebKit::InjectedBundleClient>(wkClient));
> }
> 
> void WKBundleSetServiceWorkerProxyCreationCallback(WKBundleRef bundleRef, void (*callback)(uint64_t))
> {
>-    toImpl(bundleRef)->setServiceWorkerProxyCreationCallback(callback);
>+    WebKit::toImpl(bundleRef)->setServiceWorkerProxyCreationCallback(callback);
> }
> 
> void WKBundlePostMessage(WKBundleRef bundleRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
> {
>-    toImpl(bundleRef)->postMessage(toWTFString(messageNameRef), toImpl(messageBodyRef));
>+    WebKit::toImpl(bundleRef)->postMessage(WebKit::toWTFString(messageNameRef), WebKit::toImpl(messageBodyRef));
> }
> 
> void WKBundlePostSynchronousMessage(WKBundleRef bundleRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef, WKTypeRef* returnDataRef)
> {
>     RefPtr<API::Object> returnData;
>-    toImpl(bundleRef)->postSynchronousMessage(toWTFString(messageNameRef), toImpl(messageBodyRef), returnData);
>+    WebKit::toImpl(bundleRef)->postSynchronousMessage(WebKit::toWTFString(messageNameRef), WebKit::toImpl(messageBodyRef), returnData);
>     if (returnDataRef)
>-        *returnDataRef = toAPI(returnData.leakRef());
>+        *returnDataRef = WebKit::toAPI(returnData.leakRef());
> }
> 
> WKConnectionRef WKBundleGetApplicationConnection(WKBundleRef bundleRef)
> {
>-    return toAPI(toImpl(bundleRef)->webConnectionToUIProcess());
>+    return toAPI(WebKit::toImpl(bundleRef)->webConnectionToUIProcess());
> }
> 
> void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundleRef)
> {
>-    toImpl(bundleRef)->garbageCollectJavaScriptObjects();
>+    WebKit::toImpl(bundleRef)->garbageCollectJavaScriptObjects();
> }
> 
> void WKBundleGarbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(WKBundleRef bundleRef, bool waitUntilDone)
> {
>-    toImpl(bundleRef)->garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(waitUntilDone);
>+    WebKit::toImpl(bundleRef)->garbageCollectJavaScriptObjectsOnAlternateThreadForDebugging(waitUntilDone);
> }
> 
> size_t WKBundleGetJavaScriptObjectsCount(WKBundleRef bundleRef)
> {
>-    return toImpl(bundleRef)->javaScriptObjectsCount();
>+    return WebKit::toImpl(bundleRef)->javaScriptObjectsCount();
> }
> 
> void WKBundleAddUserScript(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef, WKStringRef sourceRef, WKURLRef urlRef, WKArrayRef whitelistRef, WKArrayRef blacklistRef, _WKUserScriptInjectionTime injectionTimeRef, WKUserContentInjectedFrames injectedFramesRef)
> {
>-    toImpl(bundleRef)->addUserScript(toImpl(pageGroupRef), toImpl(scriptWorldRef), toWTFString(sourceRef), toWTFString(urlRef), toImpl(whitelistRef), toImpl(blacklistRef), toUserScriptInjectionTime(injectionTimeRef), toUserContentInjectedFrames(injectedFramesRef));
>+    WebKit::toImpl(bundleRef)->addUserScript(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef), WebKit::toWTFString(sourceRef), WebKit::toWTFString(urlRef), WebKit::toImpl(whitelistRef), WebKit::toImpl(blacklistRef), WebKit::toUserScriptInjectionTime(injectionTimeRef), WebKit::toUserContentInjectedFrames(injectedFramesRef));
> }
> 
> void WKBundleAddUserStyleSheet(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef, WKStringRef sourceRef, WKURLRef urlRef, WKArrayRef whitelistRef, WKArrayRef blacklistRef, WKUserContentInjectedFrames injectedFramesRef)
> {
>-    toImpl(bundleRef)->addUserStyleSheet(toImpl(pageGroupRef), toImpl(scriptWorldRef), toWTFString(sourceRef), toWTFString(urlRef), toImpl(whitelistRef), toImpl(blacklistRef), toUserContentInjectedFrames(injectedFramesRef));
>+    WebKit::toImpl(bundleRef)->addUserStyleSheet(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef), WebKit::toWTFString(sourceRef), WebKit::toWTFString(urlRef), WebKit::toImpl(whitelistRef), WebKit::toImpl(blacklistRef), WebKit::toUserContentInjectedFrames(injectedFramesRef));
> }
> 
> void WKBundleRemoveUserScript(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef, WKURLRef urlRef)
> {
>-    toImpl(bundleRef)->removeUserScript(toImpl(pageGroupRef), toImpl(scriptWorldRef), toWTFString(urlRef));
>+    WebKit::toImpl(bundleRef)->removeUserScript(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef), WebKit::toWTFString(urlRef));
> }
> 
> void WKBundleRemoveUserStyleSheet(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef, WKURLRef urlRef)
> {
>-    toImpl(bundleRef)->removeUserStyleSheet(toImpl(pageGroupRef), toImpl(scriptWorldRef), toWTFString(urlRef));
>+    WebKit::toImpl(bundleRef)->removeUserStyleSheet(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef), WebKit::toWTFString(urlRef));
> }
> 
> void WKBundleRemoveUserScripts(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef)
> {
>-    toImpl(bundleRef)->removeUserScripts(toImpl(pageGroupRef), toImpl(scriptWorldRef));
>+    WebKit::toImpl(bundleRef)->removeUserScripts(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef));
> }
> 
> void WKBundleRemoveUserStyleSheets(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKBundleScriptWorldRef scriptWorldRef)
> {
>-    toImpl(bundleRef)->removeUserStyleSheets(toImpl(pageGroupRef), toImpl(scriptWorldRef));
>+    WebKit::toImpl(bundleRef)->removeUserStyleSheets(WebKit::toImpl(pageGroupRef), WebKit::toImpl(scriptWorldRef));
> }
> 
> void WKBundleRemoveAllUserContent(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef)
> {
>-    toImpl(bundleRef)->removeAllUserContent(toImpl(pageGroupRef));
>+    WebKit::toImpl(bundleRef)->removeAllUserContent(WebKit::toImpl(pageGroupRef));
> }
> 
> void WKBundleOverrideBoolPreferenceForTestRunner(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKStringRef preference, bool enabled)
> {
>-    toImpl(bundleRef)->overrideBoolPreferenceForTestRunner(toImpl(pageGroupRef), toWTFString(preference), enabled);
>+    WebKit::toImpl(bundleRef)->overrideBoolPreferenceForTestRunner(WebKit::toImpl(pageGroupRef), WebKit::toWTFString(preference), enabled);
> }
> 
> void WKBundleSetAllowUniversalAccessFromFileURLs(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setAllowUniversalAccessFromFileURLs(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setAllowUniversalAccessFromFileURLs(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetAllowFileAccessFromFileURLs(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setAllowFileAccessFromFileURLs(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setAllowFileAccessFromFileURLs(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetAllowStorageAccessFromFileURLS(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool needsQuirk)
> {
>-    toImpl(bundleRef)->setNeedsStorageAccessFromFileURLsQuirk(toImpl(pageGroupRef), needsQuirk);
>+    WebKit::toImpl(bundleRef)->setNeedsStorageAccessFromFileURLsQuirk(WebKit::toImpl(pageGroupRef), needsQuirk);
> }
> 
> void WKBundleSetMinimumLogicalFontSize(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, int size)
> {
>-    toImpl(bundleRef)->setMinimumLogicalFontSize(toImpl(pageGroupRef), size);
>+    WebKit::toImpl(bundleRef)->setMinimumLogicalFontSize(WebKit::toImpl(pageGroupRef), size);
> }
> 
> void WKBundleSetFrameFlatteningEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setFrameFlatteningEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setFrameFlatteningEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetAsyncFrameScrollingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setAsyncFrameScrollingEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setAsyncFrameScrollingEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetJavaScriptCanAccessClipboard(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setJavaScriptCanAccessClipboard(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setJavaScriptCanAccessClipboard(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetPrivateBrowsingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setPrivateBrowsingEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setPrivateBrowsingEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetUseDashboardCompatibilityMode(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setUseDashboardCompatibilityMode(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setUseDashboardCompatibilityMode(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetPopupBlockingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setPopupBlockingEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setPopupBlockingEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetAuthorAndUserStylesEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setAuthorAndUserStylesEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setAuthorAndUserStylesEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleSetSpatialNavigationEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setSpatialNavigationEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setSpatialNavigationEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
> {
>-    toImpl(bundleRef)->addOriginAccessWhitelistEntry(toWTFString(sourceOrigin), toWTFString(destinationProtocol), toWTFString(destinationHost), allowDestinationSubdomains);
>+    WebKit::toImpl(bundleRef)->addOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
> }
> 
> void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
> {
>-    toImpl(bundleRef)->removeOriginAccessWhitelistEntry(toWTFString(sourceOrigin), toWTFString(destinationProtocol), toWTFString(destinationHost), allowDestinationSubdomains);
>+    WebKit::toImpl(bundleRef)->removeOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
> }
> 
> void WKBundleResetOriginAccessWhitelists(WKBundleRef bundleRef)
> {
>-    toImpl(bundleRef)->resetOriginAccessWhitelists();
>+    WebKit::toImpl(bundleRef)->resetOriginAccessWhitelists();
> }
> 
> void WKBundleSetAsynchronousSpellCheckingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)
> {
>-    toImpl(bundleRef)->setAsynchronousSpellCheckingEnabled(toImpl(pageGroupRef), enabled);
>+    WebKit::toImpl(bundleRef)->setAsynchronousSpellCheckingEnabled(WebKit::toImpl(pageGroupRef), enabled);
> }
> 
> WKArrayRef WKBundleGetLiveDocumentURLs(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool excludeDocumentsInPageGroupPages)
> {
>-    auto liveDocuments = toImpl(bundleRef)->liveDocumentURLs(toImpl(pageGroupRef), excludeDocumentsInPageGroupPages);
>+    auto liveDocuments = WebKit::toImpl(bundleRef)->liveDocumentURLs(WebKit::toImpl(pageGroupRef), excludeDocumentsInPageGroupPages);
> 
>     auto liveURLs = adoptWK(WKMutableArrayCreate());
> 
>@@ -231,7 +229,7 @@ WKArrayRef WKBundleGetLiveDocumentURLs(WKBundleRef bundleRef, WKBundlePageGroupR
>         auto documentURLKey = adoptWK(WKStringCreateWithUTF8CString("url"));
> 
>         auto documentIDValue = adoptWK(WKUInt64Create(it.key));
>-        auto documentURLValue = adoptWK(toCopiedAPI(it.value));
>+        auto documentURLValue = adoptWK(WebKit::toCopiedAPI(it.value));
> 
>         WKDictionarySetItem(urlInfo.get(), documentIDKey.get(), documentIDValue.get());
>         WKDictionarySetItem(urlInfo.get(), documentURLKey.get(), documentURLValue.get());
>@@ -244,7 +242,7 @@ WKArrayRef WKBundleGetLiveDocumentURLs(WKBundleRef bundleRef, WKBundlePageGroupR
> 
> void WKBundleReportException(JSContextRef context, JSValueRef exception)
> {
>-    InjectedBundle::reportException(context, exception);
>+    WebKit::InjectedBundle::reportException(context, exception);
> }
> 
> void WKBundleClearAllDatabases(WKBundleRef)
>@@ -255,7 +253,7 @@ void WKBundleClearAllDatabases(WKBundleRef)
> void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
> {
>     // Historically, we've used the following (somewhat nonsensical) string for the databaseIdentifier of local files.
>-    WebCore::DatabaseTracker::singleton().setQuota(*SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
>+    WebCore::DatabaseTracker::singleton().setQuota(*WebKit::SecurityOriginData::fromDatabaseIdentifier("file__0"), quota);
> }
> 
> void WKBundleReleaseMemory(WKBundleRef)
>@@ -265,57 +263,57 @@ void WKBundleReleaseMemory(WKBundleRef)
> 
> WKDataRef WKBundleCreateWKDataFromUInt8Array(WKBundleRef bundle, JSContextRef context, JSValueRef data)
> {
>-    return toAPI(&toImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef());
>+    return WebKit::toAPI(&WebKit::toImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef());
> }
> 
> int WKBundleNumberOfPages(WKBundleRef bundleRef, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels)
> {
>-    return toImpl(bundleRef)->numberOfPages(toImpl(frameRef), pageWidthInPixels, pageHeightInPixels);
>+    return WebKit::toImpl(bundleRef)->numberOfPages(WebKit::toImpl(frameRef), pageWidthInPixels, pageHeightInPixels);
> }
> 
> int WKBundlePageNumberForElementById(WKBundleRef bundleRef, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels)
> {
>-    return toImpl(bundleRef)->pageNumberForElementById(toImpl(frameRef), toWTFString(idRef), pageWidthInPixels, pageHeightInPixels);
>+    return WebKit::toImpl(bundleRef)->pageNumberForElementById(WebKit::toImpl(frameRef), WebKit::toWTFString(idRef), pageWidthInPixels, pageHeightInPixels);
> }
> 
> WKStringRef WKBundlePageSizeAndMarginsInPixels(WKBundleRef bundleRef, WKBundleFrameRef frameRef, int pageIndex, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
> {
>-    return toCopiedAPI(toImpl(bundleRef)->pageSizeAndMarginsInPixels(toImpl(frameRef), pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft));
>+    return WebKit::toCopiedAPI(WebKit::toImpl(bundleRef)->pageSizeAndMarginsInPixels(WebKit::toImpl(frameRef), pageIndex, width, height, marginTop, marginRight, marginBottom, marginLeft));
> }
> 
> bool WKBundleIsPageBoxVisible(WKBundleRef bundleRef, WKBundleFrameRef frameRef, int pageIndex)
> {
>-    return toImpl(bundleRef)->isPageBoxVisible(toImpl(frameRef), pageIndex);
>+    return WebKit::toImpl(bundleRef)->isPageBoxVisible(WebKit::toImpl(frameRef), pageIndex);
> }
> 
> bool WKBundleIsProcessingUserGesture(WKBundleRef)
> {
>-    return InjectedBundle::isProcessingUserGesture();
>+    return WebKit::InjectedBundle::isProcessingUserGesture();
> }
> 
> void WKBundleSetUserStyleSheetLocation(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, WKStringRef location)
> {
>-    toImpl(bundleRef)->setUserStyleSheetLocation(toImpl(pageGroupRef), toWTFString(location));
>+    WebKit::toImpl(bundleRef)->setUserStyleSheetLocation(WebKit::toImpl(pageGroupRef), WebKit::toWTFString(location));
> }
> 
> void WKBundleSetWebNotificationPermission(WKBundleRef bundleRef, WKBundlePageRef pageRef, WKStringRef originStringRef, bool allowed)
> {
>-    toImpl(bundleRef)->setWebNotificationPermission(toImpl(pageRef), toWTFString(originStringRef), allowed);
>+    WebKit::toImpl(bundleRef)->setWebNotificationPermission(WebKit::toImpl(pageRef), WebKit::toWTFString(originStringRef), allowed);
> }
> 
> void WKBundleRemoveAllWebNotificationPermissions(WKBundleRef bundleRef, WKBundlePageRef pageRef)
> {
>-    toImpl(bundleRef)->removeAllWebNotificationPermissions(toImpl(pageRef));
>+    WebKit::toImpl(bundleRef)->removeAllWebNotificationPermissions(WebKit::toImpl(pageRef));
> }
> 
> uint64_t WKBundleGetWebNotificationID(WKBundleRef bundleRef, JSContextRef context, JSValueRef notification)
> {
>-    return toImpl(bundleRef)->webNotificationID(context, notification);
>+    return WebKit::toImpl(bundleRef)->webNotificationID(context, notification);
> }
> 
> void WKBundleSetTabKeyCyclesThroughElements(WKBundleRef bundleRef, WKBundlePageRef pageRef, bool enabled)
> {
>-    toImpl(bundleRef)->setTabKeyCyclesThroughElements(toImpl(pageRef), enabled);
>+    WebKit::toImpl(bundleRef)->setTabKeyCyclesThroughElements(WebKit::toImpl(pageRef), enabled);
> }
> 
> void WKBundleClearResourceLoadStatistics(WKBundleRef)
>@@ -336,6 +334,6 @@ void WKBundleExtendClassesForParameterCoder(WKBundleRef bundle, WKArrayRef class
>     if (!classList)
>         return;
> 
>-    toImpl(bundle)->extendClassesForParameterCoder(*classList);
>+    WebKit::toImpl(bundle)->extendClassesForParameterCoder(*classList);
> #endif
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp
>index 42c2e8a36c77651f71eb8ea2ec93cdd77a4801e5..1f06733ddd2b51590bdb778a191dfa22db5abab3 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardList.cpp
>@@ -30,7 +30,7 @@
> 
> WKTypeID WKBundleBackForwardListGetTypeID()
> {
>-    return toAPI(API::Object::Type::Null);
>+    return WebKit::toAPI(API::Object::Type::Null);
> }
> 
> WKBundleBackForwardListItemRef WKBundleBackForwardListCopyItemAtIndex(WKBundleBackForwardListRef listRef, int index)
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp
>index 5c8d98e6c0819692bd979d44c8f883a68160864f..d8e3a9f23187efb3b5b0764a14b12d5e8c50b205 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp
>@@ -29,11 +29,9 @@
> #include "APIArray.h"
> #include "WKBundleAPICast.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleBackForwardListItemGetTypeID()
> {
>-    return toAPI(API::Object::Type::Null);
>+    return WebKit::toAPI(API::Object::Type::Null);
> }
> 
> bool WKBundleBackForwardListItemIsSame(WKBundleBackForwardListItemRef itemRef1, WKBundleBackForwardListItemRef itemRef2)
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp
>index fc381f46a641fa0775c3e5464860d9e04f483e2b..47f66990dbc7e7fe131d23ba29da12824f19ab7d 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp
>@@ -31,26 +31,24 @@
> #include "WKBundleAPICast.h"
> #include "WebFrame.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleDOMWindowExtensionGetTypeID()
> {
>-    return toAPI(InjectedBundleDOMWindowExtension::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleDOMWindowExtension::APIType);
> }
> 
> WKBundleDOMWindowExtensionRef WKBundleDOMWindowExtensionCreate(WKBundleFrameRef frame, WKBundleScriptWorldRef world)
> {
>-    RefPtr<InjectedBundleDOMWindowExtension> extension = InjectedBundleDOMWindowExtension::create(toImpl(frame), toImpl(world));
>+    RefPtr<WebKit::InjectedBundleDOMWindowExtension> extension = WebKit::InjectedBundleDOMWindowExtension::create(WebKit::toImpl(frame), WebKit::toImpl(world));
>     return toAPI(extension.leakRef());
> }
> 
> WKBundleFrameRef WKBundleDOMWindowExtensionGetFrame(WKBundleDOMWindowExtensionRef extension)
> {
>-    return toAPI(toImpl(extension)->frame());
>+    return toAPI(WebKit::toImpl(extension)->frame());
> }
> 
> WKBundleScriptWorldRef WKBundleDOMWindowExtensionGetScriptWorld(WKBundleDOMWindowExtensionRef extension)
> {
>-    return toAPI(toImpl(extension)->world());
>+    return toAPI(WebKit::toImpl(extension)->world());
> }
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>index 785d1a5eb95362e49b8ce6eecf6b09b27bac8f69..a9ceb6d172e3d8fff58ad716e02575e1a86ed831 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
>@@ -45,36 +45,34 @@
> #include <WebCore/FrameView.h>
> #include <WebCore/Page.h>
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleFrameGetTypeID()
> {
>-    return toAPI(WebFrame::APIType);
>+    return WebKit::toAPI(WebKit::WebFrame::APIType);
> }
> 
> bool WKBundleFrameIsMainFrame(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->isMainFrame();
>+    return WebKit::toImpl(frameRef)->isMainFrame();
> }
> 
> WKBundleFrameRef WKBundleFrameGetParentFrame(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->parentFrame());
>+    return toAPI(WebKit::toImpl(frameRef)->parentFrame());
> }
> 
> WKURLRef WKBundleFrameCopyURL(WKBundleFrameRef frameRef)
> {
>-    return toCopiedURLAPI(toImpl(frameRef)->url());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(frameRef)->url());
> }
> 
> WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frameRef)
> {
>-    return toCopiedURLAPI(toImpl(frameRef)->provisionalURL());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(frameRef)->provisionalURL());
> }
> 
> WKFrameLoadState WKBundleFrameGetFrameLoadState(WKBundleFrameRef frameRef)
> {
>-    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = WebKit::toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return kWKFrameLoadStateFinished;
> 
>@@ -93,149 +91,149 @@ WKFrameLoadState WKBundleFrameGetFrameLoadState(WKBundleFrameRef frameRef)
> 
> WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)
> {
>-    return toAPI(&toImpl(frameRef)->childFrames().leakRef());    
>+    return WebKit::toAPI(&WebKit::toImpl(frameRef)->childFrames().leakRef());    
> }
> 
> JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->jsContext();
>+    return WebKit::toImpl(frameRef)->jsContext();
> }
> 
> WKBundleFrameRef WKBundleFrameForJavaScriptContext(JSContextRef context)
> {
>-    return toAPI(WebFrame::frameForContext(context));
>+    return toAPI(WebKit::WebFrame::frameForContext(context));
> }
> 
> JSGlobalContextRef WKBundleFrameGetJavaScriptContextForWorld(WKBundleFrameRef frameRef, WKBundleScriptWorldRef worldRef)
> {
>-    return toImpl(frameRef)->jsContextForWorld(toImpl(worldRef));
>+    return WebKit::toImpl(frameRef)->jsContextForWorld(WebKit::toImpl(worldRef));
> }
> 
> JSValueRef WKBundleFrameGetJavaScriptWrapperForNodeForWorld(WKBundleFrameRef frameRef, WKBundleNodeHandleRef nodeHandleRef, WKBundleScriptWorldRef worldRef)
> {
>-    return toImpl(frameRef)->jsWrapperForWorld(toImpl(nodeHandleRef), toImpl(worldRef));
>+    return WebKit::toImpl(frameRef)->jsWrapperForWorld(WebKit::toImpl(nodeHandleRef), WebKit::toImpl(worldRef));
> }
> 
> JSValueRef WKBundleFrameGetJavaScriptWrapperForRangeForWorld(WKBundleFrameRef frameRef, WKBundleRangeHandleRef rangeHandleRef, WKBundleScriptWorldRef worldRef)
> {
>-    return toImpl(frameRef)->jsWrapperForWorld(toImpl(rangeHandleRef), toImpl(worldRef));
>+    return WebKit::toImpl(frameRef)->jsWrapperForWorld(WebKit::toImpl(rangeHandleRef), WebKit::toImpl(worldRef));
> }
> 
> WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frameRef)
> {
>-    return toCopiedAPI(toImpl(frameRef)->name());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->name());
> }
> 
> WKStringRef WKBundleFrameCopyCounterValue(WKBundleFrameRef frameRef, JSObjectRef element)
> {
>-    return toCopiedAPI(toImpl(frameRef)->counterValue(element));
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->counterValue(element));
> }
> 
> WKStringRef WKBundleFrameCopyInnerText(WKBundleFrameRef frameRef)
> {
>-    return toCopiedAPI(toImpl(frameRef)->innerText());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->innerText());
> }
> 
> unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->pendingUnloadCount();
>+    return WebKit::toImpl(frameRef)->pendingUnloadCount();
> }
> 
> WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->page());
>+    return toAPI(WebKit::toImpl(frameRef)->page());
> }
> 
> void WKBundleFrameClearOpener(WKBundleFrameRef frameRef)
> {
>-    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = WebKit::toImpl(frameRef)->coreFrame();
>     if (coreFrame)
>         coreFrame->loader().setOpener(0);
> }
> 
> void WKBundleFrameStopLoading(WKBundleFrameRef frameRef)
> {
>-    toImpl(frameRef)->stopLoading();
>+    WebKit::toImpl(frameRef)->stopLoading();
> }
> 
> WKStringRef WKBundleFrameCopyLayerTreeAsText(WKBundleFrameRef frameRef)
> {
>-    return toCopiedAPI(toImpl(frameRef)->layerTreeAsText());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->layerTreeAsText());
> }
> 
> bool WKBundleFrameAllowsFollowingLink(WKBundleFrameRef frameRef, WKURLRef urlRef)
> {
>-    return toImpl(frameRef)->allowsFollowingLink(URL(URL(), toWTFString(urlRef)));
>+    return WebKit::toImpl(frameRef)->allowsFollowingLink(URL(URL(), WebKit::toWTFString(urlRef)));
> }
> 
> bool WKBundleFrameHandlesPageScaleGesture(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->handlesPageScaleGesture());
>+    return WebKit::toImpl(frameRef)->handlesPageScaleGesture();
> }
> 
> WKRect WKBundleFrameGetContentBounds(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->contentBounds());
>+    return WebKit::toAPI(WebKit::toImpl(frameRef)->contentBounds());
> }
> 
> WKRect WKBundleFrameGetVisibleContentBounds(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->visibleContentBounds());
>+    return WebKit::toAPI(WebKit::toImpl(frameRef)->visibleContentBounds());
> }
> 
> WKRect WKBundleFrameGetVisibleContentBoundsExcludingScrollbars(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->visibleContentBoundsExcludingScrollbars());
>+    return WebKit::toAPI(WebKit::toImpl(frameRef)->visibleContentBoundsExcludingScrollbars());
> }
> 
> WKSize WKBundleFrameGetScrollOffset(WKBundleFrameRef frameRef)
> {
>-    return toAPI(toImpl(frameRef)->scrollOffset());
>+    return WebKit::toAPI(WebKit::toImpl(frameRef)->scrollOffset());
> }
> 
> bool WKBundleFrameHasHorizontalScrollbar(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->hasHorizontalScrollbar();
>+    return WebKit::toImpl(frameRef)->hasHorizontalScrollbar();
> }
> 
> bool WKBundleFrameHasVerticalScrollbar(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->hasVerticalScrollbar();
>+    return WebKit::toImpl(frameRef)->hasVerticalScrollbar();
> }
> 
> bool WKBundleFrameGetDocumentBackgroundColor(WKBundleFrameRef frameRef, double* red, double* green, double* blue, double* alpha)
> {
>-    return toImpl(frameRef)->getDocumentBackgroundColor(red, green, blue, alpha);
>+    return WebKit::toImpl(frameRef)->getDocumentBackgroundColor(red, green, blue, alpha);
> }
> 
> WKStringRef WKBundleFrameCopySuggestedFilenameForResourceWithURL(WKBundleFrameRef frameRef, WKURLRef urlRef)
> {
>-    return toCopiedAPI(toImpl(frameRef)->suggestedFilenameForResourceWithURL(URL(URL(), toWTFString(urlRef))));
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->suggestedFilenameForResourceWithURL(URL(URL(), WebKit::toWTFString(urlRef))));
> }
> 
> WKStringRef WKBundleFrameCopyMIMETypeForResourceWithURL(WKBundleFrameRef frameRef, WKURLRef urlRef)
> {
>-    return toCopiedAPI(toImpl(frameRef)->mimeTypeForResourceWithURL(URL(URL(), toWTFString(urlRef))));
>+    return WebKit::toCopiedAPI(WebKit::toImpl(frameRef)->mimeTypeForResourceWithURL(URL(URL(), WebKit::toWTFString(urlRef))));
> }
> 
> bool WKBundleFrameContainsAnyFormElements(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->containsAnyFormElements();
>+    return WebKit::toImpl(frameRef)->containsAnyFormElements();
> }
> 
> bool WKBundleFrameContainsAnyFormControls(WKBundleFrameRef frameRef)
> {
>-    return toImpl(frameRef)->containsAnyFormControls();
>+    return WebKit::toImpl(frameRef)->containsAnyFormControls();
> }
> 
> void WKBundleFrameSetTextDirection(WKBundleFrameRef frameRef, WKStringRef directionRef)
> {
>-    toImpl(frameRef)->setTextDirection(toWTFString(directionRef));
>+    WebKit::toImpl(frameRef)->setTextDirection(WebKit::toWTFString(directionRef));
> }
> 
> void WKBundleFrameSetAccessibleName(WKBundleFrameRef frameRef, WKStringRef accessibleNameRef)
> {
>-    toImpl(frameRef)->setAccessibleName(toWTFString(accessibleNameRef));
>+    WebKit::toImpl(frameRef)->setAccessibleName(WebKit::toWTFString(accessibleNameRef));
> }
> 
> WKDataRef WKBundleFrameCopyWebArchive(WKBundleFrameRef frameRef)
>@@ -246,7 +244,7 @@ WKDataRef WKBundleFrameCopyWebArchive(WKBundleFrameRef frameRef)
> WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
> {
> #if PLATFORM(COCOA)
>-    RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
>+    RetainPtr<CFDataRef> data = WebKit::toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
>     if (data)
>         return WKDataCreate(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));
> #else
>@@ -260,7 +258,7 @@ WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRe
> 
> bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)
> {
>-    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = WebKit::toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return true;
> 
>@@ -269,21 +267,21 @@ bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)
> 
> WKBundleHitTestResultRef WKBundleFrameCreateHitTestResult(WKBundleFrameRef frameRef, WKPoint point)
> {
>-    return toAPI(toImpl(frameRef)->hitTest(toIntPoint(point)).leakRef());
>+    return WebKit::toAPI(WebKit::toImpl(frameRef)->hitTest(WebKit::toIntPoint(point)).leakRef());
> }
> 
> WKSecurityOriginRef WKBundleFrameCopySecurityOrigin(WKBundleFrameRef frameRef)
> {
>-    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = WebKit::toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return 0;
> 
>-    return toCopiedAPI(&coreFrame->document()->securityOrigin());
>+    return WebKit::toCopiedAPI(&coreFrame->document()->securityOrigin());
> }
> 
> void WKBundleFrameFocus(WKBundleFrameRef frameRef)
> {
>-    WebCore::Frame* coreFrame = toImpl(frameRef)->coreFrame();
>+    WebCore::Frame* coreFrame = WebKit::toImpl(frameRef)->coreFrame();
>     if (!coreFrame)
>         return;
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
>index 693343c74f6a0995ca10f954351f9b2ed270eb76..dc5c9f27ec0b8e4970aaf6d4e561a3e1a04e3d38 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
>@@ -33,102 +33,100 @@
> #include "WebFrame.h"
> #include "WebImage.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleHitTestResultGetTypeID()
> {
>-    return toAPI(InjectedBundleHitTestResult::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleHitTestResult::APIType);
> }
> 
> WKBundleNodeHandleRef WKBundleHitTestResultCopyNodeHandle(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> nodeHandle = toImpl(hitTestResultRef)->nodeHandle();
>+    RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toImpl(hitTestResultRef)->nodeHandle();
>     return toAPI(nodeHandle.leakRef());
> }
> 
> WKBundleNodeHandleRef WKBundleHitTestResultCopyURLElementHandle(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> urlElementNodeHandle = toImpl(hitTestResultRef)->urlElementHandle();
>+    RefPtr<WebKit::InjectedBundleNodeHandle> urlElementNodeHandle = WebKit::toImpl(hitTestResultRef)->urlElementHandle();
>     return toAPI(urlElementNodeHandle.leakRef());
> }
> 
> WKBundleFrameRef WKBundleHitTestResultGetFrame(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toAPI(toImpl(hitTestResultRef)->frame());
>+    return toAPI(WebKit::toImpl(hitTestResultRef)->frame());
> }
> 
> WKBundleFrameRef WKBundleHitTestResultGetTargetFrame(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toAPI(toImpl(hitTestResultRef)->targetFrame());
>+    return toAPI(WebKit::toImpl(hitTestResultRef)->targetFrame());
> }
> 
> WKURLRef WKBundleHitTestResultCopyAbsoluteImageURL(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteImageURL());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(hitTestResultRef)->absoluteImageURL());
> }
> 
> WKURLRef WKBundleHitTestResultCopyAbsolutePDFURL(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedURLAPI(toImpl(hitTestResultRef)->absolutePDFURL());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(hitTestResultRef)->absolutePDFURL());
> }
> 
> WKURLRef WKBundleHitTestResultCopyAbsoluteLinkURL(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteLinkURL());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(hitTestResultRef)->absoluteLinkURL());
> }
> 
> WKURLRef WKBundleHitTestResultCopyAbsoluteMediaURL(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedURLAPI(toImpl(hitTestResultRef)->absoluteMediaURL());
>+    return WebKit::toCopiedURLAPI(WebKit::toImpl(hitTestResultRef)->absoluteMediaURL());
> }
> 
> bool WKBundleHitTestResultMediaIsInFullscreen(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toImpl(hitTestResultRef)->mediaIsInFullscreen();
>+    return WebKit::toImpl(hitTestResultRef)->mediaIsInFullscreen();
> }
> 
> bool WKBundleHitTestResultMediaHasAudio(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toImpl(hitTestResultRef)->mediaHasAudio();
>+    return WebKit::toImpl(hitTestResultRef)->mediaHasAudio();
> }
> 
> bool WKBundleHitTestResultIsDownloadableMedia(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toImpl(hitTestResultRef)->isDownloadableMedia();
>+    return WebKit::toImpl(hitTestResultRef)->isDownloadableMedia();
> }
> 
> WKBundleHitTestResultMediaType WKBundleHitTestResultGetMediaType(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toAPI(toImpl(hitTestResultRef)->mediaType());
>+    return toAPI(WebKit::toImpl(hitTestResultRef)->mediaType());
> }
> 
> WKRect WKBundleHitTestResultGetImageRect(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toAPI(toImpl(hitTestResultRef)->imageRect());
>+    return WebKit::toAPI(WebKit::toImpl(hitTestResultRef)->imageRect());
> }
> 
> WKImageRef WKBundleHitTestResultCopyImage(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    RefPtr<WebImage> webImage = toImpl(hitTestResultRef)->image();
>+    RefPtr<WebKit::WebImage> webImage = WebKit::toImpl(hitTestResultRef)->image();
>     return toAPI(webImage.leakRef());
> }
> 
> bool WKBundleHitTestResultGetIsSelected(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toImpl(hitTestResultRef)->isSelected();
>+    return WebKit::toImpl(hitTestResultRef)->isSelected();
> }
> 
> WKStringRef WKBundleHitTestResultCopyLinkLabel(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedAPI(toImpl(hitTestResultRef)->linkLabel());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(hitTestResultRef)->linkLabel());
> }
> 
> WKStringRef WKBundleHitTestResultCopyLinkTitle(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedAPI(toImpl(hitTestResultRef)->linkTitle());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(hitTestResultRef)->linkTitle());
> }
> 
> WKStringRef WKBundleHitTestResultCopyLinkSuggestedFilename(WKBundleHitTestResultRef hitTestResultRef)
> {
>-    return toCopiedAPI(toImpl(hitTestResultRef)->linkSuggestedFilename());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(hitTestResultRef)->linkSuggestedFilename());
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>index 55eb3dbc087771dbcad8b42f22ae9361fa826806..fa94af96a8144651785824c652a7e4a863589109 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp
>@@ -30,34 +30,32 @@
> #include "WKBundleAPICast.h"
> #include "WebInspector.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleInspectorGetTypeID()
> {
>-    return toAPI(WebInspector::APIType);
>+    return WebKit::toAPI(WebKit::WebInspector::APIType);
> }
> 
> void WKBundleInspectorShow(WKBundleInspectorRef inspectorRef)
> {
>-    toImpl(inspectorRef)->show();
>+    WebKit::toImpl(inspectorRef)->show();
> }
> 
> void WKBundleInspectorClose(WKBundleInspectorRef inspectorRef)
> {
>-    toImpl(inspectorRef)->close();
>+    WebKit::toImpl(inspectorRef)->close();
> }
> 
> void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, WKStringRef script)
> {
>-    toImpl(inspectorRef)->evaluateScriptForTest(toWTFString(script));
>+    WebKit::toImpl(inspectorRef)->evaluateScriptForTest(WebKit::toWTFString(script));
> }
> 
> void WKBundleInspectorSetPageProfilingEnabled(WKBundleInspectorRef inspectorRef, bool enabled)
> {
>-    toImpl(inspectorRef)->showTimelines();
>+    WebKit::toImpl(inspectorRef)->showTimelines();
> 
>     if (enabled)
>-        toImpl(inspectorRef)->startPageProfiling();
>+        WebKit::toImpl(inspectorRef)->startPageProfiling();
>     else
>-        toImpl(inspectorRef)->stopPageProfiling();
>+        WebKit::toImpl(inspectorRef)->stopPageProfiling();
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
>index a3c363e1942cec047955f92b03270a956dafe97b..87b8e1414e8dfb3d9c20365244ff9a1e1bf5d37b 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
>@@ -33,51 +33,49 @@
> #include "WKAPICast.h"
> #include "WKBundleAPICast.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleNavigationActionGetTypeID()
> {
>-    return toAPI(InjectedBundleNavigationAction::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleNavigationAction::APIType);
> }
> 
> WKFrameNavigationType WKBundleNavigationActionGetNavigationType(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toAPI(toImpl(navigationActionRef)->navigationType());
>+    return WebKit::toAPI(WebKit::toImpl(navigationActionRef)->navigationType());
> }
> 
> WKEventModifiers WKBundleNavigationActionGetEventModifiers(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toAPI(toImpl(navigationActionRef)->modifiers());
>+    return WebKit::toAPI(WebKit::toImpl(navigationActionRef)->modifiers());
> }
> 
> WKEventMouseButton WKBundleNavigationActionGetEventMouseButton(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toAPI(toImpl(navigationActionRef)->mouseButton());
>+    return WebKit::toAPI(WebKit::toImpl(navigationActionRef)->mouseButton());
> }
> 
> WKBundleHitTestResultRef WKBundleNavigationActionCopyHitTestResult(WKBundleNavigationActionRef navigationActionRef)
> {
>-    RefPtr<InjectedBundleHitTestResult> hitTestResult = toImpl(navigationActionRef)->hitTestResult();
>+    RefPtr<WebKit::InjectedBundleHitTestResult> hitTestResult = WebKit::toImpl(navigationActionRef)->hitTestResult();
>     return toAPI(hitTestResult.leakRef());
> }
> 
> WKBundleNodeHandleRef WKBundleNavigationActionCopyFormElement(WKBundleNavigationActionRef navigationActionRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> formElement = toImpl(navigationActionRef)->formElement();
>+    RefPtr<WebKit::InjectedBundleNodeHandle> formElement = WebKit::toImpl(navigationActionRef)->formElement();
>     return toAPI(formElement.leakRef());
> }
> 
> bool WKBundleNavigationActionGetShouldOpenExternalURLs(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toImpl(navigationActionRef)->shouldOpenExternalURLs();
>+    return WebKit::toImpl(navigationActionRef)->shouldOpenExternalURLs();
> }
> 
> bool WKBundleNavigationActionGetShouldTryAppLinks(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toImpl(navigationActionRef)->shouldTryAppLinks();
>+    return WebKit::toImpl(navigationActionRef)->shouldTryAppLinks();
> }
> 
> WKStringRef WKBundleNavigationActionCopyDownloadAttribute(WKBundleNavigationActionRef navigationActionRef)
> {
>-    return toCopiedAPI(toImpl(navigationActionRef)->downloadAttribute());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(navigationActionRef)->downloadAttribute());
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
>index 4c7dbb412c12d551f9e8a7fc7ef9283a82b5b75c..aa5fe24e9cdb2b2bcb92d5588fc396fd8921a530 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
>@@ -35,8 +35,6 @@
> #include "WebImage.h"
> #include <WebCore/HTMLTextFormControlElement.h>
> 
>-using namespace WebKit;
>-
> static WebCore::AutoFillButtonType toAutoFillButtonType(WKAutoFillButtonType wkAutoFillButtonType)
> {
>     switch (wkAutoFillButtonType) {
>@@ -75,142 +73,142 @@ static WKAutoFillButtonType toWKAutoFillButtonType(WebCore::AutoFillButtonType a
> 
> WKTypeID WKBundleNodeHandleGetTypeID()
> {
>-    return toAPI(InjectedBundleNodeHandle::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleNodeHandle::APIType);
> }
> 
> WKBundleNodeHandleRef WKBundleNodeHandleCreate(JSContextRef contextRef, JSObjectRef objectRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> nodeHandle = InjectedBundleNodeHandle::getOrCreate(contextRef, objectRef);
>+    RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::InjectedBundleNodeHandle::getOrCreate(contextRef, objectRef);
>     return toAPI(nodeHandle.leakRef());
> }
> 
> WKBundleNodeHandleRef WKBundleNodeHandleCopyDocument(WKBundleNodeHandleRef nodeHandleRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> nodeHandle = toImpl(nodeHandleRef)->document();
>+    RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toImpl(nodeHandleRef)->document();
>     return toAPI(nodeHandle.leakRef());
> }
> 
> WKRect WKBundleNodeHandleGetRenderRect(WKBundleNodeHandleRef nodeHandleRef, bool* isReplaced)
> {
>-    return toAPI(toImpl(nodeHandleRef)->renderRect(isReplaced));
>+    return WebKit::toAPI(WebKit::toImpl(nodeHandleRef)->renderRect(isReplaced));
> }
> 
> WKImageRef WKBundleNodeHandleCopySnapshotWithOptions(WKBundleNodeHandleRef nodeHandleRef, WKSnapshotOptions options)
> {
>-    RefPtr<WebImage> image = toImpl(nodeHandleRef)->renderedImage(toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow);
>+    RefPtr<WebKit::WebImage> image = WebKit::toImpl(nodeHandleRef)->renderedImage(WebKit::toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow);
>     return toAPI(image.leakRef());
> }
> 
> WKBundleRangeHandleRef WKBundleNodeHandleCopyVisibleRange(WKBundleNodeHandleRef nodeHandleRef)
> {
>-    RefPtr<InjectedBundleRangeHandle> rangeHandle = toImpl(nodeHandleRef)->visibleRange();
>+    RefPtr<WebKit::InjectedBundleRangeHandle> rangeHandle = WebKit::toImpl(nodeHandleRef)->visibleRange();
>     return toAPI(rangeHandle.leakRef());
> }
> 
> WKRect WKBundleNodeHandleGetElementBounds(WKBundleNodeHandleRef elementHandleRef)
> {
>-    return toAPI(toImpl(elementHandleRef)->elementBounds());
>+    return WebKit::toAPI(WebKit::toImpl(elementHandleRef)->elementBounds());
> }
> 
> void WKBundleNodeHandleSetHTMLInputElementValueForUser(WKBundleNodeHandleRef htmlInputElementHandleRef, WKStringRef valueRef)
> {
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementValueForUser(toWTFString(valueRef));
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementValueForUser(WebKit::toWTFString(valueRef));
> }
> 
> void WKBundleNodeHandleSetHTMLInputElementSpellcheckEnabled(WKBundleNodeHandleRef htmlInputElementHandleRef, bool enabled)
> {
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementSpellcheckEnabled(enabled);
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementSpellcheckEnabled(enabled);
> }
> 
> bool WKBundleNodeHandleGetHTMLInputElementAutoFilled(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFilled();
>+    return WebKit::toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFilled();
> }
> 
> void WKBundleNodeHandleSetHTMLInputElementAutoFilled(WKBundleNodeHandleRef htmlInputElementHandleRef, bool filled)
> {
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFilled(filled);
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFilled(filled);
> }
> 
> bool WKBundleNodeHandleGetHTMLInputElementAutoFillButtonEnabled(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFillButtonEnabled();
>+    return WebKit::toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFillButtonEnabled();
> }
> 
> void WKBundleNodeHandleSetHTMLInputElementAutoFillButtonEnabledWithButtonType(WKBundleNodeHandleRef htmlInputElementHandleRef, WKAutoFillButtonType autoFillButtonType)
> {
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFillButtonEnabled(toAutoFillButtonType(autoFillButtonType));
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFillButtonEnabled(toAutoFillButtonType(autoFillButtonType));
> }
> 
> WKAutoFillButtonType WKBundleNodeHandleGetHTMLInputElementAutoFillButtonType(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toWKAutoFillButtonType(toImpl(htmlInputElementHandleRef)->htmlInputElementAutoFillButtonType());
>+    return toWKAutoFillButtonType(WebKit::toImpl(htmlInputElementHandleRef)->htmlInputElementAutoFillButtonType());
> }
> 
> WKAutoFillButtonType WKBundleNodeHandleGetHTMLInputElementLastAutoFillButtonType(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toWKAutoFillButtonType(toImpl(htmlInputElementHandleRef)->htmlInputElementLastAutoFillButtonType());
>+    return toWKAutoFillButtonType(WebKit::toImpl(htmlInputElementHandleRef)->htmlInputElementLastAutoFillButtonType());
> }
> 
> bool WKBundleNodeHandleGetHTMLInputElementAutoFillAvailable(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toImpl(htmlInputElementHandleRef)->isAutoFillAvailable();
>+    return WebKit::toImpl(htmlInputElementHandleRef)->isAutoFillAvailable();
> }
> 
> void WKBundleNodeHandleSetHTMLInputElementAutoFillAvailable(WKBundleNodeHandleRef htmlInputElementHandleRef, bool autoFillAvailable)
> {
>-    toImpl(htmlInputElementHandleRef)->setAutoFillAvailable(autoFillAvailable);
>+    WebKit::toImpl(htmlInputElementHandleRef)->setAutoFillAvailable(autoFillAvailable);
> }
> 
> WKRect WKBundleNodeHandleGetHTMLInputElementAutoFillButtonBounds(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toAPI(toImpl(htmlInputElementHandleRef)->htmlInputElementAutoFillButtonBounds());
>+    return WebKit::toAPI(WebKit::toImpl(htmlInputElementHandleRef)->htmlInputElementAutoFillButtonBounds());
> }
> 
> bool WKBundleNodeHandleGetHTMLInputElementLastChangeWasUserEdit(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toImpl(htmlInputElementHandleRef)->htmlInputElementLastChangeWasUserEdit();
>+    return WebKit::toImpl(htmlInputElementHandleRef)->htmlInputElementLastChangeWasUserEdit();
> }
> 
> bool WKBundleNodeHandleGetHTMLTextAreaElementLastChangeWasUserEdit(WKBundleNodeHandleRef htmlTextAreaElementHandleRef)
> {
>-    return toImpl(htmlTextAreaElementHandleRef)->htmlTextAreaElementLastChangeWasUserEdit();
>+    return WebKit::toImpl(htmlTextAreaElementHandleRef)->htmlTextAreaElementLastChangeWasUserEdit();
> }
> 
> WKBundleNodeHandleRef WKBundleNodeHandleCopyHTMLTableCellElementCellAbove(WKBundleNodeHandleRef htmlTableCellElementHandleRef)
> {
>-    RefPtr<InjectedBundleNodeHandle> nodeHandle = toImpl(htmlTableCellElementHandleRef)->htmlTableCellElementCellAbove();
>+    RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toImpl(htmlTableCellElementHandleRef)->htmlTableCellElementCellAbove();
>     return toAPI(nodeHandle.leakRef());
> }
> 
> WKBundleFrameRef WKBundleNodeHandleCopyDocumentFrame(WKBundleNodeHandleRef documentHandleRef)
> {
>-    RefPtr<WebFrame> frame = toImpl(documentHandleRef)->documentFrame();
>+    RefPtr<WebKit::WebFrame> frame = WebKit::toImpl(documentHandleRef)->documentFrame();
>     return toAPI(frame.leakRef());
> }
> 
> WKBundleFrameRef WKBundleNodeHandleCopyHTMLFrameElementContentFrame(WKBundleNodeHandleRef htmlFrameElementHandleRef)
> {
>-    RefPtr<WebFrame> frame = toImpl(htmlFrameElementHandleRef)->htmlFrameElementContentFrame();
>+    RefPtr<WebKit::WebFrame> frame = WebKit::toImpl(htmlFrameElementHandleRef)->htmlFrameElementContentFrame();
>     return toAPI(frame.leakRef());
> }
> 
> WKBundleFrameRef WKBundleNodeHandleCopyHTMLIFrameElementContentFrame(WKBundleNodeHandleRef htmlIFrameElementHandleRef)
> {
>-    RefPtr<WebFrame> frame = toImpl(htmlIFrameElementHandleRef)->htmlIFrameElementContentFrame();
>+    RefPtr<WebKit::WebFrame> frame = WebKit::toImpl(htmlIFrameElementHandleRef)->htmlIFrameElementContentFrame();
>     return toAPI(frame.leakRef());
> }
> 
> // Deprecated - use WKBundleNodeHandleGetHTMLInputElementAutoFilled(WKBundleNodeHandleRef).
> bool WKBundleNodeHandleGetHTMLInputElementAutofilled(WKBundleNodeHandleRef htmlInputElementHandleRef)
> {
>-    return toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFilled();
>+    return WebKit::toImpl(htmlInputElementHandleRef)->isHTMLInputElementAutoFilled();
> }
> 
> // Deprecated - use WKBundleNodeHandleSetHTMLInputElementAutoFilled(WKBundleNodeHandleRef, bool).
> void WKBundleNodeHandleSetHTMLInputElementAutofilled(WKBundleNodeHandleRef htmlInputElementHandleRef, bool filled)
> {
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFilled(filled);
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFilled(filled);
> }
> 
> // Deprecated - use WKBundleNodeHandleSetHTMLInputElementAutoFillButtonEnabledWithButtonType(WKBundleNodeHandleRef, WKAutoFillButtonType).
>@@ -218,5 +216,5 @@ void WKBundleNodeHandleSetHTMLInputElementAutoFillButtonEnabled(WKBundleNodeHand
> {
>     WebCore::AutoFillButtonType autoFillButtonType = enabled ? WebCore::AutoFillButtonType::Credentials : WebCore::AutoFillButtonType::None;
> 
>-    toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFillButtonEnabled(autoFillButtonType);
>+    WebKit::toImpl(htmlInputElementHandleRef)->setHTMLInputElementAutoFillButtonEnabled(autoFillButtonType);
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>index 995c5dcc961e3be506c081cabcfa6a37cddc1e98..4e46b74b2bfaff601992af794ca8da1b20526965 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
>@@ -69,17 +69,15 @@
> #include <wtf/StdLibExtras.h>
> #include <wtf/URL.h>
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundlePageGetTypeID()
> {
>-    return toAPI(WebPage::APIType);
>+    return WebKit::toAPI(WebKit::WebPage::APIType);
> }
> 
> void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClientBase* wkClient)
> {
> #if ENABLE(CONTEXT_MENUS)
>-    toImpl(pageRef)->setInjectedBundleContextMenuClient(std::make_unique<InjectedBundlePageContextMenuClient>(wkClient));
>+    WebKit::toImpl(pageRef)->setInjectedBundleContextMenuClient(std::make_unique<WebKit::InjectedBundlePageContextMenuClient>(wkClient));
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(wkClient);
>@@ -88,38 +86,38 @@ void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageConte
> 
> void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClientBase* wkClient)
> {
>-    toImpl(pageRef)->setInjectedBundleEditorClient(wkClient ? std::make_unique<InjectedBundlePageEditorClient>(*wkClient) : std::make_unique<API::InjectedBundle::EditorClient>());
>+    WebKit::toImpl(pageRef)->setInjectedBundleEditorClient(wkClient ? std::make_unique<WebKit::InjectedBundlePageEditorClient>(*wkClient) : std::make_unique<API::InjectedBundle::EditorClient>());
> }
> 
> void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClientBase* wkClient)
> {
>-    toImpl(pageRef)->setInjectedBundleFormClient(std::make_unique<InjectedBundlePageFormClient>(wkClient));
>+    WebKit::toImpl(pageRef)->setInjectedBundleFormClient(std::make_unique<WebKit::InjectedBundlePageFormClient>(wkClient));
> }
> 
> void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClientBase* wkClient)
> {
>-    toImpl(pageRef)->setInjectedBundlePageLoaderClient(std::make_unique<InjectedBundlePageLoaderClient>(wkClient));
>+    WebKit::toImpl(pageRef)->setInjectedBundlePageLoaderClient(std::make_unique<WebKit::InjectedBundlePageLoaderClient>(wkClient));
> }
> 
> void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClientBase* wkClient)
> {
>-    toImpl(pageRef)->setInjectedBundleResourceLoadClient(std::make_unique<InjectedBundlePageResourceLoadClient>(wkClient));
>+    WebKit::toImpl(pageRef)->setInjectedBundleResourceLoadClient(std::make_unique<WebKit::InjectedBundlePageResourceLoadClient>(wkClient));
> }
> 
> void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClientBase* wkClient)
> {
>-    toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
>+    WebKit::toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
> }
> 
> void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClientBase* wkClient)
> {
>-    toImpl(pageRef)->setInjectedBundleUIClient(std::make_unique<InjectedBundlePageUIClient>(wkClient));
>+    WebKit::toImpl(pageRef)->setInjectedBundleUIClient(std::make_unique<WebKit::InjectedBundlePageUIClient>(wkClient));
> }
> 
> void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClientBase* wkClient)
> {
> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
>-    toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
>+    WebKit::toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(wkClient);
>@@ -129,7 +127,7 @@ void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullSc
> void WKBundlePageWillEnterFullScreen(WKBundlePageRef pageRef)
> {
> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
>-    toImpl(pageRef)->fullScreenManager()->willEnterFullScreen();
>+    WebKit::toImpl(pageRef)->fullScreenManager()->willEnterFullScreen();
> #else
>     UNUSED_PARAM(pageRef);
> #endif
>@@ -138,7 +136,7 @@ void WKBundlePageWillEnterFullScreen(WKBundlePageRef pageRef)
> void WKBundlePageDidEnterFullScreen(WKBundlePageRef pageRef)
> {
> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
>-    toImpl(pageRef)->fullScreenManager()->didEnterFullScreen();
>+    WebKit::toImpl(pageRef)->fullScreenManager()->didEnterFullScreen();
> #else
>     UNUSED_PARAM(pageRef);
> #endif
>@@ -147,7 +145,7 @@ void WKBundlePageDidEnterFullScreen(WKBundlePageRef pageRef)
> void WKBundlePageWillExitFullScreen(WKBundlePageRef pageRef)
> {
> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
>-    toImpl(pageRef)->fullScreenManager()->willExitFullScreen();
>+    WebKit::toImpl(pageRef)->fullScreenManager()->willExitFullScreen();
> #else
>     UNUSED_PARAM(pageRef);
> #endif
>@@ -156,7 +154,7 @@ void WKBundlePageWillExitFullScreen(WKBundlePageRef pageRef)
> void WKBundlePageDidExitFullScreen(WKBundlePageRef pageRef)
> {
> #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
>-    toImpl(pageRef)->fullScreenManager()->didExitFullScreen();
>+    WebKit::toImpl(pageRef)->fullScreenManager()->didExitFullScreen();
> #else
>     UNUSED_PARAM(pageRef);
> #endif
>@@ -164,23 +162,23 @@ void WKBundlePageDidExitFullScreen(WKBundlePageRef pageRef)
> 
> WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef pageRef)
> {
>-    return toAPI(toImpl(pageRef)->pageGroup());
>+    return toAPI(WebKit::toImpl(pageRef)->pageGroup());
> }
> 
> WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef pageRef)
> {
>-    return toAPI(toImpl(pageRef)->mainWebFrame());
>+    return toAPI(WebKit::toImpl(pageRef)->mainWebFrame());
> }
> 
> WKFrameHandleRef WKBundleFrameCreateFrameHandle(WKBundleFrameRef bundleFrameRef)
> {
>-    return toAPI(&API::FrameHandle::create(toImpl(bundleFrameRef)->frameID()).leakRef());
>+    return WebKit::toAPI(&API::FrameHandle::create(WebKit::toImpl(bundleFrameRef)->frameID()).leakRef());
> }
> 
> void WKBundlePageClickMenuItem(WKBundlePageRef pageRef, WKContextMenuItemRef item)
> {
> #if ENABLE(CONTEXT_MENUS)
>-    toImpl(pageRef)->contextMenu()->itemSelected(toImpl(item)->data());
>+    WebKit::toImpl(pageRef)->contextMenu()->itemSelected(WebKit::toImpl(item)->data());
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(item);
>@@ -188,7 +186,7 @@ void WKBundlePageClickMenuItem(WKBundlePageRef pageRef, WKContextMenuItemRef ite
> }
> 
> #if ENABLE(CONTEXT_MENUS)
>-static Ref<API::Array> contextMenuItems(const WebContextMenu& contextMenu)
>+static Ref<API::Array> contextMenuItems(const WebKit::WebContextMenu& contextMenu)
> {
>     auto items = contextMenu.items();
> 
>@@ -196,7 +194,7 @@ static Ref<API::Array> contextMenuItems(const WebContextMenu& contextMenu)
>     menuItems.reserveInitialCapacity(items.size());
> 
>     for (const auto& item : items)
>-        menuItems.uncheckedAppend(WebContextMenuItem::create(item));
>+        menuItems.uncheckedAppend(WebKit::WebContextMenuItem::create(item));
> 
>     return API::Array::create(WTFMove(menuItems));
> }
>@@ -205,9 +203,9 @@ static Ref<API::Array> contextMenuItems(const WebContextMenu& contextMenu)
> WKArrayRef WKBundlePageCopyContextMenuItems(WKBundlePageRef pageRef)
> {
> #if ENABLE(CONTEXT_MENUS)
>-    WebContextMenu* contextMenu = toImpl(pageRef)->contextMenu();
>+    WebKit::WebContextMenu* contextMenu = WebKit::toImpl(pageRef)->contextMenu();
> 
>-    return toAPI(&contextMenuItems(*contextMenu).leakRef());
>+    return WebKit::toAPI(&contextMenuItems(*contextMenu).leakRef());
> #else
>     UNUSED_PARAM(pageRef);
>     return nullptr;
>@@ -217,11 +215,11 @@ WKArrayRef WKBundlePageCopyContextMenuItems(WKBundlePageRef pageRef)
> WKArrayRef WKBundlePageCopyContextMenuAtPointInWindow(WKBundlePageRef pageRef, WKPoint point)
> {
> #if ENABLE(CONTEXT_MENUS)
>-    WebContextMenu* contextMenu = toImpl(pageRef)->contextMenuAtPointInWindow(toIntPoint(point));
>+    WebKit::WebContextMenu* contextMenu = WebKit::toImpl(pageRef)->contextMenuAtPointInWindow(WebKit::toIntPoint(point));
>     if (!contextMenu)
>         return nullptr;
> 
>-    return toAPI(&contextMenuItems(*contextMenu).leakRef());
>+    return WebKit::toAPI(&contextMenuItems(*contextMenu).leakRef());
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(point);
>@@ -231,7 +229,7 @@ WKArrayRef WKBundlePageCopyContextMenuAtPointInWindow(WKBundlePageRef pageRef, W
> 
> void WKBundlePageInsertNewlineInQuotedContent(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->insertNewlineInQuotedContent();
>+    WebKit::toImpl(pageRef)->insertNewlineInQuotedContent();
> }
> 
> void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
>@@ -240,7 +238,7 @@ void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
>     if (!pageRef)
>         return 0;
>     
>-    WebCore::Page* page = toImpl(pageRef)->corePage();
>+    WebCore::Page* page = WebKit::toImpl(pageRef)->corePage();
>     if (!page)
>         return 0;
>     
>@@ -267,7 +265,7 @@ void* WKAccessibilityFocusedObject(WKBundlePageRef pageRef)
>     if (!pageRef)
>         return 0;
>     
>-    WebCore::Page* page = toImpl(pageRef)->corePage();
>+    WebCore::Page* page = WebKit::toImpl(pageRef)->corePage();
>     if (!page)
>         return 0;
> 
>@@ -302,77 +300,77 @@ bool WKAccessibilityEnhancedAccessibilityEnabled()
> 
> void WKBundlePageStopLoading(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->stopLoading();
>+    WebKit::toImpl(pageRef)->stopLoading();
> }
> 
> void WKBundlePageSetDefersLoading(WKBundlePageRef pageRef, bool defersLoading)
> {
>-    toImpl(pageRef)->setDefersLoading(defersLoading);
>+    WebKit::toImpl(pageRef)->setDefersLoading(defersLoading);
> }
> 
> WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef pageRef)
> {
>-    return toCopiedAPI(toImpl(pageRef)->renderTreeExternalRepresentation());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(pageRef)->renderTreeExternalRepresentation());
> }
> 
> WKStringRef WKBundlePageCopyRenderTreeExternalRepresentationForPrinting(WKBundlePageRef pageRef)
> {
>-    return toCopiedAPI(toImpl(pageRef)->renderTreeExternalRepresentationForPrinting());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(pageRef)->renderTreeExternalRepresentationForPrinting());
> }
> 
> void WKBundlePageExecuteEditingCommand(WKBundlePageRef pageRef, WKStringRef name, WKStringRef argument)
> {
>-    toImpl(pageRef)->executeEditingCommand(toWTFString(name), toWTFString(argument));
>+    WebKit::toImpl(pageRef)->executeEditingCommand(WebKit::toWTFString(name), WebKit::toWTFString(argument));
> }
> 
> bool WKBundlePageIsEditingCommandEnabled(WKBundlePageRef pageRef, WKStringRef name)
> {
>-    return toImpl(pageRef)->isEditingCommandEnabled(toWTFString(name));
>+    return WebKit::toImpl(pageRef)->isEditingCommandEnabled(WebKit::toWTFString(name));
> }
> 
> void WKBundlePageClearMainFrameName(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->clearMainFrameName();
>+    WebKit::toImpl(pageRef)->clearMainFrameName();
> }
> 
> void WKBundlePageClose(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->sendClose();
>+    WebKit::toImpl(pageRef)->sendClose();
> }
> 
> double WKBundlePageGetTextZoomFactor(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->textZoomFactor();
>+    return WebKit::toImpl(pageRef)->textZoomFactor();
> }
> 
> void WKBundlePageSetTextZoomFactor(WKBundlePageRef pageRef, double zoomFactor)
> {
>-    toImpl(pageRef)->setTextZoomFactor(zoomFactor);
>+    WebKit::toImpl(pageRef)->setTextZoomFactor(zoomFactor);
> }
> 
> double WKBundlePageGetPageZoomFactor(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->pageZoomFactor();
>+    return WebKit::toImpl(pageRef)->pageZoomFactor();
> }
> 
> void WKBundlePageSetPageZoomFactor(WKBundlePageRef pageRef, double zoomFactor)
> {
>-    toImpl(pageRef)->setPageZoomFactor(zoomFactor);
>+    WebKit::toImpl(pageRef)->setPageZoomFactor(zoomFactor);
> }
> 
> void WKBundlePageSetScaleAtOrigin(WKBundlePageRef pageRef, double scale, WKPoint origin)
> {
>-    toImpl(pageRef)->scalePage(scale, toIntPoint(origin));
>+    WebKit::toImpl(pageRef)->scalePage(scale, WebKit::toIntPoint(origin));
> }
> 
> WKStringRef WKBundlePageDumpHistoryForTesting(WKBundlePageRef page, WKStringRef directory)
> {
>-    return toCopiedAPI(toImpl(page)->dumpHistoryForTesting(toWTFString(directory)));
>+    return WebKit::toCopiedAPI(WebKit::toImpl(page)->dumpHistoryForTesting(WebKit::toWTFString(directory)));
> }
> 
> void WKBundleClearHistoryForTesting(WKBundlePageRef page)
> {
>-    toImpl(page)->clearHistory();
>+    WebKit::toImpl(page)->clearHistory();
> }
> 
> WKBundleBackForwardListRef WKBundlePageGetBackForwardList(WKBundlePageRef pageRef)
>@@ -382,28 +380,28 @@ WKBundleBackForwardListRef WKBundlePageGetBackForwardList(WKBundlePageRef pageRe
> 
> void WKBundlePageInstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
> {
>-    toImpl(pageRef)->corePage()->pageOverlayController().installPageOverlay(*toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::DoNotFade);
>+    WebKit::toImpl(pageRef)->corePage()->pageOverlayController().installPageOverlay(*WebKit::toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::DoNotFade);
> }
> 
> void WKBundlePageUninstallPageOverlay(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
> {
>-    toImpl(pageRef)->corePage()->pageOverlayController().uninstallPageOverlay(*toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::DoNotFade);
>+    WebKit::toImpl(pageRef)->corePage()->pageOverlayController().uninstallPageOverlay(*WebKit::toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::DoNotFade);
> }
> 
> void WKBundlePageInstallPageOverlayWithAnimation(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
> {
>-    toImpl(pageRef)->corePage()->pageOverlayController().installPageOverlay(*toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::Fade);
>+    WebKit::toImpl(pageRef)->corePage()->pageOverlayController().installPageOverlay(*WebKit::toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::Fade);
> }
> 
> void WKBundlePageUninstallPageOverlayWithAnimation(WKBundlePageRef pageRef, WKBundlePageOverlayRef pageOverlayRef)
> {
>-    toImpl(pageRef)->corePage()->pageOverlayController().uninstallPageOverlay(*toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::Fade);
>+    WebKit::toImpl(pageRef)->corePage()->pageOverlayController().uninstallPageOverlay(*WebKit::toImpl(pageOverlayRef)->coreOverlay(), WebCore::PageOverlay::FadeMode::Fade);
> }
> 
> void WKBundlePageSetTopOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
> {
> #if PLATFORM(MAC)
>-    toImpl(pageRef)->setTopOverhangImage(toImpl(imageRef));
>+    WebKit::toImpl(pageRef)->setTopOverhangImage(WebKit::toImpl(imageRef));
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(imageRef);
>@@ -413,7 +411,7 @@ void WKBundlePageSetTopOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRe
> void WKBundlePageSetBottomOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
> {
> #if PLATFORM(MAC)
>-    toImpl(pageRef)->setBottomOverhangImage(toImpl(imageRef));
>+    WebKit::toImpl(pageRef)->setBottomOverhangImage(WebKit::toImpl(imageRef));
> #else
>     UNUSED_PARAM(pageRef);
>     UNUSED_PARAM(imageRef);
>@@ -423,40 +421,40 @@ void WKBundlePageSetBottomOverhangImage(WKBundlePageRef pageRef, WKImageRef imag
> #if !PLATFORM(IOS_FAMILY)
> void WKBundlePageSetHeaderBanner(WKBundlePageRef pageRef, WKBundlePageBannerRef bannerRef)
> {
>-    toImpl(pageRef)->setHeaderPageBanner(toImpl(bannerRef));
>+    WebKit::toImpl(pageRef)->setHeaderPageBanner(WebKit::toImpl(bannerRef));
> }
> 
> void WKBundlePageSetFooterBanner(WKBundlePageRef pageRef, WKBundlePageBannerRef bannerRef)
> {
>-    toImpl(pageRef)->setFooterPageBanner(toImpl(bannerRef));
>+    WebKit::toImpl(pageRef)->setFooterPageBanner(WebKit::toImpl(bannerRef));
> }
> #endif // !PLATFORM(IOS_FAMILY)
> 
> bool WKBundlePageHasLocalDataForURL(WKBundlePageRef pageRef, WKURLRef urlRef)
> {
>-    return toImpl(pageRef)->hasLocalDataForURL(URL(URL(), toWTFString(urlRef)));
>+    return WebKit::toImpl(pageRef)->hasLocalDataForURL(URL(URL(), WebKit::toWTFString(urlRef)));
> }
> 
> bool WKBundlePageCanHandleRequest(WKURLRequestRef requestRef)
> {
>     if (!requestRef)
>         return false;
>-    return WebPage::canHandleRequest(toImpl(requestRef)->resourceRequest());
>+    return WebKit::WebPage::canHandleRequest(WebKit::toImpl(requestRef)->resourceRequest());
> }
> 
> bool WKBundlePageFindString(WKBundlePageRef pageRef, WKStringRef target, WKFindOptions findOptions)
> {
>-    return toImpl(pageRef)->findStringFromInjectedBundle(toWTFString(target), toFindOptions(findOptions));
>+    return WebKit::toImpl(pageRef)->findStringFromInjectedBundle(WebKit::toWTFString(target), WebKit::toFindOptions(findOptions));
> }
> 
> void WKBundlePageFindStringMatches(WKBundlePageRef pageRef, WKStringRef target, WKFindOptions findOptions)
> {
>-    toImpl(pageRef)->findStringMatchesFromInjectedBundle(toWTFString(target), toFindOptions(findOptions));
>+    WebKit::toImpl(pageRef)->findStringMatchesFromInjectedBundle(WebKit::toWTFString(target), WebKit::toFindOptions(findOptions));
> }
> 
> void WKBundlePageReplaceStringMatches(WKBundlePageRef pageRef, WKArrayRef matchIndicesRef, WKStringRef replacementText, bool selectionOnly)
> {
>-    auto* matchIndices = toImpl(matchIndicesRef);
>+    auto* matchIndices = WebKit::toImpl(matchIndicesRef);
> 
>     Vector<uint32_t> indices;
>     indices.reserveInitialCapacity(matchIndices->size());
>@@ -466,83 +464,83 @@ void WKBundlePageReplaceStringMatches(WKBundlePageRef pageRef, WKArrayRef matchI
>         if (auto* indexAsObject = matchIndices->at<API::UInt64>(i))
>             indices.uncheckedAppend(indexAsObject->value());
>     }
>-    toImpl(pageRef)->replaceStringMatchesFromInjectedBundle(indices, toWTFString(replacementText), selectionOnly);
>+    WebKit::toImpl(pageRef)->replaceStringMatchesFromInjectedBundle(indices, WebKit::toWTFString(replacementText), selectionOnly);
> }
> 
> WKImageRef WKBundlePageCreateSnapshotWithOptions(WKBundlePageRef pageRef, WKRect rect, WKSnapshotOptions options)
> {
>-    RefPtr<WebImage> webImage = toImpl(pageRef)->scaledSnapshotWithOptions(toIntRect(rect), 1, toSnapshotOptions(options));
>+    RefPtr<WebKit::WebImage> webImage = WebKit::toImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, WebKit::toSnapshotOptions(options));
>     return toAPI(webImage.leakRef());
> }
> 
> WKImageRef WKBundlePageCreateSnapshotInViewCoordinates(WKBundlePageRef pageRef, WKRect rect, WKImageOptions options)
> {
>-    SnapshotOptions snapshotOptions = snapshotOptionsFromImageOptions(options);
>-    snapshotOptions |= SnapshotOptionsInViewCoordinates;
>-    RefPtr<WebImage> webImage = toImpl(pageRef)->scaledSnapshotWithOptions(toIntRect(rect), 1, snapshotOptions);
>+    auto snapshotOptions = WebKit::snapshotOptionsFromImageOptions(options);
>+    snapshotOptions |= WebKit::SnapshotOptionsInViewCoordinates;
>+    RefPtr<WebKit::WebImage> webImage = WebKit::toImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, snapshotOptions);
>     return toAPI(webImage.leakRef());
> }
> 
> WKImageRef WKBundlePageCreateSnapshotInDocumentCoordinates(WKBundlePageRef pageRef, WKRect rect, WKImageOptions options)
> {
>-    RefPtr<WebImage> webImage = toImpl(pageRef)->scaledSnapshotWithOptions(toIntRect(rect), 1, snapshotOptionsFromImageOptions(options));
>+    RefPtr<WebKit::WebImage> webImage = WebKit::toImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, WebKit::snapshotOptionsFromImageOptions(options));
>     return toAPI(webImage.leakRef());
> }
> 
> WKImageRef WKBundlePageCreateScaledSnapshotInDocumentCoordinates(WKBundlePageRef pageRef, WKRect rect, double scaleFactor, WKImageOptions options)
> {
>-    RefPtr<WebImage> webImage = toImpl(pageRef)->scaledSnapshotWithOptions(toIntRect(rect), scaleFactor, snapshotOptionsFromImageOptions(options));
>+    RefPtr<WebKit::WebImage> webImage = WebKit::toImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), scaleFactor, WebKit::snapshotOptionsFromImageOptions(options));
>     return toAPI(webImage.leakRef());
> }
> 
> double WKBundlePageGetBackingScaleFactor(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->deviceScaleFactor();
>+    return WebKit::toImpl(pageRef)->deviceScaleFactor();
> }
> 
> void WKBundlePageListenForLayoutMilestones(WKBundlePageRef pageRef, WKLayoutMilestones milestones)
> {
>-    toImpl(pageRef)->listenForLayoutMilestones(toLayoutMilestones(milestones));
>+    WebKit::toImpl(pageRef)->listenForLayoutMilestones(WebKit::toLayoutMilestones(milestones));
> }
> 
> WKBundleInspectorRef WKBundlePageGetInspector(WKBundlePageRef pageRef)
> {
>-    return toAPI(toImpl(pageRef)->inspector());
>+    return WebKit::toAPI(WebKit::toImpl(pageRef)->inspector());
> }
> 
> void WKBundlePageForceRepaint(WKBundlePageRef page)
> {
>-    toImpl(page)->forceRepaintWithoutCallback();
>+    WebKit::toImpl(page)->forceRepaintWithoutCallback();
> }
> 
> void WKBundlePageSimulateMouseDown(WKBundlePageRef page, int button, WKPoint position, int clickCount, WKEventModifiers modifiers, double time)
> {
>-    toImpl(page)->simulateMouseDown(button, toIntPoint(position), clickCount, modifiers, WallTime::fromRawSeconds(time));
>+    WebKit::toImpl(page)->simulateMouseDown(button, WebKit::toIntPoint(position), clickCount, modifiers, WallTime::fromRawSeconds(time));
> }
> 
> void WKBundlePageSimulateMouseUp(WKBundlePageRef page, int button, WKPoint position, int clickCount, WKEventModifiers modifiers, double time)
> {
>-    toImpl(page)->simulateMouseUp(button, toIntPoint(position), clickCount, modifiers, WallTime::fromRawSeconds(time));
>+    WebKit::toImpl(page)->simulateMouseUp(button, WebKit::toIntPoint(position), clickCount, modifiers, WallTime::fromRawSeconds(time));
> }
> 
> void WKBundlePageSimulateMouseMotion(WKBundlePageRef page, WKPoint position, double time)
> {
>-    toImpl(page)->simulateMouseMotion(toIntPoint(position), WallTime::fromRawSeconds(time));
>+    WebKit::toImpl(page)->simulateMouseMotion(WebKit::toIntPoint(position), WallTime::fromRawSeconds(time));
> }
> 
> uint64_t WKBundlePageGetRenderTreeSize(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->renderTreeSize();
>+    return WebKit::toImpl(pageRef)->renderTreeSize();
> }
> 
> WKRenderObjectRef WKBundlePageCopyRenderTree(WKBundlePageRef pageRef)
> {
>-    return toAPI(WebRenderObject::create(toImpl(pageRef)).leakRef());
>+    return WebKit::toAPI(WebKit::WebRenderObject::create(WebKit::toImpl(pageRef)).leakRef());
> }
> 
> WKRenderLayerRef WKBundlePageCopyRenderLayerTree(WKBundlePageRef pageRef)
> {
>-    return toAPI(WebRenderLayer::create(toImpl(pageRef)).leakRef());
>+    return WebKit::toAPI(WebKit::WebRenderLayer::create(WebKit::toImpl(pageRef)).leakRef());
> }
> 
> void WKBundlePageSetPaintedObjectsCounterThreshold(WKBundlePageRef, uint64_t)
>@@ -553,79 +551,79 @@ void WKBundlePageSetPaintedObjectsCounterThreshold(WKBundlePageRef, uint64_t)
> 
> void WKBundlePageSetTracksRepaints(WKBundlePageRef pageRef, bool trackRepaints)
> {
>-    toImpl(pageRef)->setTracksRepaints(trackRepaints);
>+    WebKit::toImpl(pageRef)->setTracksRepaints(trackRepaints);
> }
> 
> bool WKBundlePageIsTrackingRepaints(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->isTrackingRepaints();
>+    return WebKit::toImpl(pageRef)->isTrackingRepaints();
> }
> 
> void WKBundlePageResetTrackedRepaints(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->resetTrackedRepaints();
>+    WebKit::toImpl(pageRef)->resetTrackedRepaints();
> }
> 
> WKArrayRef WKBundlePageCopyTrackedRepaintRects(WKBundlePageRef pageRef)
> {
>-    return toAPI(&toImpl(pageRef)->trackedRepaintRects().leakRef());
>+    return WebKit::toAPI(&WebKit::toImpl(pageRef)->trackedRepaintRects().leakRef());
> }
> 
> void WKBundlePageSetComposition(WKBundlePageRef pageRef, WKStringRef text, int from, int length, bool suppressUnderline)
> {
>-    toImpl(pageRef)->setCompositionForTesting(toWTFString(text), from, length, suppressUnderline);
>+    WebKit::toImpl(pageRef)->setCompositionForTesting(WebKit::toWTFString(text), from, length, suppressUnderline);
> }
> 
> bool WKBundlePageHasComposition(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->hasCompositionForTesting();
>+    return WebKit::toImpl(pageRef)->hasCompositionForTesting();
> }
> 
> void WKBundlePageConfirmComposition(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->confirmCompositionForTesting(String());
>+    WebKit::toImpl(pageRef)->confirmCompositionForTesting(String());
> }
> 
> void WKBundlePageConfirmCompositionWithText(WKBundlePageRef pageRef, WKStringRef text)
> {
>-    toImpl(pageRef)->confirmCompositionForTesting(toWTFString(text));
>+    WebKit::toImpl(pageRef)->confirmCompositionForTesting(WebKit::toWTFString(text));
> }
> 
> bool WKBundlePageCanShowMIMEType(WKBundlePageRef pageRef, WKStringRef mimeTypeRef)
> {
>-    return toImpl(pageRef)->canShowMIMEType(toWTFString(mimeTypeRef));
>+    return WebKit::toImpl(pageRef)->canShowMIMEType(WebKit::toWTFString(mimeTypeRef));
> }
> 
> WKRenderingSuppressionToken WKBundlePageExtendIncrementalRenderingSuppression(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->extendIncrementalRenderingSuppression();
>+    return WebKit::toImpl(pageRef)->extendIncrementalRenderingSuppression();
> }
> 
> void WKBundlePageStopExtendingIncrementalRenderingSuppression(WKBundlePageRef pageRef, WKRenderingSuppressionToken token)
> {
>-    toImpl(pageRef)->stopExtendingIncrementalRenderingSuppression(token);
>+    WebKit::toImpl(pageRef)->stopExtendingIncrementalRenderingSuppression(token);
> }
> 
> bool WKBundlePageIsUsingEphemeralSession(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->usesEphemeralSession();
>+    return WebKit::toImpl(pageRef)->usesEphemeralSession();
> }
> 
> bool WKBundlePageIsControlledByAutomation(WKBundlePageRef pageRef)
> {
>-    return toImpl(pageRef)->isControlledByAutomation();
>+    return WebKit::toImpl(pageRef)->isControlledByAutomation();
> }
> 
> #if TARGET_OS_IPHONE
> void WKBundlePageSetUseTestingViewportConfiguration(WKBundlePageRef pageRef, bool useTestingViewportConfiguration)
> {
>-    toImpl(pageRef)->setUseTestingViewportConfiguration(useTestingViewportConfiguration);
>+    WebKit::toImpl(pageRef)->setUseTestingViewportConfiguration(useTestingViewportConfiguration);
> }
> #endif
> 
> void WKBundlePageStartMonitoringScrollOperations(WKBundlePageRef pageRef)
> {
>-    WebKit::WebPage* webPage = toImpl(pageRef);
>+    WebKit::WebPage* webPage = WebKit::toImpl(pageRef);
>     WebCore::Page* page = webPage ? webPage->corePage() : nullptr;
>     
>     if (!page)
>@@ -639,7 +637,7 @@ void WKBundlePageRegisterScrollOperationCompletionCallback(WKBundlePageRef pageR
>     if (!callback)
>         return;
>     
>-    WebKit::WebPage* webPage = toImpl(pageRef);
>+    WebKit::WebPage* webPage = WebKit::toImpl(pageRef);
>     WebCore::Page* page = webPage ? webPage->corePage() : nullptr;
>     if (!page || !page->expectsWheelEventTriggers())
>         return;
>@@ -654,7 +652,7 @@ void WKBundlePageCallAfterTasksAndTimers(WKBundlePageRef pageRef, WKBundlePageTe
>     if (!callback)
>         return;
>     
>-    WebKit::WebPage* webPage = toImpl(pageRef);
>+    WebKit::WebPage* webPage = WebKit::toImpl(pageRef);
>     WebCore::Page* page = webPage ? webPage->corePage() : nullptr;
>     if (!page)
>         return;
>@@ -691,78 +689,78 @@ void WKBundlePageCallAfterTasksAndTimers(WKBundlePageRef pageRef, WKBundlePageTe
> 
> void WKBundlePagePostMessage(WKBundlePageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
> {
>-    toImpl(pageRef)->postMessage(toWTFString(messageNameRef), toImpl(messageBodyRef));
>+    WebKit::toImpl(pageRef)->postMessage(WebKit::toWTFString(messageNameRef), WebKit::toImpl(messageBodyRef));
> }
> 
> void WKBundlePagePostMessageIgnoringFullySynchronousMode(WKBundlePageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
> {
>-    toImpl(pageRef)->postMessageIgnoringFullySynchronousMode(toWTFString(messageNameRef), toImpl(messageBodyRef));
>+    WebKit::toImpl(pageRef)->postMessageIgnoringFullySynchronousMode(WebKit::toWTFString(messageNameRef), WebKit::toImpl(messageBodyRef));
> }
> 
> void WKBundlePagePostSynchronousMessageForTesting(WKBundlePageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef, WKTypeRef* returnDataRef)
> {
>-    WebPage* page = toImpl(pageRef);
>+    WebKit::WebPage* page = WebKit::toImpl(pageRef);
>     page->layoutIfNeeded();
> 
>     RefPtr<API::Object> returnData;
>-    page->postSynchronousMessageForTesting(toWTFString(messageNameRef), toImpl(messageBodyRef), returnData);
>+    page->postSynchronousMessageForTesting(WebKit::toWTFString(messageNameRef), WebKit::toImpl(messageBodyRef), returnData);
>     if (returnDataRef)
>-        *returnDataRef = toAPI(returnData.leakRef());
>+        *returnDataRef = WebKit::toAPI(returnData.leakRef());
> }
> 
> void WKBundlePageAddUserScript(WKBundlePageRef pageRef, WKStringRef source, _WKUserScriptInjectionTime injectionTime, WKUserContentInjectedFrames injectedFrames)
> {
>-    toImpl(pageRef)->addUserScript(toWTFString(source), toUserContentInjectedFrames(injectedFrames), toUserScriptInjectionTime(injectionTime));
>+    WebKit::toImpl(pageRef)->addUserScript(WebKit::toWTFString(source), WebKit::toUserContentInjectedFrames(injectedFrames), WebKit::toUserScriptInjectionTime(injectionTime));
> }
> 
> void WKBundlePageAddUserStyleSheet(WKBundlePageRef pageRef, WKStringRef source, WKUserContentInjectedFrames injectedFrames)
> {
>-    toImpl(pageRef)->addUserStyleSheet(toWTFString(source), toUserContentInjectedFrames(injectedFrames));
>+    WebKit::toImpl(pageRef)->addUserStyleSheet(WebKit::toWTFString(source), WebKit::toUserContentInjectedFrames(injectedFrames));
> }
> 
> void WKBundlePageRemoveAllUserContent(WKBundlePageRef pageRef)
> {
>-    toImpl(pageRef)->removeAllUserContent();
>+    WebKit::toImpl(pageRef)->removeAllUserContent();
> }
> 
> WKStringRef WKBundlePageCopyGroupIdentifier(WKBundlePageRef pageRef)
> {
>-    return toCopiedAPI(toImpl(pageRef)->pageGroup()->identifier());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(pageRef)->pageGroup()->identifier());
> }
> 
> void WKBundlePageClearApplicationCache(WKBundlePageRef page)
> {
>-    toImpl(page)->corePage()->applicationCacheStorage().deleteAllEntries();
>+    WebKit::toImpl(page)->corePage()->applicationCacheStorage().deleteAllEntries();
> }
> 
> void WKBundlePageClearApplicationCacheForOrigin(WKBundlePageRef page, WKStringRef origin)
> {
>-    toImpl(page)->corePage()->applicationCacheStorage().deleteCacheForOrigin(WebCore::SecurityOrigin::createFromString(toImpl(origin)->string()));
>+    WebKit::toImpl(page)->corePage()->applicationCacheStorage().deleteCacheForOrigin(WebCore::SecurityOrigin::createFromString(WebKit::toImpl(origin)->string()));
> }
> 
> void WKBundlePageSetAppCacheMaximumSize(WKBundlePageRef page, uint64_t size)
> {
>-    toImpl(page)->corePage()->applicationCacheStorage().setMaximumSize(size);
>+    WebKit::toImpl(page)->corePage()->applicationCacheStorage().setMaximumSize(size);
> }
> 
> uint64_t WKBundlePageGetAppCacheUsageForOrigin(WKBundlePageRef page, WKStringRef origin)
> {
>-    return toImpl(page)->corePage()->applicationCacheStorage().diskUsageForOrigin(WebCore::SecurityOrigin::createFromString(toImpl(origin)->string()));
>+    return WebKit::toImpl(page)->corePage()->applicationCacheStorage().diskUsageForOrigin(WebCore::SecurityOrigin::createFromString(WebKit::toImpl(origin)->string()));
> }
> 
> void WKBundlePageSetApplicationCacheOriginQuota(WKBundlePageRef page, WKStringRef origin, uint64_t bytes)
> {
>-    toImpl(page)->corePage()->applicationCacheStorage().storeUpdatedQuotaForOrigin(WebCore::SecurityOrigin::createFromString(toImpl(origin)->string()).ptr(), bytes);
>+    WebKit::toImpl(page)->corePage()->applicationCacheStorage().storeUpdatedQuotaForOrigin(WebCore::SecurityOrigin::createFromString(WebKit::toImpl(origin)->string()).ptr(), bytes);
> }
> 
> void WKBundlePageResetApplicationCacheOriginQuota(WKBundlePageRef page, WKStringRef origin)
> {
>-    toImpl(page)->corePage()->applicationCacheStorage().storeUpdatedQuotaForOrigin(WebCore::SecurityOrigin::createFromString(toImpl(origin)->string()).ptr(), toImpl(page)->corePage()->applicationCacheStorage().defaultOriginQuota());
>+    WebKit::toImpl(page)->corePage()->applicationCacheStorage().storeUpdatedQuotaForOrigin(WebCore::SecurityOrigin::createFromString(WebKit::toImpl(origin)->string()).ptr(), WebKit::toImpl(page)->corePage()->applicationCacheStorage().defaultOriginQuota());
> }
> 
> WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page)
> {
>-    auto origins = toImpl(page)->corePage()->applicationCacheStorage().originsWithCache();
>+    auto origins = WebKit::toImpl(page)->corePage()->applicationCacheStorage().originsWithCache();
> 
>     Vector<RefPtr<API::Object>> originIdentifiers;
>     originIdentifiers.reserveInitialCapacity(origins.size());
>@@ -770,7 +768,7 @@ WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page)
>     for (const auto& origin : origins)
>         originIdentifiers.uncheckedAppend(API::String::create(origin->data().databaseIdentifier()));
> 
>-    return toAPI(&API::Array::create(WTFMove(originIdentifiers)).leakRef());
>+    return WebKit::toAPI(&API::Array::create(WTFMove(originIdentifiers)).leakRef());
> }
> 
> void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, WKEventThrottlingBehavior* behavior)
>@@ -787,7 +785,7 @@ void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, WKEven
>         }
>     }
> 
>-    toImpl(page)->corePage()->setEventThrottlingBehaviorOverride(behaviorValue);
>+    WebKit::toImpl(page)->corePage()->setEventThrottlingBehaviorOverride(behaviorValue);
> }
> 
> void WKBundlePageSetCompositingPolicyOverride(WKBundlePageRef page, WKCompositingPolicy* policy)
>@@ -804,6 +802,6 @@ void WKBundlePageSetCompositingPolicyOverride(WKBundlePageRef page, WKCompositin
>         }
>     }
> 
>-    toImpl(page)->corePage()->setCompositingPolicyOverride(policyValue);
>+    WebKit::toImpl(page)->corePage()->setCompositingPolicyOverride(policyValue);
> }
> 
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
>index be0955e1c59d04853200cba04441b596cc866586..e4ce4e5dd93bf84c12c4c64f153be81e6aabf90b 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.cpp
>@@ -30,9 +30,7 @@
> #include "WKAPICast.h"
> #include "WKBundleAPICast.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundlePageBannerGetTypeID()
> {
>-    return toAPI(PageBanner::APIType);
>+    return WebKit::toAPI(WebKit::PageBanner::APIType);
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp
>index e076cb97fb131f57abcd1a4a677d45e3a53a8d4f..4f56ddb2c1316890301f3677e59c4565452e1ae6 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageGroup.cpp
>@@ -30,14 +30,12 @@
> #include "WKBundleAPICast.h"
> #include "WebPageGroupProxy.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundlePageGroupGetTypeID()
> {
>-    return toAPI(WebPageGroupProxy::APIType);
>+    return WebKit::toAPI(WebKit::WebPageGroupProxy::APIType);
> }
> 
> WKStringRef WKBundlePageGroupCopyIdentifier(WKBundlePageGroupRef bundlePageGroup)
> {
>-    return toCopiedAPI(toImpl(bundlePageGroup)->identifier());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(bundlePageGroup)->identifier());
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>index b7081d4244b87d87f78855fdab469bd3629d0202..ebd3ef5f29308c14193a181b7e1e4a425fd21dd2 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
>@@ -53,9 +53,7 @@ template<> struct ClientTraits<WKBundlePageOverlayAccessibilityClientBase> {
> 
> }
> 
>-using namespace WebKit;
>-
>-class PageOverlayClientImpl : API::Client<WKBundlePageOverlayClientBase>, public WebPageOverlay::Client {
>+class PageOverlayClientImpl : API::Client<WKBundlePageOverlayClientBase>, public WebKit::WebPageOverlay::Client {
> public:
>     explicit PageOverlayClientImpl(WKBundlePageOverlayClientBase* client)
>     {
>@@ -68,8 +66,8 @@ public:
>     }
> 
> private:
>-    // WebPageOverlay::Client.
>-    void willMoveToPage(WebPageOverlay& pageOverlay, WebPage* page) override
>+    // WebKit::WebPageOverlay::Client.
>+    void willMoveToPage(WebKit::WebPageOverlay& pageOverlay, WebKit::WebPage* page) override
>     {
>         if (!m_client.willMoveToPage)
>             return;
>@@ -77,7 +75,7 @@ private:
>         m_client.willMoveToPage(toAPI(&pageOverlay), toAPI(page), m_client.base.clientInfo);
>     }
>     
>-    void didMoveToPage(WebPageOverlay& pageOverlay, WebPage* page) override
>+    void didMoveToPage(WebKit::WebPageOverlay& pageOverlay, WebKit::WebPage* page) override
>     {
>         if (!m_client.didMoveToPage)
>             return;
>@@ -85,42 +83,42 @@ private:
>         m_client.didMoveToPage(toAPI(&pageOverlay), toAPI(page), m_client.base.clientInfo);
>     }
> 
>-    void drawRect(WebPageOverlay& pageOverlay, WebCore::GraphicsContext& graphicsContext, const WebCore::IntRect& dirtyRect) override
>+    void drawRect(WebKit::WebPageOverlay& pageOverlay, WebCore::GraphicsContext& graphicsContext, const WebCore::IntRect& dirtyRect) override
>     {
>         if (!m_client.drawRect)
>             return;
> 
>-        m_client.drawRect(toAPI(&pageOverlay), graphicsContext.platformContext(), toAPI(dirtyRect), m_client.base.clientInfo);
>+        m_client.drawRect(toAPI(&pageOverlay), graphicsContext.platformContext(), WebKit::toAPI(dirtyRect), m_client.base.clientInfo);
>     }
>     
>-    bool mouseEvent(WebPageOverlay& pageOverlay, const WebCore::PlatformMouseEvent& event) override
>+    bool mouseEvent(WebKit::WebPageOverlay& pageOverlay, const WebCore::PlatformMouseEvent& event) override
>     {
>         switch (event.type()) {
>         case WebCore::PlatformMouseEvent::Type::MousePressed: {
>             if (!m_client.mouseDown)
>                 return false;
> 
>-            return m_client.mouseDown(toAPI(&pageOverlay), toAPI(event.position()), toAPI(event.button()), m_client.base.clientInfo);
>+            return m_client.mouseDown(toAPI(&pageOverlay), WebKit::toAPI(event.position()), WebKit::toAPI(event.button()), m_client.base.clientInfo);
>         }
>         case WebCore::PlatformMouseEvent::Type::MouseReleased: {
>             if (!m_client.mouseUp)
>                 return false;
> 
>-            return m_client.mouseUp(toAPI(&pageOverlay), toAPI(event.position()), toAPI(event.button()), m_client.base.clientInfo);
>+            return m_client.mouseUp(toAPI(&pageOverlay), WebKit::toAPI(event.position()), WebKit::toAPI(event.button()), m_client.base.clientInfo);
>         }
>         case WebCore::PlatformMouseEvent::Type::MouseMoved: {
>             if (event.button() == WebCore::MouseButton::NoButton) {
>                 if (!m_client.mouseMoved)
>                     return false;
> 
>-                return m_client.mouseMoved(toAPI(&pageOverlay), toAPI(event.position()), m_client.base.clientInfo);
>+                return m_client.mouseMoved(toAPI(&pageOverlay), WebKit::toAPI(event.position()), m_client.base.clientInfo);
>             }
> 
>             // This is a MouseMove event with a mouse button pressed. Call mouseDragged.
>             if (!m_client.mouseDragged)
>                 return false;
> 
>-            return m_client.mouseDragged(toAPI(&pageOverlay), toAPI(event.position()), toAPI(event.button()), m_client.base.clientInfo);
>+            return m_client.mouseDragged(toAPI(&pageOverlay), WebKit::toAPI(event.position()), WebKit::toAPI(event.button()), m_client.base.clientInfo);
>         }
> 
>         default:
>@@ -129,14 +127,14 @@ private:
>     }
> 
> #if PLATFORM(MAC)
>-    DDActionContext *actionContextForResultAtPoint(WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) override
>+    DDActionContext *actionContextForResultAtPoint(WebKit::WebPageOverlay& pageOverlay, WebCore::FloatPoint location, RefPtr<WebCore::Range>& rangeHandle) override
>     {
>         if (m_client.actionContextForResultAtPoint) {
>             WKBundleRangeHandleRef apiRange = nullptr;
>             DDActionContext *actionContext = (DDActionContext *)m_client.actionContextForResultAtPoint(toAPI(&pageOverlay), WKPointMake(location.x(), location.y()), &apiRange, m_client.base.clientInfo);
> 
>             if (apiRange)
>-                rangeHandle = &toImpl(apiRange)->coreRange();
>+                rangeHandle = &WebKit::toImpl(apiRange)->coreRange();
> 
>             return actionContext;
>         }
>@@ -144,7 +142,7 @@ private:
>         return nil;
>     }
> 
>-    void dataDetectorsDidPresentUI(WebPageOverlay& pageOverlay) override
>+    void dataDetectorsDidPresentUI(WebKit::WebPageOverlay& pageOverlay) override
>     {
>         if (!m_client.dataDetectorsDidPresentUI)
>             return;
>@@ -152,7 +150,7 @@ private:
>         m_client.dataDetectorsDidPresentUI(toAPI(&pageOverlay), m_client.base.clientInfo);
>     }
> 
>-    void dataDetectorsDidChangeUI(WebPageOverlay& pageOverlay) override
>+    void dataDetectorsDidChangeUI(WebKit::WebPageOverlay& pageOverlay) override
>     {
>         if (!m_client.dataDetectorsDidChangeUI)
>             return;
>@@ -160,7 +158,7 @@ private:
>         m_client.dataDetectorsDidChangeUI(toAPI(&pageOverlay), m_client.base.clientInfo);
>     }
> 
>-    void dataDetectorsDidHideUI(WebPageOverlay& pageOverlay) override
>+    void dataDetectorsDidHideUI(WebKit::WebPageOverlay& pageOverlay) override
>     {
>         if (!m_client.dataDetectorsDidHideUI)
>             return;
>@@ -169,29 +167,29 @@ private:
>     }
> #endif // PLATFORM(MAC)
> 
>-    bool copyAccessibilityAttributeStringValueForPoint(WebPageOverlay& pageOverlay, String attribute, WebCore::FloatPoint parameter, String& value) override
>+    bool copyAccessibilityAttributeStringValueForPoint(WebKit::WebPageOverlay& pageOverlay, String attribute, WebCore::FloatPoint parameter, String& value) override
>     {
>         if (!m_accessibilityClient.client().copyAccessibilityAttributeValue)
>             return false;
>-        auto wkType = m_accessibilityClient.client().copyAccessibilityAttributeValue(toAPI(&pageOverlay), toCopiedAPI(attribute), WKPointCreate(WKPointMake(parameter.x(), parameter.y())), m_accessibilityClient.client().base.clientInfo);
>-        if (toImpl(wkType)->type() != API::String::APIType)
>+        auto wkType = m_accessibilityClient.client().copyAccessibilityAttributeValue(toAPI(&pageOverlay), WebKit::toCopiedAPI(attribute), WKPointCreate(WKPointMake(parameter.x(), parameter.y())), m_accessibilityClient.client().base.clientInfo);
>+        if (WebKit::toImpl(wkType)->type() != API::String::APIType)
>             return false;
>-        value = toWTFString(static_cast<WKStringRef>(wkType));
>+        value = WebKit::toWTFString(static_cast<WKStringRef>(wkType));
>         return true;
>     }
> 
>-    bool copyAccessibilityAttributeBoolValueForPoint(WebPageOverlay& pageOverlay, String attribute, WebCore::FloatPoint parameter, bool& value) override
>+    bool copyAccessibilityAttributeBoolValueForPoint(WebKit::WebPageOverlay& pageOverlay, String attribute, WebCore::FloatPoint parameter, bool& value) override
>     {
>         if (!m_accessibilityClient.client().copyAccessibilityAttributeValue)
>             return false;
>-        auto wkType = m_accessibilityClient.client().copyAccessibilityAttributeValue(toAPI(&pageOverlay), toCopiedAPI(attribute), WKPointCreate(WKPointMake(parameter.x(), parameter.y())), m_accessibilityClient.client().base.clientInfo);
>-        if (toImpl(wkType)->type() != API::Boolean::APIType)
>+        auto wkType = m_accessibilityClient.client().copyAccessibilityAttributeValue(toAPI(&pageOverlay), WebKit::toCopiedAPI(attribute), WKPointCreate(WKPointMake(parameter.x(), parameter.y())), m_accessibilityClient.client().base.clientInfo);
>+        if (WebKit::toImpl(wkType)->type() != API::Boolean::APIType)
>             return false;
>         value = WKBooleanGetValue(static_cast<WKBooleanRef>(wkType));
>         return true;
>     }
> 
>-    Vector<String> copyAccessibilityAttributeNames(WebPageOverlay& pageOverlay, bool paramerizedNames) override
>+    Vector<String> copyAccessibilityAttributeNames(WebKit::WebPageOverlay& pageOverlay, bool paramerizedNames) override
>     {
>         Vector<String> names;
>         if (!m_accessibilityClient.client().copyAccessibilityAttributeNames)
>@@ -201,8 +199,8 @@ private:
>         size_t count = WKArrayGetSize(wkNames);
>         for (size_t k = 0; k < count; k++) {
>             WKTypeRef item = WKArrayGetItemAtIndex(wkNames, k);
>-            if (toImpl(item)->type() == API::String::APIType)
>-                names.append(toWTFString(static_cast<WKStringRef>(item)));
>+            if (WebKit::toImpl(item)->type() == API::String::APIType)
>+                names.append(WebKit::toWTFString(static_cast<WKStringRef>(item)));
>         }
> 
>         return names;
>@@ -213,23 +211,23 @@ private:
> 
> WKTypeID WKBundlePageOverlayGetTypeID()
> {
>-    return toAPI(WebPageOverlay::APIType);
>+    return WebKit::toAPI(WebKit::WebPageOverlay::APIType);
> }
> 
> WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* wkClient)
> {
>     auto clientImpl = std::make_unique<PageOverlayClientImpl>(wkClient);
>-    return toAPI(&WebPageOverlay::create(WTFMove(clientImpl)).leakRef());
>+    return toAPI(&WebKit::WebPageOverlay::create(WTFMove(clientImpl)).leakRef());
> }
> 
> void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClientBase* client)
> {
>-    static_cast<PageOverlayClientImpl&>(toImpl(bundlePageOverlayRef)->client()).setAccessibilityClient(client);
>+    static_cast<PageOverlayClientImpl&>(WebKit::toImpl(bundlePageOverlayRef)->client()).setAccessibilityClient(client);
> }
> 
> void WKBundlePageOverlaySetNeedsDisplay(WKBundlePageOverlayRef bundlePageOverlayRef, WKRect rect)
> {
>-    toImpl(bundlePageOverlayRef)->setNeedsDisplay(enclosingIntRect(toFloatRect(rect)));
>+    WebKit::toImpl(bundlePageOverlayRef)->setNeedsDisplay(enclosingIntRect(WebKit::toFloatRect(rect)));
> }
> 
> float WKBundlePageOverlayFractionFadedIn(WKBundlePageOverlayRef)
>@@ -243,5 +241,5 @@ float WKBundlePageOverlayFractionFadedIn(WKBundlePageOverlayRef)
> 
> void WKBundlePageOverlayClear(WKBundlePageOverlayRef bundlePageOverlayRef)
> {
>-    toImpl(bundlePageOverlayRef)->clear();
>+    WebKit::toImpl(bundlePageOverlayRef)->clear();
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
>index 43717c915d062b3d4a4b7df0ef31c3f5661e5498..a0e8a39b5a999faf8251b2040816cd39441a54f4 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
>@@ -33,27 +33,25 @@
> #include "WebImage.h"
> #include <WebCore/IntRect.h>
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleRangeHandleGetTypeID()
> {
>-    return toAPI(InjectedBundleRangeHandle::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleRangeHandle::APIType);
> }
> 
> WKBundleRangeHandleRef WKBundleRangeHandleCreate(JSContextRef contextRef, JSObjectRef objectRef)
> {
>-    RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef);
>+    RefPtr<WebKit::InjectedBundleRangeHandle> rangeHandle = WebKit::InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef);
>     return toAPI(rangeHandle.leakRef());
> }
> 
> WKRect WKBundleRangeHandleGetBoundingRectInWindowCoordinates(WKBundleRangeHandleRef rangeHandleRef)
> {
>-    WebCore::IntRect boundingRect = toImpl(rangeHandleRef)->boundingRectInWindowCoordinates();
>+    WebCore::IntRect boundingRect = WebKit::toImpl(rangeHandleRef)->boundingRectInWindowCoordinates();
>     return WKRectMake(boundingRect.x(), boundingRect.y(), boundingRect.width(), boundingRect.height());
> }
> 
> WKImageRef WKBundleRangeHandleCopySnapshotWithOptions(WKBundleRangeHandleRef rangeHandleRef, WKSnapshotOptions options)
> {
>-    RefPtr<WebImage> image = toImpl(rangeHandleRef)->renderedImage(toSnapshotOptions(options));
>+    RefPtr<WebKit::WebImage> image = WebKit::toImpl(rangeHandleRef)->renderedImage(WebKit::toSnapshotOptions(options));
>     return toAPI(image.leakRef());
> }
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
>index ef69779cf4a69d97a73f339401ca7cbfd0dc7e25..17411c095456bb0c889f8656b5b2b4f13d4eef2e 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
>@@ -30,40 +30,38 @@
> #include "WKAPICast.h"
> #include "WKBundleAPICast.h"
> 
>-using namespace WebKit;
>-
> WKTypeID WKBundleScriptWorldGetTypeID()
> {
>-    return toAPI(InjectedBundleScriptWorld::APIType);
>+    return WebKit::toAPI(WebKit::InjectedBundleScriptWorld::APIType);
> }
> 
> WKBundleScriptWorldRef WKBundleScriptWorldCreateWorld()
> {
>-    RefPtr<InjectedBundleScriptWorld> world = InjectedBundleScriptWorld::create();
>+    RefPtr<WebKit::InjectedBundleScriptWorld> world = WebKit::InjectedBundleScriptWorld::create();
>     return toAPI(world.leakRef());
> }
> 
> WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld()
> {
>-    return toAPI(&InjectedBundleScriptWorld::normalWorld());
>+    return toAPI(&WebKit::InjectedBundleScriptWorld::normalWorld());
> }
> 
> void WKBundleScriptWorldClearWrappers(WKBundleScriptWorldRef scriptWorldRef)
> {
>-    toImpl(scriptWorldRef)->clearWrappers();
>+    WebKit::toImpl(scriptWorldRef)->clearWrappers();
> }
> 
> void WKBundleScriptWorldMakeAllShadowRootsOpen(WKBundleScriptWorldRef scriptWorldRef)
> {
>-    toImpl(scriptWorldRef)->makeAllShadowRootsOpen();
>+    WebKit::toImpl(scriptWorldRef)->makeAllShadowRootsOpen();
> }
> 
> void WKBundleScriptWorldDisableOverrideBuiltinsBehavior(WKBundleScriptWorldRef scriptWorldRef)
> {
>-    toImpl(scriptWorldRef)->disableOverrideBuiltinsBehavior();
>+    WebKit::toImpl(scriptWorldRef)->disableOverrideBuiltinsBehavior();
> }
> 
> WKStringRef WKBundleScriptWorldCopyName(WKBundleScriptWorldRef scriptWorldRef)
> {
>-    return toCopiedAPI(toImpl(scriptWorldRef)->name());
>+    return WebKit::toCopiedAPI(WebKit::toImpl(scriptWorldRef)->name());
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 192301: 356363 | 356366 | 356367