Diff
Modified: trunk/Source/WebKit/ChangeLog (235858 => 235859)
--- trunk/Source/WebKit/ChangeLog 2018-09-10 20:55:23 UTC (rev 235858)
+++ trunk/Source/WebKit/ChangeLog 2018-09-10 20:57:00 UTC (rev 235859)
@@ -1,5 +1,32 @@
2018-09-10 Tim Horton <[email protected]>
+ 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-10 Tim Horton <[email protected]>
+
Try to fix the build after r235850
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
Modified: trunk/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm (235858 => 235859)
--- trunk/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm 2018-09-10 20:55:23 UTC (rev 235858)
+++ trunk/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm 2018-09-10 20:57:00 UTC (rev 235859)
@@ -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,7 +54,7 @@
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
}
@@ -63,7 +61,7 @@
void WKContextClearPluginClientPolicies(WKContextRef contextRef)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(contextRef)->clearPluginClientPolicies();
+ WebKit::toImpl(contextRef)->clearPluginClientPolicies();
#endif
}
@@ -70,12 +68,12 @@
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 @@
void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetInfoForInstalledPlugInsBlock block)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- Vector<PluginModuleInfo> plugins = toImpl(contextRef)->pluginInfoStore().plugins();
+ Vector<WebKit::PluginModuleInfo> plugins = WebKit::toImpl(contextRef)->pluginInfoStore().plugins();
Vector<RefPtr<API::Object>> pluginInfoDictionaries;
pluginInfoDictionaries.reserveInitialCapacity(plugins.size());
@@ -94,11 +92,11 @@
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
}
@@ -105,22 +103,22 @@
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. */
Modified: trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm (235858 => 235859)
--- trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm 2018-09-10 20:55:23 UTC (rev 235858)
+++ trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm 2018-09-10 20:57:00 UTC (rev 235859)
@@ -37,11 +37,9 @@
#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
@@ -48,13 +46,13 @@
@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 @@
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,22 +131,22 @@
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
@@ -155,7 +153,7 @@
#if PLATFORM(MAC)
bool WKPageIsPlayingVideoInEnhancedFullscreen(WKPageRef pageRef)
{
- return toImpl(pageRef)->isPlayingVideoInEnhancedFullscreen();
+ return WebKit::toImpl(pageRef)->isPlayingVideoInEnhancedFullscreen();
}
#endif
@@ -162,7 +160,7 @@
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
}
@@ -169,7 +167,7 @@
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
Modified: trunk/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm (235858 => 235859)
--- trunk/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm 2018-09-10 20:55:23 UTC (rev 235858)
+++ trunk/Source/WebKit/UIProcess/API/C/mac/WKProtectionSpaceNS.mm 2018-09-10 20:57:00 UTC (rev 235859)
@@ -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];
}
