Attachment 349297 Details for Bug 189469 – Patch

[patch] Patch

bug-189469-20180910000634.patch (text/plain), 10.65 KB, created by Tim Horton on 2018-09-10 00:06:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-09-10 00:06:34 PDT

Size: 10.65 KB

patch

obsolete

>Subversion Revision: 235842
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f7a38495cddbcd2885f83fb840616b09e714f044..dfa69482aa3883fb68186fde3c18504d3c76b8ee 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-09-10  Tim Horton  <timothy_horton@apple.com>
>+
>+        Try to fix the iOSMac build
>+        https://bugs.webkit.org/show_bug.cgi?id=189469
>+
>+        * UIProcess/API/C/mac/WKContextPrivateMac.mm:
>+        (WKContextSetPluginLoadClientPolicy):
>+        (WKContextClearPluginClientPolicies):
>+        (WKContextCopyPlugInInfoForBundleIdentifier):
>+        (WKContextGetInfoForInstalledPlugIns):
>+        (WKContextResetHSTSHosts):
>+        (WKContextResetHSTSHostsAddedAfterDate):
>+        (WKContextRegisterSchemeForCustomProtocol):
>+        (WKContextUnregisterSchemeForCustomProtocol):
>+        * UIProcess/API/C/mac/WKPagePrivateMac.mm:
>+        (-[WKObservablePageState initWithPage:]):
>+        (WKPageCreateObservableState):
>+        (WKPageGetObjectRegistry):
>+        (WKPageIsURLKnownHSTSHost):
>+        (WKPageLoadURLRequestReturningNavigation):
>+        (WKPageLoadFileReturningNavigation):
>+        (WKPageIsPlayingVideoInEnhancedFullscreen):
>+        (WKPageSetFullscreenDelegate):
>+        (WKPageGetFullscreenDelegate):
>+        * UIProcess/API/C/mac/WKProtectionSpaceNS.mm:
>+        (WKProtectionSpaceCopyNSURLProtectionSpace):
>+
> 2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         Unreviewed, rolling out r235839.
>diff --git a/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm b/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm
>index aedc3d7a51b911a7cae16dd9d906b87ffa978b0c..2b5f7c29a3bd91aa21341067b37c70f09f8b92a7 100644
>--- a/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm
>+++ b/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm
>@@ -42,8 +42,6 @@
> #import <WebCore/WebGLBlacklist.h>
> #import <wtf/RetainPtr.h>
> 
>-using namespace WebKit;
>-
> bool WKContextIsPlugInUpdateAvailable(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
> {
> #if PLATFORM(IOS)
>@@ -56,26 +54,26 @@ bool WKContextIsPlugInUpdateAvailable(WKContextRef contextRef, WKStringRef plugI
> void WKContextSetPluginLoadClientPolicy(WKContextRef contextRef, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString)
> {
> #if ENABLE(NETSCAPE_PLUGIN_API)
>-    toImpl(contextRef)->setPluginLoadClientPolicy(toPluginLoadClientPolicy(policy), toWTFString(host), toWTFString(bundleIdentifier), toWTFString(versionString));
>+    WebKit::toImpl(contextRef)->setPluginLoadClientPolicy(WebKit::toPluginLoadClientPolicy(policy), WebKit::toWTFString(host), WebKit::toWTFString(bundleIdentifier), WebKit::toWTFString(versionString));
> #endif
> }
> 
> void WKContextClearPluginClientPolicies(WKContextRef contextRef)
> {
> #if ENABLE(NETSCAPE_PLUGIN_API)
>-    toImpl(contextRef)->clearPluginClientPolicies();
>+    WebKit::toImpl(contextRef)->clearPluginClientPolicies();
> #endif
> }
> 
> WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
> {
> #if ENABLE(NETSCAPE_PLUGIN_API)
>-    PluginModuleInfo plugin = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef));
>+    WebKit::PluginModuleInfo plugin = WebKit::toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(WebKit::toWTFString(plugInBundleIdentifierRef));
>     if (plugin.path.isNull())
>         return 0;
> 
>     auto dictionary = createPluginInformationDictionary(plugin);
>-    return toAPI(&dictionary.leakRef());
>+    return WebKit::toAPI(&dictionary.leakRef());
> #else
>     return 0;
> #endif
>@@ -84,7 +82,7 @@ WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextR
> void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetInfoForInstalledPlugInsBlock block)
> {
> #if ENABLE(NETSCAPE_PLUGIN_API)
>-    Vector<PluginModuleInfo> plugins = toImpl(contextRef)->pluginInfoStore().plugins();
>+    Vector<PluginModuleInfo> plugins = WebKit::toImpl(contextRef)->pluginInfoStore().plugins();
> 
>     Vector<RefPtr<API::Object>> pluginInfoDictionaries;
>     pluginInfoDictionaries.reserveInitialCapacity(plugins.size());
>@@ -94,33 +92,33 @@ void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetIn
> 
>     RefPtr<API::Array> array = API::Array::create(WTFMove(pluginInfoDictionaries));
> 
>-    toImpl(contextRef)->ref();
>+    WebKit::toImpl(contextRef)->ref();
>     dispatch_async(dispatch_get_main_queue(), ^() {
>-        block(toAPI(array.get()), 0);
>+        block(WebKit::toAPI(array.get()), 0);
>     
>-        toImpl(contextRef)->deref();
>+        WebKit::toImpl(contextRef)->deref();
>     });
> #endif
> }
> 
> void WKContextResetHSTSHosts(WKContextRef context)
> {
>-    return toImpl(context)->resetHSTSHosts();
>+    return WebKit::toImpl(context)->resetHSTSHosts();
> }
> 
> void WKContextResetHSTSHostsAddedAfterDate(WKContextRef context, double startDateIntervalSince1970)
> {
>-    return toImpl(context)->resetHSTSHostsAddedAfterDate(startDateIntervalSince1970);
>+    return WebKit::toImpl(context)->resetHSTSHostsAddedAfterDate(startDateIntervalSince1970);
> }
> 
> void WKContextRegisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme)
> {
>-    WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(toWTFString(scheme));
>+    WebKit::WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(WebKit::toWTFString(scheme));
> }
> 
> void WKContextUnregisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme)
> {
>-    WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(toWTFString(scheme));
>+    WebKit::WebProcessPool::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(WebKit::toWTFString(scheme));
> }
> 
> /* DEPRECATED -  Please use constants from WKPluginInformation instead. */
>diff --git a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>index 25cecdd0a78da0cdf16b238ea4dce1596f398cdd..428219a5b3e2288be922a5263deb683efa72c1be 100644
>--- a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>+++ b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>@@ -37,24 +37,22 @@
> #import "WebPreferences.h"
> #import "WebProcessPool.h"
> 
>-using namespace WebKit;
>-
> @interface WKObservablePageState : NSObject <_WKObservablePageState> {
>-    RefPtr<WebPageProxy> _page;
>-    std::unique_ptr<PageLoadStateObserver> _observer;
>+    RefPtr<WebKit::WebPageProxy> _page;
>+    std::unique_ptr<WebKit::PageLoadStateObserver> _observer;
> }
> 
> @end
> 
> @implementation WKObservablePageState
> 
>-- (id)initWithPage:(RefPtr<WebPageProxy>&&)page
>+- (id)initWithPage:(RefPtr<WebKit::WebPageProxy>&&)page
> {
>     if (!(self = [super init]))
>         return nil;
> 
>     _page = WTFMove(page);
>-    _observer = std::make_unique<PageLoadStateObserver>(self, @"URL");
>+    _observer = std::make_unique<WebKit::PageLoadStateObserver>(self, @"URL");
>     _page->pageLoadState().addObserver(*_observer);
> 
>     return self;
>@@ -119,13 +117,13 @@ @end
> 
> id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef pageRef)
> {
>-    return [[WKObservablePageState alloc] initWithPage:toImpl(pageRef)];
>+    return [[WKObservablePageState alloc] initWithPage:WebKit::toImpl(pageRef)];
> }
> 
> _WKRemoteObjectRegistry *WKPageGetObjectRegistry(WKPageRef pageRef)
> {
> #if WK_API_ENABLED && !TARGET_OS_IPHONE
>-    return toImpl(pageRef)->remoteObjectRegistry();
>+    return WebKit::toImpl(pageRef)->remoteObjectRegistry();
> #else
>     return nil;
> #endif
>@@ -133,43 +131,43 @@ _WKRemoteObjectRegistry *WKPageGetObjectRegistry(WKPageRef pageRef)
> 
> bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
> {
>-    WebPageProxy* webPageProxy = toImpl(page);
>+    WebKit::WebPageProxy* webPageProxy = WebKit::toImpl(page);
>     bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences().privateBrowsingEnabled();
> 
>-    return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
>+    return webPageProxy->process().processPool().isURLKnownHSTSHost(WebKit::toImpl(url)->string(), privateBrowsingEnabled);
> }
> 
> #if !TARGET_OS_IPHONE && (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
> WKNavigation *WKPageLoadURLRequestReturningNavigation(WKPageRef pageRef, WKURLRequestRef urlRequestRef)
> {
>-    auto resourceRequest = toImpl(urlRequestRef)->resourceRequest();
>-    return wrapper(toImpl(pageRef)->loadRequest(WTFMove(resourceRequest)));
>+    auto resourceRequest = WebKit::toImpl(urlRequestRef)->resourceRequest();
>+    return WebKit::wrapper(WebKit::toImpl(pageRef)->loadRequest(WTFMove(resourceRequest)));
> }
> 
> WKNavigation *WKPageLoadFileReturningNavigation(WKPageRef pageRef, WKURLRef fileURL, WKURLRef resourceDirectoryURL)
> {
>-    return wrapper(toImpl(pageRef)->loadFile(toWTFString(fileURL), toWTFString(resourceDirectoryURL)));
>+    return WebKit::wrapper(WebKit::toImpl(pageRef)->loadFile(WebKit::toWTFString(fileURL), WebKit::toWTFString(resourceDirectoryURL)));
> }
> #endif
> 
> #if PLATFORM(MAC)
> bool WKPageIsPlayingVideoInEnhancedFullscreen(WKPageRef pageRef)
> {
>-    return toImpl(pageRef)->isPlayingVideoInEnhancedFullscreen();
>+    return WebKit::toImpl(pageRef)->isPlayingVideoInEnhancedFullscreen();
> }
> #endif
> 
> void WKPageSetFullscreenDelegate(WKPageRef page, id <_WKFullscreenDelegate> delegate)
> {
> #if WK_API_ENABLED && ENABLE(FULLSCREEN_API)
>-    downcast<WebKit::FullscreenClient>(toImpl(page)->fullscreenClient()).setDelegate(delegate);
>+    downcast<WebKit::FullscreenClient>(WebKit::toImpl(page)->fullscreenClient()).setDelegate(delegate);
> #endif
> }
> 
> id <_WKFullscreenDelegate> WKPageGetFullscreenDelegate(WKPageRef page)
> {
> #if WK_API_ENABLED && ENABLE(FULLSCREEN_API)
>-    return downcast<WebKit::FullscreenClient>(toImpl(page)->fullscreenClient()).delegate().autorelease();
>+    return downcast<WebKit::FullscreenClient>(WebKit::toImpl(page)->fullscreenClient()).delegate().autorelease();
> #else
>     return nil;
> #endif
>diff --git a/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm b/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm
>index 7f7d2538bffdef904e26997baddf75949f23bae7..f6f431c2937d0e49463b38ba634872854f168565 100644
>--- a/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm
>+++ b/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm
>@@ -29,10 +29,7 @@
> #import "WKAPICast.h"
> #import "WebProtectionSpace.h"
> 
>-using namespace WebCore;
>-using namespace WebKit;
>-
> WK_EXPORT NSURLProtectionSpace *WKProtectionSpaceCopyNSURLProtectionSpace(WKProtectionSpaceRef protectionSpace)
> {
>-    return [toImpl(protectionSpace)->protectionSpace().nsSpace() copy];
>+    return [WebKit::toImpl(protectionSpace)->protectionSpace().nsSpace() copy];
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 189469: 349297 | 349319