https://bugs.webkit.org/show_bug.cgi?id=186314
Reviewed by Anders Carlsson.
Source/WebKit:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa): Use __bridge for cast.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::overrideSystemProxies): Ditto.
(WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost): Ditto.
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::sendMessage): Ditto.
(IPC::readFromMachPort): Ditto.
* Platform/mac/StringUtilities.mm:
(WebKit::formattedPhoneNumberString): Use __bridge for cast and
CFBridgingRelease instead of an explicit autorelease.
* Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
(initializeMethods): Use auto instead of an explicit type so that we get
the correct type for the result of protocol_copyProtocolList.
* Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
(-[_WKRemoteObjectRegistry _sendInvocation:interface:]): Added a
bridging cast to void* because that's needed to call _Block_signature
under ARC and harmless outside ARC.
* Shared/API/c/cf/WKStringCF.mm:
(WKStringCreateWithCFString): Use __bridge for cast.
* Shared/API/c/cf/WKURLCF.mm:
(WKURLCreateWithCFURL): Ditto.
* Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm:
(WebKit::AuthenticationManager::initializeConnection): Ditto.
* Shared/Cocoa/DataDetectionResult.mm:
(WebKit::DataDetectionResult::encode const): Ditto.
(WebKit::DataDetectionResult::decode): Ditto.
* Shared/Cocoa/WKNSError.mm:
(-[WKNSError _web_createTarget]): Ditto.
* Shared/Cocoa/WKNSURLExtras.mm:
(-[NSURL _web_originalDataAsWTFString]): Ditto.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
(WebKit::XPCServiceInitializer): Removed balanced calls to both
adoptOSObject and xpc_retain and instead rely on the assignment
operator just added to OSObjectPtr.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
(WebKit::XPCServiceEventHandler): Use __bridge for cast.
* Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::applyBackingStoreToLayer): Ditto.
* Shared/cf/ArgumentCodersCF.cpp:
(IPC::decode): Ditto.
* Shared/mac/ArgumentCodersMac.mm:
(IPC::isSerializableValue): Ditto.
(IPC::encode): Ditto.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::encodeNSError): Ditto. Also use CFSTR("")" instead of @""
when we need a CFString.
(IPC::decodeNSError): Ditto.
(IPC::ArgumentCoder<ProtectionSpace>::encodePlatformData): Ditto.
(IPC::ArgumentCoder<ProtectionSpace>::decodePlatformData): Ditto.
(IPC::ArgumentCoder<Credential>::encodePlatformData): Ditto.
(IPC::ArgumentCoder<Credential>::decodePlatformData): Ditto.
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode): Ditto.
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode): Ditto.
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData): Ditto.
(IPC::ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData): Ditto.
* Shared/mac/WebHitTestResultData.mm:
(WebKit::WebHitTestResultData::platformEncode const): Ditto.
(WebKit::WebHitTestResultData::platformDecode): Ditto.
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextIsPlugInUpdateAvailable): Ditto.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController certificateChain]): Ditto.
(didStartProvisionalLoadForFrame): Ditto.
(didReceiveServerRedirectForProvisionalLoadForFrame): Ditto.
(didFailProvisionalLoadWithErrorForFrame): Ditto.
(didCommitLoadForFrame): Ditto.
(didFinishLoadForFrame): Ditto.
(didFailLoadWithErrorForFrame): Ditto.
(canAuthenticateAgainstProtectionSpaceInFrame): Ditto.
(didReceiveAuthenticationChallengeInFrame): Ditto.
(didStartProgress): Ditto.
(didChangeProgress): Ditto.
(didFinishProgress): Ditto.
(didChangeBackForwardList): Ditto.
(processDidCrash): Ditto.
(setUpPageLoaderClient): Ditto.
(setUpPagePolicyClient): Ditto.
* UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
(createWKArray): Ditto.
(-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Ditto.
(-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Ditto.
* UIProcess/API/Cocoa/WKConnection.mm:
(didReceiveMessage): Ditto.
(didClose): Ditto.
(setUpClient): Ditto.
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(didCreateConnection): Ditto.
(getInjectedBundleInitializationUserData): Ditto.
(setUpInjectedBundleClient): Ditto.
(-[WKProcessGroup _setAllowsSpecificHTTPSCertificate:forHost:]): Ditto.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _setAllowsSpecificHTTPSCertificate:forHost:]): Ditto.
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(-[WKWebsiteDataStore _setProxyConfiguration:]): Ditto.
(-[WKWebsiteDataStore _proxyConfiguration]): Ditto.
* UIProcess/API/Cocoa/_WKThumbnailView.mm:
(-[_WKThumbnailView _didTakeSnapshot:]): Ditto.
* UIProcess/API/Cocoa/_WKUserContentFilter.mm: Added a missing include.
* UIProcess/Authentication/mac/WebCredentialMac.mm:
(WebKit::chain): Use __bridge for cast.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
Use CFBridgingRelease instead of adoptNS.
(WebKit::privateBrowsingSession): Use __bridge for cast.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::provideDataForPasteboard): Use __bridge for cast.
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::PluginInfoStore::pluginPathsInDirectory): Ditto.
* UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
(WebKit::recursivelyMapIOSurfaceBackingStore): Ditto.
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::beginSwipeGesture): Ditto.
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]): Ditto.
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::showPopupMenu): Ditto.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
(didCreatePage): Ditto.
(willDestroyPage): Ditto.
(setUpBundleClient): Ditto.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(didStartProvisionalLoadForFrame): Ditto.
(didReceiveServerRedirectForProvisionalLoadForFrame): Ditto.
(didFinishLoadForFrame): Ditto.
(globalObjectIsAvailableForFrame): Ditto.
(didRemoveFrameFromHierarchy): Ditto.
(didCommitLoadForFrame): Ditto.
(didFinishDocumentLoadForFrame): Ditto.
(didFailProvisionalLoadWithErrorForFrame): Ditto.
(didFailLoadWithErrorForFrame): Ditto.
(didSameDocumentNavigationForFrame): Ditto.
(didLayoutForFrame): Ditto.
(didReachLayoutMilestone): Ditto.
(didFirstVisuallyNonEmptyLayoutForFrame): Ditto.
(didHandleOnloadEventsForFrame): Ditto.
(userAgentForURL): Ditto.
(setUpPageLoaderClient): Ditto.
(willSendRequestForFrame): Ditto.
(didInitiateLoadForResource): Ditto.
(didFinishLoadForResource): Ditto.
(didFailLoadForResource): Ditto.
(setUpResourceLoadClient): Ditto.
* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
(WebKit::InjectedBundle::initialize): Ditto.
* WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
(WebKit::NetscapePlugin::popUpContextMenu): Ditto.
* WebProcess/Plugins/PDF/PDFPlugin.h: Put functions that return NSData inside
an #ifdef __OBJC__ and use __bridge for cast.
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
(WebKit::WebDragClient::declareAndWriteDragImage): Use __bridge for cast.
* WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm:
(WebKit::PlatformCALayerRemoteCustom::contents const): Added a bridging cast.
(WebKit::PlatformCALayerRemoteCustom::setContents): Use __bridge for cast.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom): Ditto.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::setTopOverhangImage): Ditto.
(WebKit::WebPage::setBottomOverhangImage): Ditto.
Source/WTF:
* wtf/BlockPtr.h: Put Block_copy/release calls into #if since they are
not needed under ARC.
* wtf/OSObjectPtr.h: Added constructor and assignment operator so we can
work with OS objects without adopting them.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232520
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
2018-06-05 Darin Adler <darin@apple.com>
+ [Cocoa] More preparation for ARC, focusing on WebKit and smart pointers
+ https://bugs.webkit.org/show_bug.cgi?id=186314
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/BlockPtr.h: Put Block_copy/release calls into #if since they are
+ not needed under ARC.
+
+ * wtf/OSObjectPtr.h: Added constructor and assignment operator so we can
+ work with OS objects without adopting them.
+
+2018-06-05 Darin Adler <darin@apple.com>
+
[Cocoa] Improve some soft linking compatibility with ARC
https://bugs.webkit.org/show_bug.cgi?id=186309
new (&block->f) F { std::move(function) };
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ BlockPtr blockPtr { (__bridge_transfer BlockType)block };
+#else
BlockPtr blockPtr;
blockPtr.m_block = reinterpret_cast<BlockType>(block);
+#endif
return blockPtr;
}
}
BlockPtr(BlockType block)
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ : m_block(block)
+#else
: m_block(Block_copy(block))
+#endif
{
}
BlockPtr(const BlockPtr& other)
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ : m_block(other.m_block)
+#else
: m_block(Block_copy(other.m_block))
+#endif
{
}
~BlockPtr()
{
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
+#endif
}
BlockPtr& operator=(const BlockPtr& other)
{
+#if defined(__OBJC__) && __has_feature(objc_arc)
+ m_block = other.m_block;
+#else
if (this != &other) {
Block_release(m_block);
m_block = Block_copy(other.m_block);
}
-
+#endif
+
return *this;
}
{
ASSERT(this != &other);
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
Block_release(m_block);
+#endif
m_block = std::exchange(other.m_block, nullptr);
return *this;
using WTF::BlockPtr;
using WTF::makeBlockPtr;
-
other.m_ptr = nullptr;
}
+ OSObjectPtr(T ptr)
+ : m_ptr(ptr)
+ {
+ if (m_ptr)
+ retainOSObject(m_ptr);
+ }
+
OSObjectPtr& operator=(const OSObjectPtr& other)
{
OSObjectPtr ptr = other;
return *this;
}
+ OSObjectPtr& operator=(T other)
+ {
+ OSObjectPtr ptr = other;
+ swap(ptr);
+ return *this;
+ }
+
void swap(OSObjectPtr& other)
{
std::swap(m_ptr, other.m_ptr);
+2018-06-05 Darin Adler <darin@apple.com>
+
+ [Cocoa] More preparation for ARC, focusing on WebKit and smart pointers
+ https://bugs.webkit.org/show_bug.cgi?id=186314
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa): Use __bridge for cast.
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::overrideSystemProxies): Ditto.
+ (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost): Ditto.
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::sendMessage): Ditto.
+ (IPC::readFromMachPort): Ditto.
+
+ * Platform/mac/StringUtilities.mm:
+ (WebKit::formattedPhoneNumberString): Use __bridge for cast and
+ CFBridgingRelease instead of an explicit autorelease.
+
+ * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
+ (initializeMethods): Use auto instead of an explicit type so that we get
+ the correct type for the result of protocol_copyProtocolList.
+
+ * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+ (-[_WKRemoteObjectRegistry _sendInvocation:interface:]): Added a
+ bridging cast to void* because that's needed to call _Block_signature
+ under ARC and harmless outside ARC.
+
+ * Shared/API/c/cf/WKStringCF.mm:
+ (WKStringCreateWithCFString): Use __bridge for cast.
+ * Shared/API/c/cf/WKURLCF.mm:
+ (WKURLCreateWithCFURL): Ditto.
+ * Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm:
+ (WebKit::AuthenticationManager::initializeConnection): Ditto.
+ * Shared/Cocoa/DataDetectionResult.mm:
+ (WebKit::DataDetectionResult::encode const): Ditto.
+ (WebKit::DataDetectionResult::decode): Ditto.
+ * Shared/Cocoa/WKNSError.mm:
+ (-[WKNSError _web_createTarget]): Ditto.
+ * Shared/Cocoa/WKNSURLExtras.mm:
+ (-[NSURL _web_originalDataAsWTFString]): Ditto.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
+ (WebKit::XPCServiceInitializer): Removed balanced calls to both
+ adoptOSObject and xpc_retain and instead rely on the assignment
+ operator just added to OSObjectPtr.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+ (WebKit::XPCServiceEventHandler): Use __bridge for cast.
+ * Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::applyBackingStoreToLayer): Ditto.
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (IPC::decode): Ditto.
+ * Shared/mac/ArgumentCodersMac.mm:
+ (IPC::isSerializableValue): Ditto.
+ (IPC::encode): Ditto.
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::encodeNSError): Ditto. Also use CFSTR("")" instead of @""
+ when we need a CFString.
+ (IPC::decodeNSError): Ditto.
+ (IPC::ArgumentCoder<ProtectionSpace>::encodePlatformData): Ditto.
+ (IPC::ArgumentCoder<ProtectionSpace>::decodePlatformData): Ditto.
+ (IPC::ArgumentCoder<Credential>::encodePlatformData): Ditto.
+ (IPC::ArgumentCoder<Credential>::decodePlatformData): Ditto.
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode): Ditto.
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode): Ditto.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::encodePlatformData): Ditto.
+ (IPC::ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData): Ditto.
+ * Shared/mac/WebHitTestResultData.mm:
+ (WebKit::WebHitTestResultData::platformEncode const): Ditto.
+ (WebKit::WebHitTestResultData::platformDecode): Ditto.
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextIsPlugInUpdateAvailable): Ditto.
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController certificateChain]): Ditto.
+ (didStartProvisionalLoadForFrame): Ditto.
+ (didReceiveServerRedirectForProvisionalLoadForFrame): Ditto.
+ (didFailProvisionalLoadWithErrorForFrame): Ditto.
+ (didCommitLoadForFrame): Ditto.
+ (didFinishLoadForFrame): Ditto.
+ (didFailLoadWithErrorForFrame): Ditto.
+ (canAuthenticateAgainstProtectionSpaceInFrame): Ditto.
+ (didReceiveAuthenticationChallengeInFrame): Ditto.
+ (didStartProgress): Ditto.
+ (didChangeProgress): Ditto.
+ (didFinishProgress): Ditto.
+ (didChangeBackForwardList): Ditto.
+ (processDidCrash): Ditto.
+ (setUpPageLoaderClient): Ditto.
+ (setUpPagePolicyClient): Ditto.
+ * UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
+ (createWKArray): Ditto.
+ (-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Ditto.
+ (-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Ditto.
+ * UIProcess/API/Cocoa/WKConnection.mm:
+ (didReceiveMessage): Ditto.
+ (didClose): Ditto.
+ (setUpClient): Ditto.
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (didCreateConnection): Ditto.
+ (getInjectedBundleInitializationUserData): Ditto.
+ (setUpInjectedBundleClient): Ditto.
+ (-[WKProcessGroup _setAllowsSpecificHTTPSCertificate:forHost:]): Ditto.
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _setAllowsSpecificHTTPSCertificate:forHost:]): Ditto.
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _setProxyConfiguration:]): Ditto.
+ (-[WKWebsiteDataStore _proxyConfiguration]): Ditto.
+ * UIProcess/API/Cocoa/_WKThumbnailView.mm:
+ (-[_WKThumbnailView _didTakeSnapshot:]): Ditto.
+
+ * UIProcess/API/Cocoa/_WKUserContentFilter.mm: Added a missing include.
+
+ * UIProcess/Authentication/mac/WebCredentialMac.mm:
+ (WebKit::chain): Use __bridge for cast.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
+ Use CFBridgingRelease instead of adoptNS.
+ (WebKit::privateBrowsingSession): Use __bridge for cast.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::provideDataForPasteboard): Use __bridge for cast.
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::PluginInfoStore::pluginPathsInDirectory): Ditto.
+ * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+ (WebKit::recursivelyMapIOSurfaceBackingStore): Ditto.
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture): Ditto.
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]): Ditto.
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::showPopupMenu): Ditto.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
+ (didCreatePage): Ditto.
+ (willDestroyPage): Ditto.
+ (setUpBundleClient): Ditto.
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (didStartProvisionalLoadForFrame): Ditto.
+ (didReceiveServerRedirectForProvisionalLoadForFrame): Ditto.
+ (didFinishLoadForFrame): Ditto.
+ (globalObjectIsAvailableForFrame): Ditto.
+ (didRemoveFrameFromHierarchy): Ditto.
+ (didCommitLoadForFrame): Ditto.
+ (didFinishDocumentLoadForFrame): Ditto.
+ (didFailProvisionalLoadWithErrorForFrame): Ditto.
+ (didFailLoadWithErrorForFrame): Ditto.
+ (didSameDocumentNavigationForFrame): Ditto.
+ (didLayoutForFrame): Ditto.
+ (didReachLayoutMilestone): Ditto.
+ (didFirstVisuallyNonEmptyLayoutForFrame): Ditto.
+ (didHandleOnloadEventsForFrame): Ditto.
+ (userAgentForURL): Ditto.
+ (setUpPageLoaderClient): Ditto.
+ (willSendRequestForFrame): Ditto.
+ (didInitiateLoadForResource): Ditto.
+ (didFinishLoadForResource): Ditto.
+ (didFailLoadForResource): Ditto.
+ (setUpResourceLoadClient): Ditto.
+ * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WebKit::InjectedBundle::initialize): Ditto.
+ * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+ (WebKit::NetscapePlugin::popUpContextMenu): Ditto.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.h: Put functions that return NSData inside
+ an #ifdef __OBJC__ and use __bridge for cast.
+
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::declareAndWriteDragImage): Use __bridge for cast.
+
+ * WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm:
+ (WebKit::PlatformCALayerRemoteCustom::contents const): Added a bridging cast.
+ (WebKit::PlatformCALayerRemoteCustom::setContents): Use __bridge for cast.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom): Ditto.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::setTopOverhangImage): Ditto.
+ (WebKit::WebPage::setBottomOverhangImage): Ditto.
+
2018-06-05 Youenn Fablet <youenn@apple.com>
ServiceWorker registration should store any script fetched through importScripts
configuration.URLCache = nil;
if (auto& data = globalSourceApplicationAuditTokenData())
- configuration._sourceApplicationAuditTokenData = (NSData *)data.get();
+ configuration._sourceApplicationAuditTokenData = (__bridge NSData *)data.get();
auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
if (!sourceApplicationBundleIdentifier.isEmpty()) {
}
if ([proxySettings count] > 0)
- _CFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
+ _CFNetworkSetOverrideSystemProxySettings((__bridge CFDictionaryRef)proxySettings);
}
void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
{
- [NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];
+ [NSURLRequest setAllowsSpecificHTTPSCertificate:(__bridge NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host];
}
void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
return false;
default:
- WebKit::setCrashReportApplicationSpecificInformation((CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s::%s'", kr, message->messageReceiverName().data(), message->messageName().data()]);
+ WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x, message '%s::%s'", kr, message->messageReceiverName().data(), message->messageName().data()]);
CRASH();
}
}
if (kr != MACH_MSG_SUCCESS) {
#if !ASSERT_DISABLED
- WebKit::setCrashReportApplicationSpecificInformation((CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x from mach_msg, receive port is %x", kr, machPort]);
+ WebKit::setCrashReportApplicationSpecificInformation((__bridge CFStringRef)[NSString stringWithFormat:@"Unhandled error code %x from mach_msg, receive port is %x", kr, machPort]);
#endif
ASSERT_NOT_REACHED();
return nullptr;
{
NSString *countryCode = [[[NSLocale currentLocale] objectForKey:NSLocaleCountryCode] lowercaseString];
- RetainPtr<CFPhoneNumberRef> phoneNumber = adoptCF(CFPhoneNumberCreate(kCFAllocatorDefault, (CFStringRef)originalPhoneNumber, (CFStringRef)countryCode));
+ RetainPtr<CFPhoneNumberRef> phoneNumber = adoptCF(CFPhoneNumberCreate(kCFAllocatorDefault, (__bridge CFStringRef)originalPhoneNumber, (__bridge CFStringRef)countryCode));
if (!phoneNumber)
return originalPhoneNumber;
if (!phoneNumberString)
phoneNumberString = CFPhoneNumberCopyUnformattedRepresentation(phoneNumber.get());
- return [(NSString *)phoneNumberString autorelease];
+ return CFBridgingRelease(phoneNumberString);
}
#else
static void initializeMethods(_WKRemoteObjectInterface *interface, Protocol *protocol)
{
unsigned conformingProtocolCount;
- Protocol** conformingProtocols = protocol_copyProtocolList(interface->_protocol, &conformingProtocolCount);
+ auto conformingProtocols = protocol_copyProtocolList(interface->_protocol, &conformingProtocolCount);
for (unsigned i = 0; i < conformingProtocolCount; ++i) {
- Protocol* conformingProtocol = conformingProtocols[i];
-
+ auto conformingProtocol = conformingProtocols[i];
if (conformingProtocol == @protocol(NSObject))
continue;
-
initializeMethods(interface, conformingProtocol);
}
if (!replyBlock)
[NSException raise:NSInvalidArgumentException format:@"A NULL reply block was passed into a message. (%s)", sel_getName(invocation.selector)];
- const char* replyBlockSignature = _Block_signature(replyBlock);
+ const char* replyBlockSignature = _Block_signature((__bridge void*)replyBlock);
if (strcmp([NSMethodSignature signatureWithObjCTypes:replyBlockSignature].methodReturnType, "v"))
[NSException raise:NSInvalidArgumentException format:@"Return value of block argument must be 'void'. (%s)", sel_getName(invocation.selector)];
{
#if WK_API_ENABLED
// Since WKNSString is an internal class with no subclasses, we can do a simple equality check.
- if (object_getClass((NSString *)cfString) == wkNSStringClass())
+ if (object_getClass((__bridge NSString *)cfString) == wkNSStringClass())
return toAPI(static_cast<API::String*>(&[(WKNSString *)[(NSString *)cfString retain] _apiObject]));
#endif
String string(cfString);
#if WK_API_ENABLED
// Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
- if (object_getClass((NSURL *)cfURL) == wkNSURLClass())
+ if (object_getClass((__bridge NSURL *)cfURL) == wkNSURLClass())
return toAPI(static_cast<API::URL*>(&[(WKNSURL *)[(NSURL *)cfURL retain] _apiObject]));
#endif
auto certificate = adoptCF(SecCertificateCreateWithData(nullptr, cfData.get()));
if (!certificate)
return;
- [certificates addObject:(id)certificate.get()];
+ [certificates addObject:(__bridge id)certificate.get()];
}
}
{
auto archiver = secureArchiver();
[archiver encodeObject:results.get() forKey:@"dataDetectorResults"];
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
}
bool DataDetectionResult::decode(IPC::Decoder& decoder, DataDetectionResult& result)
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
@try {
result.results = [unarchiver decodeObjectOfClasses:[NSSet setWithArray:@[ [NSArray class], getDDScannerResultClass()] ] forKey:@"dataDetectorResults"];
} @catch (NSException *exception) {
- (NSObject *)_web_createTarget
{
- return [(NSError *)static_cast<API::Error*>(&self._apiObject)->platformError().cfError() copy];
+ return [(
__bridge NSError *)static_cast<API::Error*>(&self._apiObject)->platformError().cfError() copy];
}
#pragma mark NSCopying protocol implementation
- (String)_web_originalDataAsWTFString
{
CString originalData;
- getURLBytes((CFURLRef)self, originalData);
+ getURLBytes((__bridge CFURLRef)self, originalData);
return String::fromUTF8(originalData);
}
ChildProcessInitializationParameters parameters;
if (priorityBoostMessage)
- parameters.priorityBoostMessage = adoptOSObject(xpc_retain(priorityBoostMessage));
+ parameters.priorityBoostMessage = priorityBoostMessage;
if (!delegate.getConnectionIdentifier(parameters.connectionIdentifier))
exit(EXIT_FAILURE);
typedef void (*InitializerFunction)(xpc_connection_t, xpc_object_t, xpc_object_t);
InitializerFunction initializerFunctionPtr = reinterpret_cast<InitializerFunction>(CFBundleGetFunctionPointerForName(webKitBundle, entryPointFunctionName));
if (!initializerFunctionPtr) {
- NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (NSString *)entryPointFunctionName);
+ NSLog(@"Unable to find entry point in WebKit.framework with name: %@", (__bridge NSString *)entryPointFunctionName);
exit(EXIT_FAILURE);
}
break;
case LayerContentsType::CAMachPort:
ASSERT(m_frontBufferSendRight);
- layer.contents = (id)adoptCF(CAMachPortCreate(m_frontBufferSendRight.leakSendRight())).get();
+ layer.contents = (__bridge id)adoptCF(CAMachPortCreate(m_frontBufferSendRight.leakSendRight())).get();
break;
}
return;
#endif
ASSERT(!acceleratesDrawing());
- layer.contents = (id)m_frontBuffer.bitmap->makeCGImageCopy().get();
+ layer.contents = (__bridge id)m_frontBuffer.bitmap->makeCGImageCopy().get();
}
RetainPtr<CGContextRef> RemoteLayerBackingStore::takeFrontContextPendingFlush()
if (urlBytes.isEmpty()) {
// CFURL can't hold an empty URL, unlike NSURL.
// FIXME: This discards base URL, which seems incorrect.
- result = reinterpret_cast<CFURLRef>([NSURL URLWithString:@""]);
+ result = (__bridge CFURLRef)[NSURL URLWithString:@""];
return true;
}
#endif
#else
auto fontClass = [UIFont class];
#endif
- return ![value isKindOfClass:fontClass] || isSerializableFont(reinterpret_cast<CTFontRef>(value));
+ return ![value isKindOfClass:fontClass] || isSerializableFont((__bridge CTFontRef)value);
}
static inline RetainPtr<NSDictionary> filterUnserializableValues(NSDictionary *dictionary)
void encode(Encoder& encoder, NSNumber *number)
{
- encode(encoder, (CFNumberRef)number);
+ encode(encoder, (__bridge CFNumberRef)number);
}
bool decode(Decoder& decoder, RetainPtr<NSNumber>& result)
void encode(Encoder& encoder, NSString *string)
{
- encode(encoder, (CFStringRef)string);
+ encode(encoder, (__bridge CFStringRef)string);
}
bool decode(Decoder& decoder, RetainPtr<NSString>& result)
void encode(Encoder& encoder, NSDate *date)
{
- encode(encoder, (CFDateRef)date);
+ encode(encoder, (__bridge CFDateRef)date);
}
bool decode(Decoder& decoder, RetainPtr<NSDate>& result)
void encode(Encoder& encoder, NSData *data)
{
- encode(encoder, (CFDataRef)data);
+ encode(encoder, (__bridge CFDataRef)data);
}
bool decode(Decoder& decoder, RetainPtr<NSData>& result)
void encode(Encoder& encoder, NSURL *URL)
{
- encode(encoder, (CFURLRef)URL);
+ encode(encoder, (__bridge CFURLRef)URL);
}
bool decode(Decoder& decoder, RetainPtr<NSURL>& result)
[userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]] || [value isKindOfClass:[NSNumber class]])
- CFDictionarySetValue(filteredUserInfo.get(), key, value);
+ CFDictionarySetValue(filteredUserInfo.get(), (__bridge CFTypeRef)key, (__bridge CFTypeRef)value);
}];
if (NSArray *clientIdentityAndCertificates = [userInfo objectForKey:@"NSErrorClientCertificateChainKey"]) {
ASSERT([clientIdentityAndCertificates isKindOfClass:[NSArray class]]);
ASSERT(^{
for (id object in clientIdentityAndCertificates) {
- if (CFGetTypeID(object) != SecIdentityGetTypeID() && CFGetTypeID(object) != SecCertificateGetTypeID())
+ if (CFGetTypeID((__bridge CFTypeRef)object) != SecIdentityGetTypeID() && CFGetTypeID((__bridge CFTypeRef)object) != SecCertificateGetTypeID())
return false;
}
return true;
// Turn SecIdentity members into SecCertificate to strip out private key information.
id clientCertificates = [NSMutableArray arrayWithCapacity:clientIdentityAndCertificates.count];
for (id object in clientIdentityAndCertificates) {
- if (CFGetTypeID(object) != SecIdentityGetTypeID()) {
+ if (CFGetTypeID((__bridge CFTypeRef)object) != SecIdentityGetTypeID()) {
[clientCertificates addObject:object];
continue;
}
clientCertificates = nil;
break;
}
- [clientCertificates addObject:(id)certificate];
+ [clientCertificates addObject:(__bridge id)certificate];
}
- CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorClientCertificateChainKey", clientCertificates);
+ CFDictionarySetValue(filteredUserInfo.get(), CFSTR("NSErrorClientCertificateChainKey"), (__bridge CFTypeRef)clientCertificates);
}
id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
if (!peerCertificateChain) {
- if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey]) {
+ if (SecTrustRef peerTrust = (__bridge SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey]) {
CFIndex count = SecTrustGetCertificateCount(peerTrust);
peerCertificateChain = [NSMutableArray arrayWithCapacity:count];
for (CFIndex i = 0; i < count; ++i)
- [peerCertificateChain addObject:(id)SecTrustGetCertificateAtIndex(peerTrust, i)];
+ [peerCertificateChain addObject:(__bridge id)SecTrustGetCertificateAtIndex(peerTrust, i)];
}
}
ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
if (peerCertificateChain)
- CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorPeerCertificateChainKey", peerCertificateChain);
+ CFDictionarySetValue(filteredUserInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (__bridge CFTypeRef)peerCertificateChain);
#if HAVE(SEC_TRUST_SERIALIZATION)
- if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey])
- CFDictionarySetValue(filteredUserInfo.get(), NSURLErrorFailingURLPeerTrustErrorKey, peerTrust);
+ if (SecTrustRef peerTrust = (__bridge SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey])
+ CFDictionarySetValue(filteredUserInfo.get(), (__bridge CFStringRef)NSURLErrorFailingURLPeerTrustErrorKey, peerTrust);
#endif
IPC::encode(encoder, filteredUserInfo.get());
return false;
auto mutableUserInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
- CFDictionarySetValue(mutableUserInfo.get(), NSUnderlyingErrorKey, underlyingNSError.get());
+ CFDictionarySetValue(mutableUserInfo.get(), (__bridge CFStringRef)NSUnderlyingErrorKey, (__bridge CFTypeRef)underlyingNSError.get());
userInfo = WTFMove(mutableUserInfo);
}
- nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(NSDictionary *)userInfo.get()]);
+ nsError = adoptNS([[NSError alloc] initWithDomain:domain code:code userInfo:(__bridge NSDictionary *)userInfo.get()]);
return true;
}
{
auto archiver = secureArchiver();
[archiver encodeObject:space.nsSpace() forKey:@"protectionSpace"];
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
}
bool ArgumentCoder<ProtectionSpace>::decodePlatformData(Decoder& decoder, ProtectionSpace& space)
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
@try {
if (RetainPtr<NSURLProtectionSpace> nsSpace = [unarchiver decodeObjectOfClass:[NSURLProtectionSpace class] forKey:@"protectionSpace"])
space = ProtectionSpace(nsSpace.get());
if (NSArray *certificates = nsCredential.certificates) {
encoder << true;
- IPC::encode(encoder, reinterpret_cast<CFArrayRef>(certificates));
+ IPC::encode(encoder, (__bridge CFArrayRef)certificates);
} else
encoder << false;
auto archiver = secureArchiver();
[archiver encodeObject:nsCredential forKey:@"credential"];
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFArrayRef)archiver.get().encodedData);
}
bool ArgumentCoder<Credential>::decodePlatformData(Decoder& decoder, Credential& credential)
if (!decoder.decode(persistence))
return false;
- credential = Credential(adoptNS([[NSURLCredential alloc] initWithIdentity:identity.get() certificates:(NSArray *)certificates.get() persistence:(NSURLCredentialPersistence)persistence]).get());
+ credential = Credential(adoptNS([[NSURLCredential alloc] initWithIdentity:identity.get() certificates:(__bridge NSArray *)certificates.get() persistence:(NSURLCredentialPersistence)persistence]).get());
return true;
}
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
@try {
if (RetainPtr<NSURLCredential> nsCredential = [unarchiver decodeObjectOfClass:[NSURLCredential class] forKey:@"credential"])
credential = Credential(nsCredential.get());
}
#if ENABLE(CONTENT_FILTERING)
+
void ArgumentCoder<ContentFilterUnblockHandler>::encode(Encoder& encoder, const ContentFilterUnblockHandler& contentFilterUnblockHandler)
{
auto archiver = secureArchiver();
contentFilterUnblockHandler.encode(archiver.get());
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
}
bool ArgumentCoder<ContentFilterUnblockHandler>::decode(Decoder& decoder, ContentFilterUnblockHandler& contentFilterUnblockHandler)
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
if (!ContentFilterUnblockHandler::decode(unarchiver.get(), contentFilterUnblockHandler))
return false;
[unarchiver finishDecoding];
return true;
}
+
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
if ([getAVOutputContextClass() conformsToProtocol:@protocol(NSSecureCoding)])
[archiver encodeObject:target.avOutputContext() forKey:deviceContextKey()];
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
}
bool ArgumentCoder<MediaPlaybackTargetContext>::decodePlatformData(Decoder& decoder, MediaPlaybackTargetContext& target)
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
AVOutputContext *context = nil;
@try {
[unarchiver finishDecoding];
return true;
}
+
#endif
} // namespace IPC
auto archiver = secureArchiver();
[archiver encodeObject:detectedDataActionContext.get() forKey:@"actionContext"];
- IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+ IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
encoder << detectedDataBoundingBox;
encoder << detectedDataOriginatingPageOverlay;
if (!IPC::decode(decoder, data))
return false;
- auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+ auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
@try {
hitTestResultData.detectedDataActionContext = [unarchiver decodeObjectOfClass:getDDActionContextClass() forKey:@"actionContext"];
} @catch (NSException *exception) {
#if PLATFORM(IOS)
return false;
#else
- return WebCore::PluginBlacklist::isPluginUpdateAvailable((NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifierRef)).get());
+ return WebCore::PluginBlacklist::isPluginUpdateAvailable((__bridge NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifierRef)).get());
#endif
}
- (NSArray *)certificateChain
{
if (WebFrameProxy* mainFrame = _page->mainFrame())
- return mainFrame->certificateInfo() ? (NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
+ return mainFrame->certificateInfo() ? (__bridge NSArray *)mainFrame->certificateInfo()->certificateInfo().certificateChain() : nil;
return nil;
}
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProvisionalLoad:)])
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:)])
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)])
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidCommitLoad:)])
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishLoad:)])
if (!WKFrameIsMainFrame(frame))
return;
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)])
static bool canAuthenticateAgainstProtectionSpaceInFrame(WKPageRef page, WKFrameRef frame, WKProtectionSpaceRef protectionSpace, const void *clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:canAuthenticateAgainstProtectionSpace:)])
static void didReceiveAuthenticationChallengeInFrame(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:didReceiveAuthenticationChallenge:)])
static void didStartProgress(WKPageRef page, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProgress:)])
static void didChangeProgress(WKPageRef page, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextController:estimatedProgressChangedTo:)])
static void didFinishProgress(WKPageRef page, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishProgress:)])
static void didChangeBackForwardList(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if (![loadDelegate respondsToSelector:@selector(browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:)])
static void processDidCrash(WKPageRef page, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto loadDelegate = browsingContext->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(browsingContextControllerWebProcessDidCrash:)])
memset(&loaderClient, 0, sizeof(loaderClient));
loaderClient.base.version = 4;
- loaderClient.base.clientInfo = browsingContext;
+ loaderClient.base.clientInfo = (__bridge void*)browsingContext;
loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
loaderClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
loaderClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
memset(&policyClient, 0, sizeof(policyClient));
policyClient.base.version = 2;
- policyClient.base.clientInfo = browsingContext;
+ policyClient.base.clientInfo = (__bridge void*)browsingContext;
policyClient.decidePolicyForNavigationAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef originalRequest, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNavigationAction:decisionHandler:)]) {
policyClient.decidePolicyForNewWindowAction = [](WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForNewWindowAction:decisionHandler:)]) {
policyClient.decidePolicyForResponse = [](WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
{
- WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+ auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
auto policyDelegate = browsingContext->_policyDelegate.get();
if ([policyDelegate respondsToSelector:@selector(browsingContextController:decidePolicyForResponseAction:decisionHandler:)]) {
for (id entry in array) {
if ([entry isKindOfClass:[NSString class]])
- strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((CFStringRef)entry))));
+ strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((__bridge CFStringRef)entry))));
}
return toAPI(&API::Array::create(WTFMove(strings)).leakRef());
if (!source)
CRASH();
- WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((CFStringRef)source));
- WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
+ WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((__bridge CFStringRef)source));
+ WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)baseURL));
auto wkWhitelist = createWKArray(whitelist);
auto wkBlacklist = createWKArray(blacklist);
WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
if (!source)
CRASH();
- WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((CFStringRef)source));
- WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
+ WKRetainPtr<WKStringRef> wkSource = adoptWK(WKStringCreateWithCFString((__bridge CFStringRef)source));
+ WKRetainPtr<WKURLRef> wkBaseURL = adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)baseURL));
auto wkWhitelist = createWKArray(whitelist);
auto wkBlacklist = createWKArray(blacklist);
WKUserContentInjectedFrames injectedFrames = mainFrameOnly ? kWKInjectInTopFrameOnly : kWKInjectInAllFrames;
static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
{
- WKConnection *connection = (WKConnection *)clientInfo;
+ auto connection = (__bridge WKConnection *)clientInfo;
auto delegate = connection->_delegate.get();
if ([delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
static void didClose(WKConnectionRef, const void* clientInfo)
{
- WKConnection *connection = (WKConnection *)clientInfo;
+ auto connection = (__bridge WKConnection *)clientInfo;
auto delegate = connection->_delegate.get();
if ([delegate respondsToSelector:@selector(connectionDidClose:)])
memset(&client, 0, sizeof(client));
client.base.version = 0;
- client.base.clientInfo = wrapper;
+ client.base.clientInfo = (__bridge void*)wrapper;
client.didReceiveMessage = didReceiveMessage;
client.didClose = didClose;
static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
{
- WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
+ auto processGroup = (__bridge WKProcessGroup *)clientInfo;
auto delegate = processGroup->_delegate.get();
if ([delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
{
- WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
+ auto processGroup = (__bridge WKProcessGroup *)clientInfo;
auto delegate = processGroup->_delegate.get();
if ([delegate respondsToSelector:@selector(processGroupWillCreateConnectionToWebProcessPlugIn:)]) {
memset(&injectedBundleClient, 0, sizeof(injectedBundleClient));
injectedBundleClient.base.version = 1;
- injectedBundleClient.base.clientInfo = processGroup;
+ injectedBundleClient.base.clientInfo = (__bridge void*)processGroup;
injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
WKContextSetInjectedBundleClient(contextRef, &injectedBundleClient.base);
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
{
- _processPool->allowSpecificHTTPSCertificateForHost(WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).ptr(), host);
+ _processPool->allowSpecificHTTPSCertificateForHost(WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
}
#if PLATFORM(IOS)
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
{
- _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).ptr(), host);
+ _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((__bridge CFArrayRef)certificateChain)).ptr(), host);
}
- (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme
- (void)_setProxyConfiguration:(NSDictionary *)configuration
{
- _websiteDataStore->websiteDataStore().setProxyConfiguration((CFDictionaryRef)configuration);
+ _websiteDataStore->websiteDataStore().setProxyConfiguration((__bridge CFDictionaryRef)configuration);
}
- (NSDictionary *)_proxyConfiguration
{
- return (NSDictionary *)_websiteDataStore->websiteDataStore().proxyConfiguration();
+ return (__bridge NSDictionary *)_websiteDataStore->websiteDataStore().proxyConfiguration();
}
- (void)_resourceLoadStatisticsSetShouldSubmitTelemetry:(BOOL)value
_waitingForSnapshot = NO;
self.layer.sublayers = @[];
self.layer.contentsGravity = kCAGravityResizeAspectFill;
- self.layer.contents = (id)image;
+ self.layer.contents = (__bridge id)image;
// If we got a scale change while snapshotting, we'll take another snapshot once the first one returns.
if (_snapshotWasDeferred) {
#if WK_API_ENABLED
+#include "WKContentRuleListInternal.h"
#include "WebCompiledContentRuleList.h"
#include <WebCore/ContentExtensionCompiler.h>
#include <WebCore/ContentExtensionError.h>
#endif
ASSERT(certificateInfo.type() == CertificateInfo::Type::CertificateChain);
CFIndex chainCount = CFArrayGetCount(certificateInfo.certificateChain());
- return chainCount > 1 ? [(NSArray *)certificateInfo.certificateChain() subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
+ return chainCount > 1 ? [(__bridge NSArray *)certificateInfo.certificateChain() subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
}
WebCredential::WebCredential(WebCertificateInfo* certificateInfo)
String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
{
- RetainPtr<NSString> cachePath = adoptNS((NSString *)_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
+ NSString *cachePath = CFBridgingRelease(_CFURLCacheCopyCacheDirectory([[NSURLCache sharedURLCache] _CFURLCache]));
if (!cachePath)
cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
static dispatch_once_t once;
dispatch_once(&once, ^{
NSString *identifier = [NSString stringWithFormat:@"%@.PrivateBrowsing", [[NSBundle mainBundle] bundleIdentifier]];
-
- session = createPrivateStorageSession((CFStringRef)identifier);
+ session = createPrivateStorageSession((__bridge CFStringRef)identifier);
});
return session;
// FIXME: need to support NSRTFDPboardType
if ([type isEqual:WebCore::legacyTIFFPasteboardType()] && m_promisedImage) {
- [pasteboard setData:(NSData *)m_promisedImage->tiffRepresentation() forType:WebCore::legacyTIFFPasteboardType()];
+ [pasteboard setData:(__bridge NSData *)m_promisedImage->tiffRepresentation() forType:WebCore::legacyTIFFPasteboardType()];
m_promisedImage = nullptr;
}
}
Vector<String> pluginPaths;
RetainPtr<CFStringRef> directoryCFString = directory.createCFString();
- NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(NSString *)directoryCFString.get() error:nil];
+ NSArray *filenames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:(__bridge NSString *)directoryCFString.get() error:nil];
for (NSString *filename in filenames)
- pluginPaths.append([(NSString *)directoryCFString.get() stringByAppendingPathComponent:filename]);
+ pluginPaths.append([(__bridge NSString *)directoryCFString.get() stringByAppendingPathComponent:filename]);
return pluginPaths;
}
static void recursivelyMapIOSurfaceBackingStore(CALayer *layer)
{
if (layer.contents && CFGetTypeID(layer.contents) == CAMachPortGetTypeID()) {
- MachSendRight port = MachSendRight::create(CAMachPortGetPort((CAMachPortRef)layer.contents));
+ MachSendRight port = MachSendRight::create(CAMachPortGetPort((__bridge CAMachPortRef)layer.contents));
auto surface = WebCore::IOSurface::createFromSendRight(WTFMove(port), sRGBColorSpaceRef());
layer.contents = surface ? surface->asLayerContents() : nil;
}
m_swipeShadowLayer = adoptNS([[CAGradientLayer alloc] init]);
[m_swipeShadowLayer setName:@"Gesture Swipe Shadow Layer"];
[m_swipeShadowLayer setColors:@[
- (id)adoptCF(CGColorCreateGenericGray(0, 1.)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.99)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.98)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.95)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.92)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.82)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.71)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.46)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.35)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.25)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.17)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.11)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.07)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.04)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.01)).get(),
- (id)adoptCF(CGColorCreateGenericGray(0, 0.)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 1.)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.99)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.98)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.95)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.92)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.82)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.71)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.46)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.35)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.25)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.17)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.11)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.07)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.04)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.01)).get(),
+ (__bridge id)adoptCF(CGColorCreateGenericGray(0, 0.)).get(),
]];
[m_swipeShadowLayer setLocations:@[
@0,
[_webViewPlaceholder setAction:@selector(cancelOperation:)];
}
[_webViewPlaceholder setTarget:nil];
- [_webViewPlaceholder setContents:(id)webViewContents.get()];
+ [_webViewPlaceholder setContents:(__bridge id)webViewContents.get()];
self.savedConstraints = _webView.superview.constraints;
[self _replaceView:_webView with:_webViewPlaceholder.get()];
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
NSFont *font;
if (data.fontInfo.fontAttributeDictionary) {
- NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:(NSDictionary *)data.fontInfo.fontAttributeDictionary.get()];
+ NSFontDescriptor *fontDescriptor = [NSFontDescriptor fontDescriptorWithFontAttributes:(__bridge NSDictionary *)data.fontInfo.fontAttributeDictionary.get()];
font = [NSFont fontWithDescriptor:fontDescriptor size:((pageScaleFactor != 1) ? [fontDescriptor pointSize] * pageScaleFactor : 0)];
} else
font = [NSFont menuFontOfSize:0];
static void didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
{
- WKWebProcessPlugInController *plugInController = (WKWebProcessPlugInController *)clientInfo;
+ auto plugInController = (__bridge WKWebProcessPlugInController *)clientInfo;
id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:didCreateBrowserContextController:)])
static void willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
{
- WKWebProcessPlugInController *plugInController = (WKWebProcessPlugInController *)clientInfo;
+ auto plugInController = (__bridge WKWebProcessPlugInController *)clientInfo;
id <WKWebProcessPlugIn> principalClassInstance = plugInController->_principalClassInstance.get();
if ([principalClassInstance respondsToSelector:@selector(webProcessPlugIn:willDestroyBrowserContextController:)])
memset(&bundleClient, 0, sizeof(bundleClient));
bundleClient.base.version = 1;
- bundleClient.base.clientInfo = plugInController;
+ bundleClient.base.clientInfo = (__bridge void*)plugInController;
bundleClient.didCreatePage = didCreatePage;
bundleClient.willDestroyPage = willDestroyPage;
static void didStartProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userDataRef, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didStartProvisionalLoadForFrame:)])
static void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef *userDataRef, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didReceiveServerRedirectForProvisionalLoadForFrame:)])
static void didFinishLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishLoadForFrame:)])
static void globalObjectIsAvailableForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleScriptWorldRef scriptWorld, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:globalObjectIsAvailableForFrame:inScriptWorld:)])
static void didRemoveFrameFromHierarchy(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didRemoveFrameFromHierarchy:)])
static void didCommitLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didCommitLoadForFrame:)])
static void didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFinishDocumentLoadForFrame:)])
static void didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailProvisionalLoadWithErrorForFrame:error:)])
static void didFailLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef wkError, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFailLoadWithErrorForFrame:error:)])
static void didSameDocumentNavigationForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didSameDocumentNavigation:forFrame:)])
static void didLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didLayoutForFrame:)])
static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:renderingProgressDidChange:)])
static void didFirstVisuallyNonEmptyLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didFirstVisuallyNonEmptyLayoutForFrame:)])
static void didHandleOnloadEventsForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:didHandleOnloadEventsForFrame:)])
static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:userAgentForURL:)]) {
if (!string)
return nullptr;
- WKStringRef wkString = WKStringCreateWithCFString((CFStringRef)string);
- return wkString;
+ return WKStringCreateWithCFString((__bridge CFStringRef)string);
}
return nullptr;
memset(&client, 0, sizeof(client));
client.base.version = 8;
- client.base.clientInfo = contextController;
+ client.base.clientInfo = (__bridge void*)contextController;
client.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
client.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
client.didCommitLoadForFrame = didCommitLoadForFrame;
static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:)]) {
static void didInitiateLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, bool pageIsProvisionallyLoading, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didInitiateLoadForResource:request:pageIsProvisionallyLoading:)]) {
static void didFinishLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFinishLoadForResource:)]) {
static void didFailLoadForResource(WKBundlePageRef, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKErrorRef error, const void* clientInfo)
{
- WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+ auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:didFailLoadForResource:error:)]) {
memset(&client, 0, sizeof(client));
client.base.version = 1;
- client.base.clientInfo = contextController;
+ client.base.clientInfo = (__bridge void*) contextController;
client.willSendRequestForFrame = willSendRequestForFrame;
client.didInitiateLoadForResource = didInitiateLoadForResource;
client.didFinishLoadForResource = didFinishLoadForResource;
return false;
}
- m_platformBundle = [[NSBundle alloc] initWithURL:(NSURL *)bundleURL.get()];
+ m_platformBundle = [[NSBundle alloc] initWithURL:(__bridge NSURL *)bundleURL.get()];
if (!m_platformBundle) {
WTFLogAlways("InjectedBundle::load failed - Could not create the bundle.\n");
return false;
if (!convertPoint(m_currentMouseEvent->data.mouse.pluginX, m_currentMouseEvent->data.mouse.pluginY, NPCoordinateSpacePlugin, screenX, screenY, NPCoordinateSpaceScreen))
ASSERT_NOT_REACHED();
- _NSPopUpCarbonMenu3(reinterpret_cast<NSMenu *>(npMenu), nil, nil, NSMakePoint(screenX, screenY), -1, nil, 0, nil, NSPopUpMenuTypeContext, nil);
+ _NSPopUpCarbonMenu3((__bridge NSMenu *)npMenu, nil, nil, NSMakePoint(screenX, screenY), -1, nil, 0, nil, NSPopUpMenuTypeContext, nil);
return NPERR_NO_ERROR;
}
WebCore::IntSize pdfDocumentSize() const { return m_pdfDocumentSize; }
void setPDFDocumentSize(WebCore::IntSize size) { m_pdfDocumentSize = size; }
+#ifdef __OBJC__
NSData *liveData() const;
- NSData *rawData() const { return (NSData *)m_data.get(); }
+ NSData *rawData() const { return (__bridge NSData *)m_data.get(); }
+#endif
WebFrame* webFrame() const { return m_frame; }
SharedMemory::Handle archiveHandle;
size_t archiveSize = 0;
if (data) {
- RefPtr<SharedBuffer> archiveBuffer = SharedBuffer::create((NSData *)data.get());
+ auto archiveBuffer = SharedBuffer::create((__bridge NSData *)data.get());
RefPtr<SharedMemory> archiveSharedMemoryBuffer = SharedMemory::allocate(archiveBuffer->size());
if (!archiveSharedMemoryBuffer)
return;
CFTypeRef PlatformCALayerRemoteCustom::contents() const
{
- return [m_platformLayer contents];
+ return (__bridge CFTypeRef)[m_platformLayer contents];
}
void PlatformCALayerRemoteCustom::setContents(CFTypeRef contents)
{
- [m_platformLayer setContents:(id)contents];
+ [m_platformLayer setContents:(__bridge id)contents];
}
void PlatformCALayerRemoteCustom::setNeedsDisplayInRect(const FloatRect& rect)
RetainPtr<CABasicAnimation> shadowPositionAnimation = transientZoomSnapAnimationForKeyPath("position");
[shadowPositionAnimation setToValue:[NSValue valueWithPoint:shadowLayerPositionForFrame(frameView, constrainedOrigin)]];
RetainPtr<CABasicAnimation> shadowPathAnimation = transientZoomSnapAnimationForKeyPath("shadowPath");
- [shadowPathAnimation setToValue:(id)shadowPath.get()];
+ [shadowPathAnimation setToValue:(__bridge id)shadowPath.get()];
[shadowCALayer addAnimation:shadowBoundsAnimation.get() forKey:@"transientZoomCommitShadowBounds"];
[shadowCALayer addAnimation:shadowPositionAnimation.get() forKey:@"transientZoomCommitShadowPosition"];
layer->setSize(image->size());
layer->setPosition(FloatPoint(0, -image->size().height()));
- layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
+ layer->platformLayer().contents = (__bridge id)image->bitmap().makeCGImageCopy().get();
}
void WebPage::setBottomOverhangImage(WebImage* image)
return;
layer->setSize(image->size());
- layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
+ layer->platformLayer().contents = (__bridge id)image->bitmap().makeCGImageCopy().get();
}
void WebPage::updateHeaderAndFooterLayersForDeviceScaleChange(float scaleFactor)
git://git.webkit.org / WebKit-https.git / commitdiff