Changeset 232520 in webkit

Timestamp:

Jun 5, 2018, 1:58:14 PM (7 years ago)

Author:

Darin Adler

Message:

[Cocoa] More preparation for ARC, focusing on WebKit and smart pointers
​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.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/BlockPtr.h (modified) (5 diffs)
• WTF/wtf/OSObjectPtr.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)
• WebKit/NetworkProcess/mac/NetworkProcessMac.mm (modified) (2 diffs)
• WebKit/Platform/IPC/mac/ConnectionMac.mm (modified) (2 diffs)
• WebKit/Platform/mac/StringUtilities.mm (modified) (2 diffs)
• WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm (modified) (1 diff)
• WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (modified) (1 diff)
• WebKit/Shared/API/c/cf/WKStringCF.mm (modified) (1 diff)
• WebKit/Shared/API/c/cf/WKURLCF.mm (modified) (1 diff)
• WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm (modified) (1 diff)
• WebKit/Shared/Cocoa/DataDetectionResult.mm (modified) (2 diffs)
• WebKit/Shared/Cocoa/WKNSError.mm (modified) (1 diff)
• WebKit/Shared/Cocoa/WKNSURLExtras.mm (modified) (1 diff)
• WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (modified) (1 diff)
• WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (modified) (1 diff)
• WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm (modified) (2 diffs)
• WebKit/Shared/cf/ArgumentCodersCF.cpp (modified) (1 diff)
• WebKit/Shared/mac/ArgumentCodersMac.mm (modified) (6 diffs)
• WebKit/Shared/mac/WebCoreArgumentCodersMac.mm (modified) (17 diffs)
• WebKit/Shared/mac/WebHitTestResultData.mm (modified) (2 diffs)
• WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (18 diffs)
• WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm (modified) (3 diffs)
• WebKit/UIProcess/API/Cocoa/WKConnection.mm (modified) (3 diffs)
• WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm (modified) (4 diffs)
• WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm (modified) (1 diff)
• WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm (modified) (1 diff)
• WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (2 diffs)
• WebKit/UIProcess/Cocoa/WebViewImpl.mm (modified) (1 diff)
• WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (1 diff)
• WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (modified) (1 diff)
• WebKit/UIProcess/mac/ViewGestureControllerMac.mm (modified) (1 diff)
• WebKit/UIProcess/mac/WKFullScreenWindowController.mm (modified) (1 diff)
• WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm (modified) (1 diff)
• WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (modified) (3 diffs)
• WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (modified) (22 diffs)
• WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (modified) (1 diff)
• WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (1 diff)
• WebKit/WebProcess/Plugins/PDF/PDFPlugin.h (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/mac/WebPageMac.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WTF/wtf/BlockPtr.h

@@ -98 +98 @@
         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;
@@ -110 +114 @@
 
     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
     {
     }
@@ -126 +138 @@
     ~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;
     }
@@ -143 +161 @@
         ASSERT(this != &other);
 
+#if !defined(__OBJC__) || !__has_feature(objc_arc)
         Block_release(m_block);
+#endif
         m_block = std::exchange(other.m_block, nullptr);
 
@@ -175 +195 @@
 using WTF::BlockPtr;
 using WTF::makeBlockPtr;
-

trunk/Source/WTF/wtf/OSObjectPtr.h

@@ -86 +86 @@
     }
 
+    OSObjectPtr(T ptr)
+        : m_ptr(ptr)
+    {
+        if (m_ptr)
+            retainOSObject(m_ptr);
+    }
+
     OSObjectPtr& operator=(const OSObjectPtr& other)
     {
@@ -106 +113 @@
         m_ptr = nullptr;
 
+        return *this;
+    }
+
+    OSObjectPtr& operator=(T other)
+    {
+        OSObjectPtr ptr = other;
+        swap(ptr);
         return *this;
     }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -678 +678 @@
 
     if (auto& data = globalSourceApplicationAuditTokenData())
-        configuration._sourceApplicationAuditTokenData = (NSData *)data.get();
+        configuration._sourceApplicationAuditTokenData = (__bridge NSData *)data.get();
 
     auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();

trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm

@@ -98 +98 @@
 
     if ([proxySettings count] > 0)
-        _CFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
+        _CFNetworkSetOverrideSystemProxySettings((__bridge CFDictionaryRef)proxySettings);
 }
 
@@ -116 +116 @@
 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];
 }
 

trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm

@@ -269 +269 @@
 
     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();
     }
@@ -502 +502 @@
     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();

trunk/Source/WebKit/Platform/mac/StringUtilities.mm

@@ -63 +63 @@
     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;
@@ -71 +71 @@
         phoneNumberString = CFPhoneNumberCopyUnformattedRepresentation(phoneNumber.get());
 
-    return [(NSString *)phoneNumberString autorelease];
+    return CFBridgingRelease(phoneNumberString);
 }
 

trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm

@@ -163 +163 @@
 {
     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);
     }

trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm

@@ -148 +148 @@
             [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"))

trunk/Source/WebKit/Shared/API/c/cf/WKStringCF.mm

@@ -51 +51 @@
 #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

trunk/Source/WebKit/Shared/API/c/cf/WKURLCF.mm

@@ -55 +55 @@
 #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

trunk/Source/WebKit/Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm

@@ -84 +84 @@
                 if (!certificate)
                     return;
-                [certificates addObject:(id)certificate.get()];
+                [certificates addObject:(__bridge id)certificate.get()];
             }
         }

trunk/Source/WebKit/Shared/Cocoa/DataDetectionResult.mm

@@ -44 +44 @@
     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);
 }
 
@@ -53 +53 @@
         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"];

trunk/Source/WebKit/Shared/Cocoa/WKNSError.mm

@@ -35 +35 @@
 - (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];
 }
 

trunk/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm

@@ -51 +51 @@
 {
     CString originalData;
-    getURLBytes((CFURLRef)self, originalData);
+    getURLBytes((__bridge CFURLRef)self, originalData);
     return String::fromUTF8(originalData);
 }

trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h

@@ -84 +84 @@
     ChildProcessInitializationParameters parameters;
     if (priorityBoostMessage)
-        parameters.priorityBoostMessage = adoptOSObject(xpc_retain(priorityBoostMessage));
+        parameters.priorityBoostMessage = priorityBoostMessage;
 
     if (!delegate.getConnectionIdentifier(parameters.connectionIdentifier))

trunk/Source/WebKit/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm

@@ -60 +60 @@
                 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);
                 }

trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm

@@ -412 +412 @@
         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;
         }
@@ -420 +420 @@
 
     ASSERT(!acceleratesDrawing());
-    layer.contents = (id)m_frontBuffer.bitmap->makeCGImageCopy().get();
+    layer.contents = (__bridge id)m_frontBuffer.bitmap->makeCGImageCopy().get();
 }
 

trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp

@@ -625 +625 @@
         // 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;
     }

trunk/Source/WebKit/Shared/mac/ArgumentCodersMac.mm

@@ -244 +244 @@
     auto fontClass = [UIFont class];
 #endif
-    return ![value isKindOfClass:fontClass] || isSerializableFont(reinterpret_cast<CTFontRef>(value));
+    return ![value isKindOfClass:fontClass] || isSerializableFont((__bridge CTFontRef)value);
 }
 
@@ -426 +426 @@
 void encode(Encoder& encoder, NSNumber *number)
 {
-    encode(encoder, (CFNumberRef)number);
+    encode(encoder, (__bridge CFNumberRef)number);
 }
 
@@ -441 +441 @@
 void encode(Encoder& encoder, NSString *string)
 {
-    encode(encoder, (CFStringRef)string);
+    encode(encoder, (__bridge CFStringRef)string);
 }
 
@@ -493 +493 @@
 void encode(Encoder& encoder, NSDate *date)
 {
-    encode(encoder, (CFDateRef)date);
+    encode(encoder, (__bridge CFDateRef)date);
 }
 
@@ -508 +508 @@
 void encode(Encoder& encoder, NSData *data)
 {
-    encode(encoder, (CFDataRef)data);
+    encode(encoder, (__bridge CFDataRef)data);
 }
 
@@ -523 +523 @@
 void encode(Encoder& encoder, NSURL *URL)
 {
-    encode(encoder, (CFURLRef)URL);
+    encode(encoder, (__bridge CFURLRef)URL);
 }
 

trunk/Source/WebKit/Shared/mac/WebCoreArgumentCodersMac.mm

@@ -322 +322 @@
     [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);
     }];
 
@@ -329 +329 @@
         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;
             }
@@ -338 +338 @@
         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;
@@ -352 +352 @@
                 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
 
@@ -414 +414 @@
 
         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;
 }
@@ -436 +436 @@
     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);
 }
 
@@ -445 +445 @@
         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"])
@@ -468 +468 @@
         if (NSArray *certificates = nsCredential.certificates) {
             encoder << true;
-            IPC::encode(encoder, reinterpret_cast<CFArrayRef>(certificates));
+            IPC::encode(encoder, (__bridge CFArrayRef)certificates);
         } else
             encoder << false;
@@ -480 +480 @@
     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);
 }
 
@@ -508 +508 @@
             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;
     }
@@ -516 +516 @@
         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"])
@@ -575 +575 @@
 
 #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);
 }
 
@@ -588 +589 @@
         return false;
 
-    auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+    auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
     if (!ContentFilterUnblockHandler::decode(unarchiver.get(), contentFilterUnblockHandler))
         return false;
@@ -595 +596 @@
     return true;
 }
+
 #endif
 
@@ -612 +614 @@
         [archiver encodeObject:target.avOutputContext() forKey:deviceContextKey()];
 
-    IPC::encode(encoder, reinterpret_cast<CFDataRef>(archiver.get().encodedData));
+    IPC::encode(encoder, (__bridge CFDataRef)archiver.get().encodedData);
 }
 
@@ -624 +626 @@
         return false;
 
-    auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+    auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
 
     AVOutputContext *context = nil;
@@ -639 +641 @@
     return true;
 }
+
 #endif
 

trunk/Source/WebKit/Shared/mac/WebHitTestResultData.mm

@@ -49 +49 @@
     [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;
@@ -74 +74 @@
         return false;
 
-    auto unarchiver = secureUnarchiverFromData((NSData *)data.get());
+    auto unarchiver = secureUnarchiverFromData((__bridge NSData *)data.get());
     @try {
         hitTestResultData.detectedDataActionContext = [unarchiver decodeObjectOfClass:getDDActionContextClass() forKey:@"actionContext"];

trunk/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm

@@ -50 +50 @@
     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
 }

trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -297 +297 @@
 {
     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;
@@ -329 +329 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -341 +341 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -353 +353 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -365 +365 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -377 +377 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -389 +389 @@
         return;
 
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -398 +398 @@
 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();
 
@@ -409 +409 @@
 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();
 
@@ -418 +418 @@
 static void didStartProgress(WKPageRef page, const void* clientInfo)
 {
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -427 +427 @@
 static void didChangeProgress(WKPageRef page, const void* clientInfo)
 {
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -436 +436 @@
 static void didFinishProgress(WKPageRef page, const void* clientInfo)
 {
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -445 +445 @@
 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();
 
@@ -458 +458 @@
 static void processDidCrash(WKPageRef page, const void* clientInfo)
 {
-    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    auto browsingContext = (__bridge WKBrowsingContextController *)clientInfo;
     auto loadDelegate = browsingContext->_loadDelegate.get();
 
@@ -471 +471 @@
 
     loaderClient.base.version = 4;
-    loaderClient.base.clientInfo = browsingContext;
+    loaderClient.base.clientInfo = (__bridge void*)browsingContext;
     loaderClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
     loaderClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
@@ -521 +521 @@
 
     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();
 
@@ -550 +550 @@
     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();
 
@@ -570 +570 @@
     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();
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm

@@ -125 +125 @@
     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))));
     }
 
@@ -136 +136 @@
         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);
@@ -155 +155 @@
         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);

trunk/Source/WebKit/UIProcess/API/Cocoa/WKConnection.mm

@@ -52 +52 @@
 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();
 
@@ -64 +64 @@
 static void didClose(WKConnectionRef, const void* clientInfo)
 {
-    WKConnection *connection = (WKConnection *)clientInfo;
+    auto connection = (__bridge WKConnection *)clientInfo;
     auto delegate = connection->_delegate.get();
 
@@ -77 +77 @@
 
     client.base.version = 0;
-    client.base.clientInfo = wrapper;
+    client.base.clientInfo = (__bridge void*)wrapper;
     client.didReceiveMessage = didReceiveMessage;
     client.didClose = didClose;

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessGroup.mm

@@ -67 +67 @@
 static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
 {
-    WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
+    auto processGroup = (__bridge WKProcessGroup *)clientInfo;
     auto delegate = processGroup->_delegate.get();
 
@@ -88 +88 @@
 static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
 {
-    WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
+    auto processGroup = (__bridge WKProcessGroup *)clientInfo;
     auto delegate = processGroup->_delegate.get();
 
@@ -106 +106 @@
 
     injectedBundleClient.base.version = 1;
-    injectedBundleClient.base.clientInfo = processGroup;
+    injectedBundleClient.base.clientInfo = (__bridge void*)processGroup;
     injectedBundleClient.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
 
@@ -224 +224 @@
 - (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);
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -180 +180 @@
 - (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);
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -303 +303 @@
 - (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();
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKThumbnailView.mm

@@ -198 +198 @@
     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.

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm

@@ -29 +29 @@
 #if WK_API_ENABLED
 
+#include "WKContentRuleListInternal.h"
 #include "WebCompiledContentRuleList.h"
 #include <WebCore/ContentExtensionCompiler.h>

trunk/Source/WebKit/UIProcess/Authentication/mac/WebCredentialMac.mm

@@ -68 +68 @@
     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;
 }
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -481 +481 @@
 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";
@@ -591 +591 @@
     dispatch_once(&once, ^{
         NSString *identifier = [NSString stringWithFormat:@"%@.PrivateBrowsing", [[NSBundle mainBundle] bundleIdentifier]];
-
-        session = createPrivateStorageSession((CFStringRef)identifier);
+        session = createPrivateStorageSession((__bridge CFStringRef)identifier);
     });
 

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

@@ -3896 +3896 @@
 
     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;
     }

trunk/Source/WebKit/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -61 +61 @@
 
     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;

trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm

@@ -295 +295 @@
 {
     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;

trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm

@@ -616 +616 @@
         [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:@[

trunk/Source/WebKit/UIProcess/mac/WKFullScreenWindowController.mm

@@ -250 +250 @@
     }
     [_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()];

trunk/Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm

@@ -103 +103 @@
     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

trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm

@@ -55 +55 @@
 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();
 
@@ -64 +64 @@
 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();
 
@@ -77 +77 @@
 
     bundleClient.base.version = 1;
-    bundleClient.base.clientInfo = plugInController;
+    bundleClient.base.clientInfo = (__bridge void*)plugInController;
     bundleClient.didCreatePage = didCreatePage;
     bundleClient.willDestroyPage = willDestroyPage;

trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

@@ -85 +85 @@
 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();
 
@@ -94 +94 @@
 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();
 
@@ -103 +103 @@
 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();
 
@@ -112 +112 @@
 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();
 
@@ -121 +121 @@
 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();
 
@@ -130 +130 @@
 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();
 
@@ -139 +139 @@
 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();
 
@@ -148 +148 @@
 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();
 
@@ -157 +157 @@
 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();
 
@@ -166 +166 @@
 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();
 
@@ -180 +180 @@
 static void didLayoutForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
 {
-    WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+    auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
     auto loadDelegate = pluginContextController->_loadDelegate.get();
 
@@ -189 +189 @@
 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();
 
@@ -198 +198 @@
 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();
 
@@ -207 +207 @@
 static void didHandleOnloadEventsForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo)
 {
-    WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+    auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
     auto loadDelegate = pluginContextController->_loadDelegate.get();
 
@@ -216 +216 @@
 static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const void* clientInfo)
 {
-    WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
+    auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
     auto loadDelegate = pluginContextController->_loadDelegate.get();
     
@@ -225 +225 @@
             return nullptr;
 
-        WKStringRef wkString = WKStringCreateWithCFString((CFStringRef)string);
-        return wkString;
+        return WKStringCreateWithCFString((__bridge CFStringRef)string);
     }
     
@@ -238 +237 @@
 
     client.base.version = 8;
-    client.base.clientInfo = contextController;
+    client.base.clientInfo = (__bridge void*)contextController;
     client.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
     client.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
@@ -261 +260 @@
 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();
 
@@ -286 +285 @@
 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();
 
@@ -299 +298 @@
 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();
 
@@ -311 +310 @@
 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();
 
@@ -328 +327 @@
 
     client.base.version = 1;
-    client.base.clientInfo = contextController;
+    client.base.clientInfo = (__bridge void*) contextController;
     client.willSendRequestForFrame = willSendRequestForFrame;
     client.didInitiateLoadForResource = didInitiateLoadForResource;

trunk/Source/WebKit/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm

@@ -74 +74 @@
     }
 
-    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");

trunk/Source/WebKit/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -168 +168 @@
         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;
 }

trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.h

@@ -250 +250 @@
     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; }

trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

@@ -155 +155 @@
     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)

trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCALayerRemoteCustom.mm

@@ -138 +138 @@
 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];
 }
 

trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -846 +846 @@
         [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"];

trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

@@ -735 +735 @@
     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();
 }
 
@@ -749 +749 @@
 
     layer->setSize(image->size());
-    layer->platformLayer().contents = (id)image->bitmap().makeCGImageCopy().get();
+    layer->platformLayer().contents = (__bridge id)image->bitmap().makeCGImageCopy().get();
 }