<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194378] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194378">194378</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-12-22 15:52:00 -0800 (Tue, 22 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
https://bugs.webkit.org/show_bug.cgi?id=152463
Reviewed by Alexey Proskuryakov.
Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
declared in CFNetworkSPI.h.
Source/WebCore:
Also removed some unused declarations and renamed ResourceResponseMac.mm to ResourceResponseCocoa.mm.
* PlatformMac.cmake:
* WebCore.xcodeproj/project.pbxproj:
* platform/ios/WebCoreSystemInterfaceIOS.mm:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
* platform/network/NetworkStorageSession.h:
* platform/network/cf/CredentialStorageCFNet.cpp:
(WebCore::copyCredentialFromProtectionSpace):
(WebCore::CredentialStorage::getFromPersistentStorage):
* platform/network/cf/NetworkStorageSessionCFNet.cpp:
(WebCore::NetworkStorageSession::cookieStorage):
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::createCFURLConnection):
* platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegate::createResourceRequest):
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::setStorageSession):
(WebCore::initializeMaximumHTTPConnectionCountPerHost):
(WebCore::initializeHTTPConnectionSettingsOnStartup):
* platform/network/cf/ResourceRequestCFNet.h:
(WebCore::toResourceLoadPriority):
(WebCore::toPlatformRequestPriority):
* platform/network/cf/ResourceResponse.h:
* platform/network/cf/ResourceResponseCFNet.cpp:
(WebCore::ResourceResponse::platformCertificateInfo):
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
(WebCore::ResourceRequest::doUpdatePlatformRequest):
* platform/network/cocoa/ResourceResponseCocoa.mm: Renamed from Source/WebCore/platform/network/mac/ResourceResponseMac.mm.
(WebCore::ResourceResponse::platformCertificateInfo):
(WebCore::copyNSURLResponseStatusLine):
(WebCore::ResourceResponse::platformLazyInit):
* platform/network/ios/QuickLook.h:
* platform/network/ios/QuickLook.mm:
* platform/network/ios/WebCoreURLResponseIOS.mm:
(WebCore::adjustMIMETypeIfNecessary):
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::createNSURLConnection):
* platform/network/mac/WebCoreURLResponse.h:
* platform/network/mac/WebCoreURLResponse.mm:
(WebCore::adjustMIMETypeIfNecessary):
* platform/spi/cf/CFNetworkConnectionCacheSPI.h:
* platform/spi/cf/CFNetworkSPI.h:
Source/WebKit/mac:
* Plugins/Hosted/HostedNetscapePluginStream.mm:
(WebKit::HostedNetscapePluginStream::didReceiveResponse):
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::didReceiveResponse):
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Deleted.
* WebView/WebPreferences.mm:
(+[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:]):
Source/WebKit2:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::initializeNetworkSettings):
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::overrideSystemProxies):
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
(WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts):
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm">trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStorageSessionh">trunk/Source/WebCore/platform/network/NetworkStorageSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp">trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegateWithOperationQueuecpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNeth">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseh">trunk/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaCredentialCocoah">trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookh">trunk/Source/WebCore/platform/network/ios/QuickLook.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookmm">trunk/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosWebCoreURLResponseIOSmm">trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreURLResponseh">trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm">trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkConnectionCacheSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedHostedNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm">trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/ChangeLog 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-12-22 Andy Estes <aestes@apple.com>
+
+ [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
+ https://bugs.webkit.org/show_bug.cgi?id=152463
+
+ Reviewed by Alexey Proskuryakov.
+
+ Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
+ declared in CFNetworkSPI.h.
+
+ Also removed some unused declarations and renamed ResourceResponseMac.mm to ResourceResponseCocoa.mm.
+
+ * PlatformMac.cmake:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+ * platform/network/NetworkStorageSession.h:
+ * platform/network/cf/CredentialStorageCFNet.cpp:
+ (WebCore::copyCredentialFromProtectionSpace):
+ (WebCore::CredentialStorage::getFromPersistentStorage):
+ * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+ (WebCore::NetworkStorageSession::cookieStorage):
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::createCFURLConnection):
+ * platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::ResourceHandleCFURLConnectionDelegate::createResourceRequest):
+ * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
+ (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::setStorageSession):
+ (WebCore::initializeMaximumHTTPConnectionCountPerHost):
+ (WebCore::initializeHTTPConnectionSettingsOnStartup):
+ * platform/network/cf/ResourceRequestCFNet.h:
+ (WebCore::toResourceLoadPriority):
+ (WebCore::toPlatformRequestPriority):
+ * platform/network/cf/ResourceResponse.h:
+ * platform/network/cf/ResourceResponseCFNet.cpp:
+ (WebCore::ResourceResponse::platformCertificateInfo):
+ * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
+ * platform/network/cocoa/ResourceRequestCocoa.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+ (WebCore::ResourceRequest::doUpdatePlatformRequest):
+ * platform/network/cocoa/ResourceResponseCocoa.mm: Renamed from Source/WebCore/platform/network/mac/ResourceResponseMac.mm.
+ (WebCore::ResourceResponse::platformCertificateInfo):
+ (WebCore::copyNSURLResponseStatusLine):
+ (WebCore::ResourceResponse::platformLazyInit):
+ * platform/network/ios/QuickLook.h:
+ * platform/network/ios/QuickLook.mm:
+ * platform/network/ios/WebCoreURLResponseIOS.mm:
+ (WebCore::adjustMIMETypeIfNecessary):
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::createNSURLConnection):
+ * platform/network/mac/WebCoreURLResponse.h:
+ * platform/network/mac/WebCoreURLResponse.mm:
+ (WebCore::adjustMIMETypeIfNecessary):
+ * platform/spi/cf/CFNetworkConnectionCacheSPI.h:
+ * platform/spi/cf/CFNetworkSPI.h:
+
</ins><span class="cx"> 2015-12-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Everything broken in GTK+ 3.19
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -520,6 +520,7 @@
</span><span class="cx"> platform/network/cocoa/CredentialCocoa.mm
</span><span class="cx"> platform/network/cocoa/ProtectionSpaceCocoa.mm
</span><span class="cx"> platform/network/cocoa/ResourceRequestCocoa.mm
</span><ins>+ platform/network/cocoa/ResourceResponseCocoa.mm
</ins><span class="cx">
</span><span class="cx"> platform/network/mac/AuthenticationMac.mm
</span><span class="cx"> platform/network/mac/BlobDataFileReferenceMac.mm
</span><span class="lines">@@ -532,7 +533,6 @@
</span><span class="cx"> platform/network/mac/ResourceErrorMac.mm
</span><span class="cx"> platform/network/mac/ResourceHandleMac.mm
</span><span class="cx"> platform/network/mac/ResourceRequestMac.mm
</span><del>- platform/network/mac/ResourceResponseMac.mm
</del><span class="cx"> platform/network/mac/SynchronousLoaderClient.mm
</span><span class="cx"> platform/network/mac/UTIUtilities.mm
</span><span class="cx"> platform/network/mac/WebCoreResourceHandleAsDelegate.mm
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1976,7 +1976,6 @@
</span><span class="cx"> 514C76500CE9234E007EF3CD /* ResourceErrorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */; };
</span><span class="cx"> 514C76510CE9234E007EF3CD /* ResourceHandleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */; };
</span><span class="cx"> 514C76530CE9234E007EF3CD /* ResourceRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */; };
</span><del>- 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */; };
</del><span class="cx"> 514C766D0CE923A1007EF3CD /* CredentialBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C76580CE923A1007EF3CD /* CredentialBase.cpp */; };
</span><span class="cx"> 514C766E0CE923A1007EF3CD /* Credential.h in Headers */ = {isa = PBXBuildFile; fileRef = 514C76590CE923A1007EF3CD /* Credential.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 514C766F0CE923A1007EF3CD /* FormData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 514C765A0CE923A1007EF3CD /* FormData.cpp */; };
</span><span class="lines">@@ -4012,6 +4011,7 @@
</span><span class="cx"> A104F24414C71F7A009E2C23 /* CachedSVGDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A10BB5851484E3A700B2E87A /* RenderSVGRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5831484E3A700B2E87A /* RenderSVGRect.h */; };
</span><span class="cx"> A10BB58B1484E3B300B2E87A /* RenderSVGShape.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5891484E3B300B2E87A /* RenderSVGShape.h */; };
</span><ins>+ A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A10DBF4718F92317000D70C6 /* QuickLookHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A10DC76A14747BAB005E2471 /* StyleGridData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A10DC76814747BAB005E2471 /* StyleGridData.cpp */; };
</span><span class="cx"> A10DC76B14747BAB005E2471 /* StyleGridData.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DC76914747BAB005E2471 /* StyleGridData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -4095,6 +4095,7 @@
</span><span class="cx"> A1ED778C1BE3294000DC1791 /* Device.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1ED778A1BE3293F00DC1791 /* Device.cpp */; };
</span><span class="cx"> A1ED778D1BE3294000DC1791 /* Device.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778B1BE3294000DC1791 /* Device.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A1ED778F1BE4291800DC1791 /* UIKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = A1ED778E1BE4291800DC1791 /* UIKitSPI.h */; };
</span><ins>+ A1F78D0C1C25424C00245446 /* ResourceResponseCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */; };
</ins><span class="cx"> A2B9217316C5CC420041DCD9 /* IntRectExtent.h in Headers */ = {isa = PBXBuildFile; fileRef = A2B9217216C5CC420041DCD9 /* IntRectExtent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A31C4E4D16E02AA6002F7957 /* OESTextureHalfFloat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */; };
</span><span class="cx"> A31C4E4F16E02AB4002F7957 /* OESTextureHalfFloat.h in Headers */ = {isa = PBXBuildFile; fileRef = A31C4E4E16E02AB4002F7957 /* OESTextureHalfFloat.h */; };
</span><span class="lines">@@ -6123,7 +6124,6 @@
</span><span class="cx"> CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */; };
</span><span class="cx"> CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE7B2DB61586ABAD0098B3FA /* TextAlternativeWithRange.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */; };
</span><del>- CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> CE95208A1811B475007A5392 /* WebSafeIncrementalSweeperIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C2C4CB1D161A131200D214DA /* WebSafeIncrementalSweeperIOS.h */; };
</span><span class="cx"> CEC337AD1A46071F009B8523 /* ServersSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC337AC1A46071F009B8523 /* ServersSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CEC337AF1A46086D009B8523 /* GraphicsServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9399,7 +9399,6 @@
</span><span class="cx"> 514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceErrorMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
</span><del>- 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseMac.mm; sourceTree = "<group>"; };
</del><span class="cx"> 514C76580CE923A1007EF3CD /* CredentialBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 514C76590CE923A1007EF3CD /* Credential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Credential.h; sourceTree = "<group>"; };
</span><span class="cx"> 514C765A0CE923A1007EF3CD /* FormData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11575,6 +11574,7 @@
</span><span class="cx"> A10BB5831484E3A700B2E87A /* RenderSVGRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGRect.h; sourceTree = "<group>"; };
</span><span class="cx"> A10BB5881484E3B300B2E87A /* RenderSVGShape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGShape.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A10BB5891484E3B300B2E87A /* RenderSVGShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGShape.h; sourceTree = "<group>"; };
</span><ins>+ A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> A10DBF4618F92317000D70C6 /* QuickLookHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuickLookHandleClient.h; sourceTree = "<group>"; };
</span><span class="cx"> A10DC76814747BAB005E2471 /* StyleGridData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleGridData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A10DC76914747BAB005E2471 /* StyleGridData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleGridData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -11654,6 +11654,7 @@
</span><span class="cx"> A1ED778A1BE3293F00DC1791 /* Device.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Device.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A1ED778B1BE3294000DC1791 /* Device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Device.h; sourceTree = "<group>"; };
</span><span class="cx"> A1ED778E1BE4291800DC1791 /* UIKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
</span><ins>+ A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceResponseCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> A208E222A56A0C7575F2A72E /* RenderMathMLMenclose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMathMLMenclose.h; sourceTree = "<group>"; };
</span><span class="cx"> A2B9217216C5CC420041DCD9 /* IntRectExtent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntRectExtent.h; sourceTree = "<group>"; };
</span><span class="cx"> A31C4E4C16E02AA6002F7957 /* OESTextureHalfFloat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OESTextureHalfFloat.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13997,7 +13998,6 @@
</span><span class="cx"> CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AlternativeTextUIController.mm; sourceTree = "<group>"; };
</span><span class="cx"> CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextAlternativeWithRange.h; sourceTree = "<group>"; };
</span><span class="cx"> CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextAlternativeWithRange.mm; sourceTree = "<group>"; };
</span><del>- CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
</del><span class="cx"> CEC337AC1A46071F009B8523 /* ServersSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServersSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CEC337AE1A46086D009B8523 /* GraphicsServicesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsServicesSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CECADFC2153778FF00E37068 /* DictationAlternative.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationAlternative.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -17225,7 +17225,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> E10A39E11AE84E7100A29AE3 /* CFBundleSPI.h */,
</span><span class="cx"> 65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
</span><del>- CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
</del><ins>+ A10D7FEB1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h */,
</ins><span class="cx"> CE12525A1A1C018200864480 /* CFNetworkSPI.h */,
</span><span class="cx"> 4449A4041A964B0000B64AD5 /* CoreMediaSPI.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -17490,7 +17490,6 @@
</span><span class="cx"> 514C76460CE9234E007EF3CD /* ResourceErrorMac.mm */,
</span><span class="cx"> 514C76470CE9234E007EF3CD /* ResourceHandleMac.mm */,
</span><span class="cx"> 514C76490CE9234E007EF3CD /* ResourceRequestMac.mm */,
</span><del>- 514C764B0CE9234E007EF3CD /* ResourceResponseMac.mm */,
</del><span class="cx"> E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */,
</span><span class="cx"> 1FAFBF1615A5FA5200083A20 /* UTIUtilities.h */,
</span><span class="cx"> 1FAFBF1715A5FA5200083A20 /* UTIUtilities.mm */,
</span><span class="lines">@@ -17865,6 +17864,7 @@
</span><span class="cx"> 372ADA37197F47B900FC501E /* ProtectionSpaceCocoa.h */,
</span><span class="cx"> 372ADA39197F687600FC501E /* ProtectionSpaceCocoa.mm */,
</span><span class="cx"> 7E7DE1FC195CEF260035363B /* ResourceRequestCocoa.mm */,
</span><ins>+ A1F78D0B1C25422C00245446 /* ResourceResponseCocoa.mm */,
</ins><span class="cx"> );
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -24668,6 +24668,7 @@
</span><span class="cx"> AB23A32809BBA7D00067CC53 /* BeforeTextInsertedEvent.h in Headers */,
</span><span class="cx"> 85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */,
</span><span class="cx"> B2C3DA240D006C1D00EF6F26 /* BidiContext.h in Headers */,
</span><ins>+ A10D7FEC1C2676D100C6C115 /* CFNetworkConnectionCacheSPI.h in Headers */,
</ins><span class="cx"> B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */,
</span><span class="cx"> BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
</span><span class="cx"> A8C402931348B2220063F1E5 /* BidiRunList.h in Headers */,
</span><span class="lines">@@ -24749,7 +24750,6 @@
</span><span class="cx"> CDE8B5F11A69778B00B4B66A /* CDMSessionClearKey.h in Headers */,
</span><span class="cx"> 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
</span><span class="cx"> E10A39E21AE84E7100A29AE3 /* CFBundleSPI.h in Headers */,
</span><del>- CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */,
</del><span class="cx"> CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */,
</span><span class="cx"> E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
</span><span class="cx"> FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
</span><span class="lines">@@ -29064,6 +29064,7 @@
</span><span class="cx"> 850657010AAB4763002D15C0 /* DOMStyleSheet.mm in Sources */,
</span><span class="cx"> 850657030AAB4763002D15C0 /* DOMStyleSheetList.mm in Sources */,
</span><span class="cx"> 85ACA99D0A9B575900671E90 /* DOMText.mm in Sources */,
</span><ins>+ A1F78D0C1C25424C00245446 /* ResourceResponseCocoa.mm in Sources */,
</ins><span class="cx"> 933A14AA0B7D1D0900A53FFD /* DOMTextEvent.mm in Sources */,
</span><span class="cx"> 188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources */,
</span><span class="cx"> 76FC2B0B12370DA0006A991A /* DOMTokenList.cpp in Sources */,
</span><span class="lines">@@ -30785,7 +30786,6 @@
</span><span class="cx"> 514C76530CE9234E007EF3CD /* ResourceRequestMac.mm in Sources */,
</span><span class="cx"> 514C767E0CE923A1007EF3CD /* ResourceResponseBase.cpp in Sources */,
</span><span class="cx"> 7EE6847112D26E3800E79415 /* ResourceResponseCFNet.cpp in Sources */,
</span><del>- 514C76550CE9234F007EF3CD /* ResourceResponseMac.mm in Sources */,
</del><span class="cx"> ADBAD6EE1BCDD95500381325 /* ResourceUsageOverlay.cpp in Sources */,
</span><span class="cx"> ADFE2B551BD5F61200DAB457 /* ResourceUsageOverlayCocoa.mm in Sources */,
</span><span class="cx"> FD3160A412B026F700C1A359 /* Reverb.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreSystemInterfaceIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -27,54 +27,27 @@
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
</span><del>-WEBCORE_EXPORT BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
</del><span class="cx"> WEBCORE_EXPORT CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
</span><span class="cx"> WEBCORE_EXPORT void (*wkClearGlyphVector)(void* glyphs);
</span><span class="cx"> WEBCORE_EXPORT OSStatus (*wkConvertCharToGlyphs)(void* styleGroup, const UniChar*, unsigned numCharacters, void* glyphs);
</span><del>-WEBCORE_EXPORT NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
</del><span class="cx"> WEBCORE_EXPORT bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><del>-WEBCORE_EXPORT NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
-WEBCORE_EXPORT void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
</del><span class="cx"> WEBCORE_EXPORT id (*wkCreateNSURLConnectionDelegateProxy)(void);
</span><del>-WEBCORE_EXPORT unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
-WEBCORE_EXPORT int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
-WEBCORE_EXPORT void (*wkSetHTTPRequestMaximumPriority)(int priority);
-WEBCORE_EXPORT void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
-WEBCORE_EXPORT void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
-WEBCORE_EXPORT void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
</del><span class="cx"> WEBCORE_EXPORT void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
</span><span class="cx"> WEBCORE_EXPORT CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetLayerContentsScale)(CALayer *);
</span><del>-WEBCORE_EXPORT void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
-WEBCORE_EXPORT CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
</del><span class="cx"> WEBCORE_EXPORT CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-WEBCORE_EXPORT CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
-WEBCORE_EXPORT WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
-WEBCORE_EXPORT void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
-WEBCORE_EXPORT void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
-#endif
-
</del><span class="cx"> WEBCORE_EXPORT CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
</span><span class="cx"> WEBCORE_EXPORT NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
</span><del>-WEBCORE_EXPORT CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
</del><span class="cx"> WEBCORE_EXPORT unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><del>-WEBCORE_EXPORT void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
</del><span class="cx"> WEBCORE_EXPORT NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> WEBCORE_EXPORT NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</span><span class="cx"> WEBCORE_EXPORT void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> WEBCORE_EXPORT void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> WEBCORE_EXPORT void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span><span class="cx">
</span><del>-WEBCORE_EXPORT CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
-WEBCORE_EXPORT CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
-WEBCORE_EXPORT CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
-WEBCORE_EXPORT CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
-WEBCORE_EXPORT void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
-
</del><span class="cx"> WEBCORE_EXPORT void(*wkDestroyRenderingResources)(void);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool (*wkCaptionAppearanceHasUserPreferences)(void);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx"> extern void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *);
</span><span class="cx"> extern void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef, void (^block)(CGRect rect));
</span><span class="cx">
</span><del>-extern BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
</del><span class="cx"> typedef enum {
</span><span class="cx"> wkPatternTilingNoDistortion,
</span><span class="cx"> wkPatternTilingConstantSpacingMinimalDistortion,
</span><span class="lines">@@ -131,27 +130,17 @@
</span><span class="cx"> extern bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
</span><span class="cx"> #endif
</span><span class="cx"> extern CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
</span><del>-extern NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
-extern CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
</del><span class="cx"> extern CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-extern void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
</del><span class="cx"> extern void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
</span><span class="cx"> extern void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int);
</span><span class="cx"> extern bool (*wkDrawFocusRingAtTime)(CGContextRef, NSTimeInterval time);
</span><span class="cx"> extern bool (*wkDrawCellFocusRingWithFrameAtTime)(NSCell *cell, NSRect cellFrame, NSView *controlView, NSTimeInterval time);
</span><del>-#endif
-#if !PLATFORM(IOS)
</del><span class="cx"> extern void (*wkDrawMediaSliderTrack)(CGContextRef context, CGRect rect, float timeLoaded, float currentTime,
</span><span class="cx"> float duration, unsigned state);
</span><span class="cx"> extern void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
</span><span class="cx"> extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
</span><del>-#endif
-#if !PLATFORM(IOS)
</del><span class="cx"> extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
</span><del>-#endif
-extern NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
-#if !PLATFORM(IOS)
</del><span class="cx"> extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
</span><span class="cx"> extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
</span><span class="cx"> extern UInt8 (*wkGetNSEventKeyChar)(NSEvent *);
</span><span class="lines">@@ -178,28 +167,18 @@
</span><span class="cx"> extern void (*wkQTMovieDisableComponent)(uint32_t[5]);
</span><span class="cx"> extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
</span><span class="cx"> extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
</span><del>-extern float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
</del><span class="cx"> extern int (*wkQTMovieGetType)(QTMovie*);
</span><span class="cx"> extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
</span><span class="cx"> extern NSURL *(*wkQTMovieResolvedURL)(QTMovie*);
</span><span class="cx"> extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
</span><span class="cx"> extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
</span><del>-extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
</del><span class="cx"> extern NSArray *(*wkQTGetSitesInMediaDownloadCache)();
</span><span class="cx"> extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
</span><span class="cx"> extern void (*wkQTClearMediaDownloadCache)();
</span><del>-extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
</del><span class="cx"> extern void (*wkSetCookieStoragePrivateBrowsingEnabled)(BOOL);
</span><span class="cx"> extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
</span><span class="cx"> #endif
</span><del>-extern void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
</del><span class="cx"> extern bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><del>-extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
-extern int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
-extern void (*wkSetHTTPRequestMaximumPriority)(int maximumPriority);
-extern void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
-extern void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
-extern void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
</del><span class="cx"> extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx"> extern void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span class="cx"> extern CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="lines">@@ -241,34 +220,15 @@
</span><span class="cx"> extern NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
</span><span class="cx">
</span><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><del>-extern CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
</del><span class="cx"> extern unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><del>-extern void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
</del><span class="cx"> extern NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> extern NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</span><span class="cx"> extern void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> extern void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span><span class="cx"> extern void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx">
</span><del>-extern CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
-extern CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
-extern CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
-extern CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
-extern void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
-
-#if USE(CFNETWORK)
-extern CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
-extern WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
-extern void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
-extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
-#endif
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> extern void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
</span><del>-#endif
-
-extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
-
-#if !PLATFORM(IOS)
</del><span class="cx"> extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span><span class="cx"> extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -32,13 +32,9 @@
</span><span class="cx">
</span><span class="cx"> void (*wkAdvanceDefaultButtonPulseAnimation)(NSButtonCell *);
</span><span class="cx"> void (*wkCALayerEnumerateRectsBeingDrawnWithBlock)(CALayer *, CGContextRef context, void (^block)(CGRect rect));
</span><del>-BOOL (*wkCGContextGetShouldSmoothFonts)(CGContextRef);
</del><span class="cx"> bool (*wkCGContextDrawsWithCorrectShadowOffsets)(CGContextRef);
</span><span class="cx"> CGPatternRef (*wkCGPatternCreateWithImageAndTransform)(CGImageRef, CGAffineTransform, int);
</span><del>-NSString* (*wkCopyNSURLResponseStatusLine)(NSURLResponse*);
-CFArrayRef (*wkCopyNSURLResponseCertificateChain)(NSURLResponse*);
</del><span class="cx"> CFStringEncoding (*wkGetWebDefaultCFStringEncoding)(void);
</span><del>-void (*wkDrawCapsLockIndicator)(CGContextRef, CGRect);
</del><span class="cx"> void (*wkDrawBezeledTextArea)(NSRect, BOOL enabled);
</span><span class="cx"> void (*wkDrawFocusRing)(CGContextRef, CGColorRef, int);
</span><span class="cx"> bool (*wkDrawFocusRingAtTime)(CGContextRef, NSTimeInterval);
</span><span class="lines">@@ -54,7 +50,6 @@
</span><span class="cx"> void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
</span><span class="cx"> CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
</span><span class="cx"> NSTimeInterval (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
</span><del>-NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
</del><span class="cx"> BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
</span><span class="cx"> void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
</span><span class="cx"> UInt8 (*wkGetNSEventKeyChar)(NSEvent *);
</span><span class="lines">@@ -63,38 +58,21 @@
</span><span class="cx"> void (*wkQTMovieDisableComponent)(uint32_t[5]);
</span><span class="cx"> float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
</span><span class="cx"> NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
</span><del>-float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
</del><span class="cx"> int (*wkQTMovieGetType)(QTMovie*);
</span><span class="cx"> BOOL (*wkQTMovieHasClosedCaptions)(QTMovie*);
</span><span class="cx"> NSURL *(*wkQTMovieResolvedURL)(QTMovie*);
</span><span class="cx"> void (*wkQTMovieSetShowClosedCaptions)(QTMovie*, BOOL);
</span><span class="cx"> void (*wkQTMovieSelectPreferredAlternates)(QTMovie*);
</span><del>-void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
</del><span class="cx"> NSArray *(*wkQTGetSitesInMediaDownloadCache)();
</span><span class="cx"> void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
</span><span class="cx"> void (*wkQTClearMediaDownloadCache)();
</span><span class="cx">
</span><del>-void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*, BOOL);
</del><span class="cx"> void (*wkSetDragImage)(NSImage*, NSPoint offset);
</span><span class="cx"> bool (*wkCGContextIsPDFContext)(CGContextRef);
</span><del>-void (*wkSetNSURLRequestShouldContentSniff)(NSMutableURLRequest *, BOOL);
-unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
-int (*wkGetHTTPRequestPriority)(CFURLRequestRef);
-void (*wkSetHTTPRequestMaximumPriority)(int priority);
-void (*wkSetHTTPRequestPriority)(CFURLRequestRef, int priority);
-void (*wkSetHTTPRequestMinimumFastLanePriority)(int priority);
-void (*wkHTTPRequestEnablePipelining)(CFURLRequestRef);
</del><span class="cx"> void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx"> void (*wkSetCONNECTProxyAuthorizationForStream)(CFReadStreamRef, CFStringRef proxyAuthorizationString);
</span><span class="cx"> CFHTTPMessageRef (*wkCopyCONNECTProxyResponse)(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-CFHTTPCookieStorageRef (*wkGetDefaultHTTPCookieStorage)();
-WKCFURLCredentialRef (*wkCopyCredentialFromCFPersistentStorage)(CFURLProtectionSpaceRef protectionSpace);
-void (*wkSetCFURLRequestShouldContentSniff)(CFMutableURLRequestRef, bool);
-void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
-#endif
-
</del><span class="cx"> void* wkGetHyphenationLocationBeforeIndex;
</span><span class="cx">
</span><span class="cx"> bool (*wkExecutableWasLinkedOnOrBeforeSnowLeopard)(void);
</span><span class="lines">@@ -119,24 +97,15 @@
</span><span class="cx">
</span><span class="cx"> CFURLStorageSessionRef (*wkCreatePrivateStorageSession)(CFStringRef);
</span><span class="cx"> NSURLRequest* (*wkCopyRequestWithStorageSession)(CFURLStorageSessionRef, NSURLRequest*);
</span><del>-CFHTTPCookieStorageRef (*wkCopyHTTPCookieStorage)(CFURLStorageSessionRef);
</del><span class="cx"> unsigned (*wkGetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef);
</span><del>-void (*wkSetHTTPCookieAcceptPolicy)(CFHTTPCookieStorageRef, unsigned);
</del><span class="cx"> NSArray *(*wkHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> NSArray *(*wkHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSURL *, NSURL *);
</span><span class="cx"> void (*wkSetHTTPCookiesForURL)(CFHTTPCookieStorageRef, NSArray *, NSURL *, NSURL *);
</span><span class="cx"> void (*wkDeleteAllHTTPCookies)(CFHTTPCookieStorageRef);
</span><span class="cx"> void (*wkDeleteHTTPCookie)(CFHTTPCookieStorageRef, NSHTTPCookie *);
</span><span class="cx">
</span><del>-CFStringRef (*wkGetCFURLResponseMIMEType)(CFURLResponseRef);
-CFURLRef (*wkGetCFURLResponseURL)(CFURLResponseRef);
-CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
-CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
-void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
</del><span class="cx"> void (*wkSetMetadataURL)(NSString *urlString, NSString *referrer, NSString *path);
</span><span class="cx">
</span><del>-void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStorageSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStorageSession.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/NetworkStorageSession.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK)
</span><del>-typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
-typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</del><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCredentialStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/CredentialStorageCFNet.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationCF.h"
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "Credential.h"
</span><span class="cx"> #include "ProtectionSpace.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -44,15 +45,21 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+
+static inline CFURLCredentialRef copyCredentialFromProtectionSpace(CFURLProtectionSpaceRef protectionSpace)
+{
+ auto storage = adoptCF(CFURLCredentialStorageCreate(kCFAllocatorDefault));
+ return CFURLCredentialStorageCopyDefaultCredentialForProtectionSpace(storage.get(), protectionSpace);
+}
</ins><span class="cx">
</span><span class="cx"> Credential CredentialStorage::getFromPersistentStorage(const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpace.cfSpace()));
</del><ins>+ auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpace.cfSpace()));
</ins><span class="cx"> return Credential(credentialCF.get());
</span><span class="cx"> #else
</span><del>- RetainPtr<CFURLProtectionSpaceRef> protectionSpaceCF = adoptCF(createCF(protectionSpace));
- RetainPtr<CFURLCredentialRef> credentialCF = adoptCF(wkCopyCredentialFromCFPersistentStorage(protectionSpaceCF.get()));
</del><ins>+ auto protectionSpaceCF = adoptCF(createCF(protectionSpace));
+ auto credentialCF = adoptCF(copyCredentialFromProtectionSpace(protectionSpaceCF.get()));
</ins><span class="cx"> return core(credentialCF.get());
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfNetworkStorageSessionCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx"> RetainPtr<CFHTTPCookieStorageRef> NetworkStorageSession::cookieStorage() const
</span><span class="cx"> {
</span><span class="cx"> if (m_platformSession)
</span><del>- return adoptCF(wkCopyHTTPCookieStorage(m_platformSession.get()));
</del><ins>+ return adoptCF(_CFURLStorageSessionCopyCookieStorage(kCFAllocatorDefault, m_platformSession.get()));
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><del>- return wkGetDefaultHTTPCookieStorage();
</del><ins>+ return _CFHTTPCookieStorageGetDefault(kCFAllocatorDefault);
</ins><span class="cx"> #else
</span><span class="cx"> // When using NSURLConnection, we also use its shared cookie storage.
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -116,6 +116,15 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "CFNet - Destroying job %p (%s)", this, d->m_firstRequest.url().string().utf8().data());
</span><span class="cx"> }
</span><ins>+
+static inline CFStringRef shouldSniffConnectionProperty()
+{
+#if PLATFORM(WIN)
+ return CFSTR("_kCFURLConnectionPropertyShouldSniff");
+#else
+ return _kCFURLConnectionPropertyShouldSniff;
+#endif
+}
</ins><span class="cx">
</span><span class="cx"> void ResourceHandle::createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff, SchedulingBehavior schedulingBehavior, CFDictionaryRef clientProperties)
</span><span class="cx"> {
</span><span class="lines">@@ -147,11 +156,12 @@
</span><span class="cx"> applyBasicAuthorizationHeader(firstRequest(), d->m_initialCredential);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<CFMutableURLRequestRef> request = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, firstRequest().cfURLRequest(UpdateHTTPBody)));
- wkSetRequestStorageSession(d->m_storageSession.get(), request.get());
</del><ins>+ auto request = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, firstRequest().cfURLRequest(UpdateHTTPBody)));
+ if (auto storageSession = d->m_storageSession.get())
+ _CFURLRequestSetStorageSession(request.get(), storageSession);
</ins><span class="cx">
</span><span class="cx"> if (!shouldContentSniff)
</span><del>- wkSetCFURLRequestShouldContentSniff(request.get(), false);
</del><ins>+ _CFURLRequestSetProtocolProperty(request.get(), shouldSniffConnectionProperty(), kCFBooleanFalse);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableDictionaryRef> sslProps;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -158,8 +158,9 @@
</span><span class="cx"> RetainPtr<CFStringRef> lastHTTPMethod = m_handle->lastHTTPMethod().createCFString();
</span><span class="cx"> RetainPtr<CFStringRef> newMethod = adoptCF(CFURLRequestCopyHTTPRequestMethod(cfRequest));
</span><span class="cx"> if (CFStringCompareWithOptions(lastHTTPMethod.get(), newMethod.get(), CFRangeMake(0, CFStringGetLength(lastHTTPMethod.get())), kCFCompareCaseInsensitive)) {
</span><del>- RetainPtr<CFMutableURLRequestRef> mutableRequest = adoptCF(CFURLRequestCreateMutableCopy(0, cfRequest));
- wkSetRequestStorageSession(m_handle->storageSession(), mutableRequest.get());
</del><ins>+ auto mutableRequest = adoptCF(CFURLRequestCreateMutableCopy(kCFAllocatorDefault, cfRequest));
+ if (auto storageSession = m_handle->storageSession())
+ _CFURLRequestSetStorageSession(mutableRequest.get(), storageSession);
</ins><span class="cx"> CFURLRequestSetHTTPRequestMethod(mutableRequest.get(), lastHTTPMethod.get());
</span><span class="cx">
</span><span class="cx"> FormData* body = m_handle->firstRequest().httpBody();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFURLConnectionDelegateWithOperationQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -30,12 +30,12 @@
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationCF.h"
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceHandleClient.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><del>-#include "WebCoreSystemInterface.h"
</del><span class="cx"> #include "WebCoreURLResponse.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
</span><span class="cx">
</span><span class="cx"> // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
</span><del>- CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
</del><ins>+ auto msg = CFURLResponseGetHTTPResponse(cfResponse);
</ins><span class="cx"> int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
</span><span class="cx">
</span><span class="cx"> if (statusCode != 304)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (_CFURLRequestCopyProtocolPropertyForKey(m_handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
</span><del>- wkSetCFURLResponseMIMEType(cfResponse, CFSTR("text/html"));
</del><ins>+ CFURLResponseSetMIMEType(cfResponse, CFSTR("text/html"));
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> ResourceResponse resourceResponse(cfResponse);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceRequestCFNet.h"
</span><span class="cx">
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx">
</span><span class="lines">@@ -39,10 +40,6 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "CFNetworkConnectionCacheSPI.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="lines">@@ -154,13 +151,13 @@
</span><span class="cx"> CFURLRequestSetHTTPRequestMethod(cfRequest, httpMethod().createCFString().get());
</span><span class="cx">
</span><span class="cx"> if (httpPipeliningEnabled())
</span><del>- wkHTTPRequestEnablePipelining(cfRequest);
</del><ins>+ CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
</ins><span class="cx">
</span><span class="cx"> if (resourcePrioritiesEnabled())
</span><del>- wkSetHTTPRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
</del><ins>+ CFURLRequestSetRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(WIN)
</span><del>- wkCFURLRequestAllowAllPostCaching(cfRequest);
</del><ins>+ _CFURLRequestSetProtocolProperty(cfRequest, kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> setHeaderFields(cfRequest, httpHeaderFields());
</span><span class="lines">@@ -261,7 +258,7 @@
</span><span class="cx"> m_allowCookies = CFURLRequestShouldHandleHTTPCookies(m_cfRequest.get());
</span><span class="cx">
</span><span class="cx"> if (resourcePrioritiesEnabled())
</span><del>- m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority(m_cfRequest.get()));
</del><ins>+ m_priority = toResourceLoadPriority(CFURLRequestGetRequestPriority(m_cfRequest.get()));
</ins><span class="cx">
</span><span class="cx"> m_httpHeaderFields.clear();
</span><span class="cx"> if (CFDictionaryRef headers = CFURLRequestCopyAllHTTPHeaderFields(m_cfRequest.get())) {
</span><span class="lines">@@ -316,8 +313,9 @@
</span><span class="cx"> {
</span><span class="cx"> updatePlatformRequest();
</span><span class="cx">
</span><del>- CFMutableURLRequestRef cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
- wkSetRequestStorageSession(storageSession, cfRequest);
</del><ins>+ auto cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
+ if (storageSession)
+ _CFURLRequestSetStorageSession(cfRequest, storageSession);
</ins><span class="cx"> m_cfRequest = adoptCF(cfRequest);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> clearOrUpdateNSURLRequest();
</span><span class="lines">@@ -391,7 +389,8 @@
</span><span class="cx"> static const unsigned preferredConnectionCount = 6;
</span><span class="cx"> static const unsigned unlimitedRequestCount = 10000;
</span><span class="cx">
</span><del>- unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
+ unsigned maximumHTTPConnectionCountPerHost = _CFNetworkHTTPConnectionCacheGetLimit(kHTTPLoadWidth);
</ins><span class="cx">
</span><span class="cx"> Boolean keyExistsAndHasValidFormat = false;
</span><span class="cx"> Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
</span><span class="lines">@@ -402,10 +401,10 @@
</span><span class="cx"> if (!ResourceRequest::resourcePrioritiesEnabled())
</span><span class="cx"> return maximumHTTPConnectionCountPerHost;
</span><span class="cx">
</span><del>- wkSetHTTPRequestMaximumPriority(toPlatformRequestPriority(ResourceLoadPriority::Highest));
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(ResourceLoadPriority::Highest));
</ins><span class="cx"> #if !PLATFORM(WIN)
</span><span class="cx"> // FIXME: <rdar://problem/9375609> Implement minimum fast lane priority setting on Windows
</span><del>- wkSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(ResourceLoadPriority::Medium));
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(ResourceLoadPriority::Medium));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return unlimitedRequestCount;
</span><span class="lines">@@ -420,9 +419,9 @@
</span><span class="cx"> // We can't read settings here as this is called too early for that. All values need to be constants.
</span><span class="cx"> static const unsigned preferredConnectionCount = 6;
</span><span class="cx"> static const unsigned fastLaneConnectionCount = 1;
</span><del>- wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
- wkSetHTTPRequestMaximumPriority(toPlatformRequestPriority(ResourceLoadPriority::Highest));
- wkSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(ResourceLoadPriority::Medium));
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(ResourceLoadPriority::Highest));
+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(ResourceLoadPriority::Medium));
</ins><span class="cx"> _CFNetworkHTTPConnectionCacheSetLimit(kHTTPNumFastLanes, fastLaneConnectionCount);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -26,12 +26,9 @@
</span><span class="cx"> #ifndef ResourceRequestCFNet_h
</span><span class="cx"> #define ResourceRequestCFNet_h
</span><span class="cx">
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-typedef const struct _CFURLRequest* CFURLRequestRef;
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class ResourceRequest;
</span><span class="lines">@@ -41,7 +38,7 @@
</span><span class="cx"> CFURLRequestRef cfURLRequest(const ResourceRequest&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-inline ResourceLoadPriority toResourceLoadPriority(int priority)
</del><ins>+inline ResourceLoadPriority toResourceLoadPriority(CFURLRequestPriority priority)
</ins><span class="cx"> {
</span><span class="cx"> switch (priority) {
</span><span class="cx"> case -1:
</span><span class="lines">@@ -61,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline int toPlatformRequestPriority(ResourceLoadPriority priority)
</del><ins>+inline CFURLRequestPriority toPlatformRequestPriority(ResourceLoadPriority priority)
</ins><span class="cx"> {
</span><span class="cx"> switch (priority) {
</span><span class="cx"> case ResourceLoadPriority::VeryLow:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><del>-typedef struct _CFURLResponse* CFURLResponseRef;
</del><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS NSURLResponse;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -113,13 +113,12 @@
</span><span class="cx"> m_initLevel = initLevel;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx"> CertificateInfo ResourceResponse::platformCertificateInfo() const
</span><span class="cx"> {
</span><del>-#if PLATFORM(COCOA)
- return CertificateInfo(adoptCF(wkCopyNSURLResponseCertificateChain(nsURLResponse())));
-#endif
- return CertificateInfo();
</del><ins>+ return { };
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> String ResourceResponse::platformSuggestedFilename() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="cx"> #include "WebCoreURLResponse.h"
</span><span class="cx"> #endif // PLATFORM(COCOA)
</span><span class="lines">@@ -143,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
</span><del>- CFHTTPMessageRef msg = wkGetCFURLResponseHTTPResponse(cfResponse);
</del><ins>+ auto msg = CFURLResponseGetHTTPResponse(cfResponse);
</ins><span class="cx"> int statusCode = msg ? CFHTTPMessageGetResponseStatusCode(msg) : 0;
</span><span class="cx">
</span><span class="cx"> if (statusCode != 304)
</span><span class="lines">@@ -151,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (_CFURLRequestCopyProtocolPropertyForKey(m_handle->firstRequest().cfURLRequest(DoNotUpdateHTTPBody), CFSTR("ForceHTMLMIMEType")))
</span><del>- wkSetCFURLResponseMIMEType(cfResponse, CFSTR("text/html"));
</del><ins>+ CFURLResponseSetMIMEType(cfResponse, CFSTR("text/html"));
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> #else
</span><span class="cx"> if (!CFURLResponseGetMIMEType(cfResponse))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaCredentialCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cocoa/CredentialCocoa.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><del>-typedef const struct _CFURLCredential* CFURLCredentialRef;
</del><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS NSURLCredential;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceRequestCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
</span><span class="cx">
</span><span class="cx"> if (resourcePrioritiesEnabled())
</span><del>- m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
</del><ins>+ m_priority = toResourceLoadPriority(m_nsRequest ? CFURLRequestGetRequestPriority([m_nsRequest _CFURLRequest]) : 0);
</ins><span class="cx">
</span><span class="cx"> m_httpHeaderFields.clear();
</span><span class="cx"> [[m_nsRequest allHTTPHeaderFields] enumerateKeysAndObjectsUsingBlock: ^(NSString *name, NSString *value, BOOL *) {
</span><span class="lines">@@ -133,13 +133,13 @@
</span><span class="cx"> nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
</span><span class="cx">
</span><span class="cx"> if (ResourceRequest::httpPipeliningEnabled())
</span><del>- wkHTTPRequestEnablePipelining([nsRequest _CFURLRequest]);
</del><ins>+ CFURLRequestSetShouldPipelineHTTP([nsRequest _CFURLRequest], true, true);
</ins><span class="cx">
</span><span class="cx"> if (ResourceRequest::resourcePrioritiesEnabled())
</span><del>- wkSetHTTPRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(priority()));
</del><ins>+ CFURLRequestSetRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(priority()));
</ins><span class="cx">
</span><span class="cx"> [nsRequest setCachePolicy:(NSURLRequestCachePolicy)cachePolicy()];
</span><del>- wkCFURLRequestAllowAllPostCaching([nsRequest _CFURLRequest]);
</del><ins>+ _CFURLRequestSetProtocolProperty([nsRequest _CFURLRequest], kCFURLRequestAllowAllPOSTCaching, kCFBooleanTrue);
</ins><span class="cx">
</span><span class="cx"> double timeoutInterval = ResourceRequestBase::timeoutInterval();
</span><span class="cx"> if (timeoutInterval)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoammfromrev194377trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (from rev 194377, trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm) (0 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -0,0 +1,233 @@
</span><ins>+/*
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ResourceResponse.h"
+
+#if PLATFORM(COCOA)
+
+#import "CFNetworkSPI.h"
+#import "HTTPParsers.h"
+#import "WebCoreURLResponse.h"
+#import <Foundation/Foundation.h>
+#import <limits>
+#import <wtf/StdLibExtras.h>
+
+namespace WebCore {
+
+void ResourceResponse::initNSURLResponse() const
+{
+ if (!m_httpStatusCode || !m_url.protocolIsInHTTPFamily()) {
+ // Work around a mistake in the NSURLResponse class - <rdar://problem/6875219>.
+ // The init function takes an NSInteger, even though the accessor returns a long long.
+ // For values that won't fit in an NSInteger, pass -1 instead.
+ NSInteger expectedContentLength;
+ if (m_expectedContentLength < 0 || m_expectedContentLength > std::numeric_limits<NSInteger>::max())
+ expectedContentLength = -1;
+ else
+ expectedContentLength = static_cast<NSInteger>(m_expectedContentLength);
+
+ NSString* encodingNSString = nsStringNilIfEmpty(m_textEncodingName);
+ m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:expectedContentLength textEncodingName:encodingNSString]);
+ return;
+ }
+
+ // FIXME: We lose the status text and the HTTP version here.
+ NSMutableDictionary* headerDictionary = [NSMutableDictionary dictionary];
+ for (auto& header : m_httpHeaderFields)
+ [headerDictionary setObject:(NSString *)header.value forKey:(NSString *)header.key];
+
+ m_nsResponse = adoptNS([[NSHTTPURLResponse alloc] initWithURL:m_url statusCode:m_httpStatusCode HTTPVersion:(NSString*)kCFHTTPVersion1_1 headerFields:headerDictionary]);
+
+ // Mime type sniffing doesn't work with a synthesized response.
+ [m_nsResponse.get() _setMIMEType:(NSString *)m_mimeType];
+}
+
+CertificateInfo ResourceResponse::platformCertificateInfo() const
+{
+ ASSERT(m_nsResponse);
+ auto cfResponse = [m_nsResponse _CFURLResponse];
+ if (!cfResponse)
+ return { };
+
+ CFDictionaryRef context = _CFURLResponseGetSSLCertificateContext(cfResponse);
+ if (!context)
+ return { };
+
+ auto trustValue = CFDictionaryGetValue(context, kCFStreamPropertySSLPeerTrust);
+ if (!trustValue)
+ return { };
+ ASSERT(CFGetTypeID(trustValue) == SecTrustGetTypeID());
+ auto trust = (SecTrustRef)trustValue;
+
+ SecTrustResultType trustResultType;
+ OSStatus result = SecTrustGetTrustResult(trust, &trustResultType);
+ if (result != errSecSuccess)
+ return { };
+
+ if (trustResultType == kSecTrustResultInvalid) {
+ result = SecTrustEvaluate(trust, &trustResultType);
+ if (result != errSecSuccess)
+ return { };
+ }
+
+ CFIndex count = SecTrustGetCertificateCount(trust);
+ auto certificateChain = CFArrayCreateMutable(0, count, &kCFTypeArrayCallBacks);
+ for (CFIndex i = 0; i < count; i++)
+ CFArrayAppendValue(certificateChain, SecTrustGetCertificateAtIndex(trust, i));
+
+ return CertificateInfo(adoptCF(certificateChain));
+}
+
+#if USE(CFNETWORK)
+
+NSURLResponse *ResourceResponse::nsURLResponse() const
+{
+ if (!m_nsResponse && !m_cfResponse && !m_isNull) {
+ initNSURLResponse();
+ m_cfResponse = [m_nsResponse.get() _CFURLResponse];
+ return m_nsResponse.get();
+ }
+
+ if (!m_cfResponse)
+ return nil;
+
+ if (!m_nsResponse)
+ m_nsResponse = [NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()];
+
+ return m_nsResponse.get();
+}
+
+ResourceResponse::ResourceResponse(NSURLResponse* nsResponse)
+ : m_initLevel(Uninitialized)
+ , m_platformResponseIsUpToDate(true)
+ , m_cfResponse([nsResponse _CFURLResponse])
+ , m_nsResponse(nsResponse)
+{
+ m_isNull = !nsResponse;
+}
+
+#else
+
+static NSString* const commonHeaderFields[] = {
+ @"Age", @"Cache-Control", @"Content-Type", @"Date", @"Etag", @"Expires", @"Last-Modified", @"Pragma"
+};
+
+NSURLResponse *ResourceResponse::nsURLResponse() const
+{
+ if (!m_nsResponse && !m_isNull)
+ initNSURLResponse();
+ return m_nsResponse.get();
+}
+
+static NSString *copyNSURLResponseStatusLine(NSURLResponse *response)
+{
+ CFURLResponseRef cfResponse = [response _CFURLResponse];
+ if (!cfResponse)
+ return nil;
+
+ CFHTTPMessageRef cfHTTPMessage = CFURLResponseGetHTTPResponse(cfResponse);
+ if (!cfHTTPMessage)
+ return nil;
+
+ return (NSString *)CFHTTPMessageCopyResponseStatusLine(cfHTTPMessage);
+}
+
+void ResourceResponse::platformLazyInit(InitLevel initLevel)
+{
+ if (m_initLevel >= initLevel)
+ return;
+
+ if (m_isNull || !m_nsResponse)
+ return;
+
+ if (m_initLevel < CommonFieldsOnly && initLevel >= CommonFieldsOnly) {
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+ m_httpHeaderFields.clear();
+ m_url = [m_nsResponse.get() URL];
+ m_mimeType = [m_nsResponse.get() MIMEType];
+ m_expectedContentLength = [m_nsResponse.get() expectedContentLength];
+ m_textEncodingName = [m_nsResponse.get() textEncodingName];
+
+ // Workaround for <rdar://problem/8757088>, can be removed once that is fixed.
+ unsigned textEncodingNameLength = m_textEncodingName.length();
+ if (textEncodingNameLength >= 2 && m_textEncodingName[0U] == '"' && m_textEncodingName[textEncodingNameLength - 1] == '"')
+ m_textEncodingName = m_textEncodingName.string().substring(1, textEncodingNameLength - 2);
+
+ if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
+ NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
+
+ m_httpStatusCode = [httpResponse statusCode];
+
+ if (initLevel < AllFields) {
+ NSDictionary *headers = [httpResponse allHeaderFields];
+ for (NSString *name : commonHeaderFields) {
+ if (NSString* headerValue = [headers objectForKey:name])
+ m_httpHeaderFields.set(name, headerValue);
+ }
+ }
+ } else
+ m_httpStatusCode = 0;
+
+ [pool drain];
+ }
+
+ if (m_initLevel < AllFields && initLevel == AllFields) {
+ if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+ NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
+ if (RetainPtr<NSString> httpStatusLine = adoptNS(copyNSURLResponseStatusLine(httpResponse)))
+ m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
+ else
+ m_httpStatusText = AtomicString("OK", AtomicString::ConstructFromLiteral);
+
+ NSDictionary *headers = [httpResponse allHeaderFields];
+ for (NSString *name in headers)
+ m_httpHeaderFields.set(name, [headers objectForKey:name]);
+
+ [pool drain];
+ }
+ }
+
+ m_initLevel = initLevel;
+}
+
+String ResourceResponse::platformSuggestedFilename() const
+{
+ return [nsURLResponse() suggestedFilename];
+}
+
+bool ResourceResponse::platformCompare(const ResourceResponse& a, const ResourceResponse& b)
+{
+ return a.nsURLResponse() == b.nsURLResponse();
+}
+
+#endif // USE(CFNETWORK)
+
+} // namespace WebCore
+
+#endif // PLATFORM(COCOA)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> #import <objc/objc-runtime.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+#if USE(CFNETWORK)
+#include "CFNetworkSPI.h"
+#endif
+
</ins><span class="cx"> OBJC_CLASS NSData;
</span><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="cx"> OBJC_CLASS NSFileHandle;
</span><span class="lines">@@ -44,11 +48,6 @@
</span><span class="cx"> OBJC_CLASS NSURLResponse;
</span><span class="cx"> OBJC_CLASS QLPreviewConverter;
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-typedef struct _CFURLResponse* CFURLResponseRef;
-typedef struct _CFURLConnection* CFURLConnectionRef;
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class QuickLookHandleClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -46,15 +46,6 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-#import <CFNetwork/CFURLConnection.h>
-
-@interface NSURLResponse (QuickLookDetails)
-+(NSURLResponse *)_responseWithCFURLResponse:(CFURLResponseRef)response;
--(CFURLResponseRef)_CFURLResponse;
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> NSSet *WebCore::QLPreviewGetSupportedMIMETypesSet()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosWebCoreURLResponseIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
</span><span class="cx"> {
</span><del>- RetainPtr<CFStringRef> mimeType = wkGetCFURLResponseMIMEType(cfResponse);
</del><ins>+ RetainPtr<CFStringRef> mimeType = CFURLResponseGetMIMEType(cfResponse);
</ins><span class="cx"> RetainPtr<CFStringRef> updatedMIMEType = mimeType;
</span><span class="cx"> if (!updatedMIMEType)
</span><span class="cx"> updatedMIMEType = defaultMIMEType().createCFString();
</span><span class="lines">@@ -57,12 +57,11 @@
</span><span class="cx"> // We must ensure that the MIME type is correct, so that QuickLook's web plugin is called when needed.
</span><span class="cx"> // We filter the basic MIME types so that we don't do unnecessary work in standard browsing situations.
</span><span class="cx"> if (shouldUseQuickLookForMIMEType((NSString *)updatedMIMEType.get())) {
</span><del>- RetainPtr<CFStringRef> suggestedFilename = adoptCF(wkCopyCFURLResponseSuggestedFilename(cfResponse));
</del><ins>+ RetainPtr<CFStringRef> suggestedFilename = adoptCF(CFURLResponseCopySuggestedFilename(cfResponse));
</ins><span class="cx"> RetainPtr<CFStringRef> quickLookMIMEType = adoptCF((CFStringRef)QLTypeCopyBestMimeTypeForFileNameAndMimeType((NSString *)suggestedFilename.get(), (NSString *)mimeType.get()));
</span><span class="cx"> if (!quickLookMIMEType) {
</span><del>- CFURLRef url = wkGetCFURLResponseURL(cfResponse);
- NSURL *nsURL = (NSURL *)url;
- if ([nsURL isFileURL]) {
</del><ins>+ auto url = CFURLResponseGetURL(cfResponse);
+ if ([(NSURL *)url isFileURL]) {
</ins><span class="cx"> RetainPtr<CFStringRef> extension = adoptCF(CFURLCopyPathExtension(url));
</span><span class="cx"> if (extension) {
</span><span class="cx"> RetainPtr<CFStringRef> uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, extension.get(), nullptr));
</span><span class="lines">@@ -76,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // USE(QUICK_LOOK)
</span><span class="cx"> if (!mimeType || CFStringCompare(mimeType.get(), updatedMIMEType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo)
</span><del>- wkSetCFURLResponseMIMEType(cfResponse, updatedMIMEType.get());
</del><ins>+ CFURLResponseSetMIMEType(cfResponse, updatedMIMEType.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> NSURLRequest *nsRequest = firstRequest().nsURLRequest(UpdateHTTPBody);
</span><span class="cx"> if (!shouldContentSniff) {
</span><span class="cx"> NSMutableURLRequest *mutableRequest = [[nsRequest mutableCopy] autorelease];
</span><del>- wkSetNSURLRequestShouldContentSniff(mutableRequest, NO);
</del><ins>+ [mutableRequest _setProperty:@(NO) forKey:(NSString *)_kCFURLConnectionPropertyShouldSniff];
</ins><span class="cx"> nsRequest = mutableRequest;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceResponseMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1,195 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "ResourceResponse.h"
-
-#import "HTTPParsers.h"
-#import "WebCoreURLResponse.h"
-#import "WebCoreSystemInterface.h"
-#import <Foundation/Foundation.h>
-#import <limits>
-#import <wtf/StdLibExtras.h>
-
-@interface NSURLResponse (WebNSURLResponseDetails)
-- (NSTimeInterval)_calculatedExpiration;
-- (id)_initWithCFURLResponse:(CFURLResponseRef)response;
-- (CFURLResponseRef) _CFURLResponse;
-+ (id)_responseWithCFURLResponse:(CFURLResponseRef)response;
-@end
-
-
-namespace WebCore {
-
-void ResourceResponse::initNSURLResponse() const
-{
- if (!m_httpStatusCode || !m_url.protocolIsInHTTPFamily()) {
- // Work around a mistake in the NSURLResponse class - <rdar://problem/6875219>.
- // The init function takes an NSInteger, even though the accessor returns a long long.
- // For values that won't fit in an NSInteger, pass -1 instead.
- NSInteger expectedContentLength;
- if (m_expectedContentLength < 0 || m_expectedContentLength > std::numeric_limits<NSInteger>::max())
- expectedContentLength = -1;
- else
- expectedContentLength = static_cast<NSInteger>(m_expectedContentLength);
-
- NSString* encodingNSString = nsStringNilIfEmpty(m_textEncodingName);
- m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:expectedContentLength textEncodingName:encodingNSString]);
- return;
- }
-
- // FIXME: We lose the status text and the HTTP version here.
- NSMutableDictionary* headerDictionary = [NSMutableDictionary dictionary];
- for (auto& header : m_httpHeaderFields)
- [headerDictionary setObject:(NSString *)header.value forKey:(NSString *)header.key];
-
- m_nsResponse = adoptNS([[NSHTTPURLResponse alloc] initWithURL:m_url statusCode:m_httpStatusCode HTTPVersion:(NSString*)kCFHTTPVersion1_1 headerFields:headerDictionary]);
-
- // Mime type sniffing doesn't work with a synthesized response.
- [m_nsResponse.get() _setMIMEType:(NSString *)m_mimeType];
-}
-
-#if USE(CFNETWORK)
-
-NSURLResponse *ResourceResponse::nsURLResponse() const
-{
- if (!m_nsResponse && !m_cfResponse && !m_isNull) {
- initNSURLResponse();
- m_cfResponse = [m_nsResponse.get() _CFURLResponse];
- return m_nsResponse.get();
- }
-
- if (!m_cfResponse)
- return nil;
-
- if (!m_nsResponse)
- m_nsResponse = [NSURLResponse _responseWithCFURLResponse:m_cfResponse.get()];
-
- return m_nsResponse.get();
-}
-
-ResourceResponse::ResourceResponse(NSURLResponse* nsResponse)
- : m_initLevel(Uninitialized)
- , m_platformResponseIsUpToDate(true)
- , m_cfResponse([nsResponse _CFURLResponse])
- , m_nsResponse(nsResponse)
-{
- m_isNull = !nsResponse;
-}
-
-#else
-
-static NSString* const commonHeaderFields[] = {
- @"Age", @"Cache-Control", @"Content-Type", @"Date", @"Etag", @"Expires", @"Last-Modified", @"Pragma"
-};
-
-NSURLResponse *ResourceResponse::nsURLResponse() const
-{
- if (!m_nsResponse && !m_isNull)
- initNSURLResponse();
- return m_nsResponse.get();
-}
-
-void ResourceResponse::platformLazyInit(InitLevel initLevel)
-{
- if (m_initLevel >= initLevel)
- return;
-
- if (m_isNull || !m_nsResponse)
- return;
-
- if (m_initLevel < CommonFieldsOnly && initLevel >= CommonFieldsOnly) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-
- m_httpHeaderFields.clear();
- m_url = [m_nsResponse.get() URL];
- m_mimeType = [m_nsResponse.get() MIMEType];
- m_expectedContentLength = [m_nsResponse.get() expectedContentLength];
- m_textEncodingName = [m_nsResponse.get() textEncodingName];
-
- // Workaround for <rdar://problem/8757088>, can be removed once that is fixed.
- unsigned textEncodingNameLength = m_textEncodingName.length();
- if (textEncodingNameLength >= 2 && m_textEncodingName[0U] == '"' && m_textEncodingName[textEncodingNameLength - 1] == '"')
- m_textEncodingName = m_textEncodingName.string().substring(1, textEncodingNameLength - 2);
-
- if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
- NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
-
- m_httpStatusCode = [httpResponse statusCode];
-
- if (initLevel < AllFields) {
- NSDictionary *headers = [httpResponse allHeaderFields];
- for (NSString *name : commonHeaderFields) {
- if (NSString* headerValue = [headers objectForKey:name])
- m_httpHeaderFields.set(name, headerValue);
- }
- }
- } else
- m_httpStatusCode = 0;
-
- [pool drain];
- }
-
- if (m_initLevel < AllFields && initLevel == AllFields) {
- if ([m_nsResponse.get() isKindOfClass:[NSHTTPURLResponse class]]) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-
- NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
- if (RetainPtr<NSString> httpStatusLine = adoptNS(wkCopyNSURLResponseStatusLine(httpResponse)))
- m_httpStatusText = extractReasonPhraseFromHTTPStatusLine(httpStatusLine.get());
- else
- m_httpStatusText = AtomicString("OK", AtomicString::ConstructFromLiteral);
-
- NSDictionary *headers = [httpResponse allHeaderFields];
- for (NSString *name in headers)
- m_httpHeaderFields.set(name, [headers objectForKey:name]);
-
- [pool drain];
- }
- }
-
- m_initLevel = initLevel;
-}
-
-CertificateInfo ResourceResponse::platformCertificateInfo() const
-{
- ASSERT(m_nsResponse);
- return CertificateInfo(adoptCF(wkCopyNSURLResponseCertificateChain(m_nsResponse.get())));
-}
-
-String ResourceResponse::platformSuggestedFilename() const
-{
- return [nsURLResponse() suggestedFilename];
-}
-
-bool ResourceResponse::platformCompare(const ResourceResponse& a, const ResourceResponse& b)
-{
- return a.nsURLResponse() == b.nsURLResponse();
-}
-
-#endif // USE(CFNETWORK)
-
-} // namespace WebCore
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreURLResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -26,11 +26,10 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-typedef struct _CFURLResponse* CFURLResponseRef;
</del><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> @interface NSURLResponse (Details)
</span><del>-- (CFURLResponseRef)_CFURLResponse;
</del><span class="cx"> - (void)_setMIMEType:(NSString *)type;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -288,13 +288,12 @@
</span><span class="cx">
</span><span class="cx"> void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
</span><span class="cx"> {
</span><del>- RetainPtr<CFStringRef> result = wkGetCFURLResponseMIMEType(cfResponse);
</del><ins>+ RetainPtr<CFStringRef> result = CFURLResponseGetMIMEType(cfResponse);
</ins><span class="cx"> RetainPtr<CFStringRef> originalResult = result;
</span><span class="cx">
</span><span class="cx"> if (!result) {
</span><del>- CFURLRef url = wkGetCFURLResponseURL(cfResponse);
- NSURL *nsURL = (NSURL *)url;
- if ([nsURL isFileURL]) {
</del><ins>+ auto url = CFURLResponseGetURL(cfResponse);
+ if ([(NSURL *)url isFileURL]) {
</ins><span class="cx"> RetainPtr<CFStringRef> extension = adoptCF(CFURLCopyPathExtension(url));
</span><span class="cx"> if (extension) {
</span><span class="cx"> // <rdar://problem/7007389> CoreTypes UTI map is missing 100+ file extensions that GateKeeper knew about
</span><span class="lines">@@ -321,7 +320,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result != originalResult)
</span><del>- wkSetCFURLResponseMIMEType(cfResponse, result.get());
</del><ins>+ CFURLResponseSetMIMEType(cfResponse, result.get());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkConnectionCacheSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -10,17 +10,17 @@
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> * documentation and/or other materials provided with the distribution.
</span><span class="cx"> *
</span><del>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef CFNetworkConnectionCacheSPI_h
</span><span class="lines">@@ -30,10 +30,14 @@
</span><span class="cx"> #include <CFNetwork/CFNetworkConnectionCachePriv.h>
</span><span class="cx"> #else
</span><span class="cx"> enum HTTPConnectionCacheLimitKeys {
</span><ins>+ kHTTPLoadWidth = 0,
+ kHTTPPriorityNumLevels = 3,
</ins><span class="cx"> kHTTPNumFastLanes = 4,
</span><ins>+ kHTTPMinimumFastLanePriority = 5,
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-extern "C" void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
</del><ins>+EXTERN_C int _CFNetworkHTTPConnectionCacheGetLimit(HTTPConnectionCacheLimitKeys);
+EXTERN_C void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#endif // CFNetworkConnectionCacheSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -26,15 +26,20 @@
</span><span class="cx"> #ifndef CFNetworkSPI_h
</span><span class="cx"> #define CFNetworkSPI_h
</span><span class="cx">
</span><ins>+#include "CFNetworkConnectionCacheSPI.h"
</ins><span class="cx"> #include <CFNetwork/CFNetwork.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#include <CFNetwork/CFHTTPCookies.h>
</del><span class="cx"> #include <CFNetwork/CFHTTPCookiesPriv.h>
</span><ins>+#include <CFNetwork/CFProxySupportPriv.h>
</ins><span class="cx"> #include <CFNetwork/CFURLCachePriv.h>
</span><ins>+#include <CFNetwork/CFURLConnectionPriv.h>
+#include <CFNetwork/CFURLCredentialStorage.h>
</ins><span class="cx"> #include <CFNetwork/CFURLProtocolPriv.h>
</span><del>-#include <CFNetwork/CFURLRequest.h>
</del><ins>+#include <CFNetwork/CFURLRequestPriv.h>
+#include <CFNetwork/CFURLResponsePriv.h>
+#include <CFNetwork/CFURLStorageSession.h>
</ins><span class="cx">
</span><span class="cx"> // FIXME: Remove the defined(__OBJC__)-guard onnce we fix <rdar://problem/19033610>.
</span><span class="cx"> #if defined(__OBJC__) && PLATFORM(COCOA)
</span><span class="lines">@@ -53,28 +58,46 @@
</span><span class="cx">
</span><span class="cx"> #else // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#if defined(__OBJC__)
-@interface NSURLSessionTask (TimingData)
-- (NSDictionary *)_timingData;
-@end
-#endif
-
</del><span class="cx"> typedef CF_ENUM(int64_t, _TimingDataOptions)
</span><span class="cx"> {
</span><span class="cx"> _TimingDataOptionsEnableW3CNavigationTiming = (1 << 0)
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</del><span class="cx"> typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
</span><span class="cx"> typedef const struct _CFURLCache* CFURLCacheRef;
</span><del>-typedef const struct _CFURLRequest *CFURLRequestRef;
</del><ins>+typedef const struct _CFURLCredential* CFURLCredentialRef;
+typedef const struct _CFURLRequest* CFURLRequestRef;
</ins><span class="cx"> typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
</span><del>-typedef const struct __CFData *CFDataRef;
</del><ins>+typedef const struct __CFData* CFDataRef;
+typedef struct _CFURLConnection* CFURLConnectionRef;
+typedef struct _CFURLCredentialStorage* CFURLCredentialStorageRef;
+typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef;
+typedef struct _CFURLRequest* CFMutableURLRequestRef;
+typedef struct _CFURLResponse* CFURLResponseRef;
+typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
+typedef CFIndex CFURLRequestPriority;
+typedef int CFHTTPCookieStorageAcceptPolicy;
</ins><span class="cx">
</span><span class="cx"> #ifdef __BLOCKS__
</span><span class="cx"> typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__OBJC__)
+@interface NSURLRequest ()
+- (void)_setProperty:(id)value forKey:(NSString *)key;
+@end
+
+@interface NSURLResponse ()
++ (NSURLResponse *)_responseWithCFURLResponse:(CFURLResponseRef)response;
+- (CFURLResponseRef)_CFURLResponse;
+- (NSDate *)_lastModifiedDate;
+@end
+
+@interface NSURLSessionTask (TimingData)
+- (NSDictionary *)_timingData;
+@end
+#endif
+
</ins><span class="cx"> #endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> EXTERN_C void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
</span><span class="lines">@@ -102,7 +125,30 @@
</span><span class="cx"> EXTERN_C void CFURLConnectionInvalidateConnectionCache();
</span><span class="cx">
</span><span class="cx"> EXTERN_C CFStringRef const kCFHTTPCookieLocalFileDomain;
</span><ins>+EXTERN_C const CFStringRef kCFURLRequestAllowAllPOSTCaching;
</ins><span class="cx">
</span><ins>+#if !PLATFORM(WIN)
+EXTERN_C const CFStringRef _kCFURLConnectionPropertyShouldSniff;
+#endif
+
+EXTERN_C CFHTTPCookieStorageRef _CFHTTPCookieStorageGetDefault(CFAllocatorRef);
+EXTERN_C void CFHTTPCookieStorageSetCookieAcceptPolicy(CFHTTPCookieStorageRef, CFHTTPCookieStorageAcceptPolicy);
+EXTERN_C void _CFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
+EXTERN_C CFURLCredentialStorageRef CFURLCredentialStorageCreate(CFAllocatorRef);
+EXTERN_C CFURLCredentialRef CFURLCredentialStorageCopyDefaultCredentialForProtectionSpace(CFURLCredentialStorageRef, CFURLProtectionSpaceRef);
+EXTERN_C CFURLRequestPriority CFURLRequestGetRequestPriority(CFURLRequestRef);
+EXTERN_C void _CFURLRequestSetProtocolProperty(CFURLRequestRef, CFStringRef, CFTypeRef);
+EXTERN_C void CFURLRequestSetRequestPriority(CFURLRequestRef, CFURLRequestPriority);
+EXTERN_C void CFURLRequestSetShouldPipelineHTTP(CFURLRequestRef, Boolean, Boolean);
+EXTERN_C void _CFURLRequestSetStorageSession(CFMutableURLRequestRef, CFURLStorageSessionRef);
+EXTERN_C CFStringRef CFURLResponseCopySuggestedFilename(CFURLResponseRef);
+EXTERN_C CFHTTPMessageRef CFURLResponseGetHTTPResponse(CFURLResponseRef);
+EXTERN_C CFStringRef CFURLResponseGetMIMEType(CFURLResponseRef);
+EXTERN_C CFDictionaryRef _CFURLResponseGetSSLCertificateContext(CFURLResponseRef);
+EXTERN_C CFURLRef CFURLResponseGetURL(CFURLResponseRef);
+EXTERN_C void CFURLResponseSetMIMEType(CFURLResponseRef, CFStringRef);
+EXTERN_C CFHTTPCookieStorageRef _CFURLStorageSessionCopyCookieStorage(CFAllocatorRef, CFURLStorageSessionRef);
+
</ins><span class="cx"> // FIXME: We should only forward declare this SPI when building for iOS without the Apple Internal SDK.
</span><span class="cx"> // As a workaround for <rdar://problem/19025016>, we must forward declare this SPI regardless of whether
</span><span class="cx"> // we are building with the Apple Internal SDK.
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-22 Andy Estes <aestes@apple.com>
+
+ [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
+ https://bugs.webkit.org/show_bug.cgi?id=152463
+
+ Reviewed by Alexey Proskuryakov.
+
+ Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
+ declared in CFNetworkSPI.h.
+
+ * Plugins/Hosted/HostedNetscapePluginStream.mm:
+ (WebKit::HostedNetscapePluginStream::didReceiveResponse):
+ * Plugins/WebNetscapePluginStream.mm:
+ (WebNetscapePluginStream::didReceiveResponse):
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:]):
+
</ins><span class="cx"> 2015-12-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused setToolbarHeight
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedHostedNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import "WebNSURLExtras.h"
</span><span class="cx"> #import "WebNSURLRequestExtras.h"
</span><span class="cx"> #import "WebResourceLoadScheduler.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/Document.h>
</span><span class="cx"> #import <WebCore/DocumentLoader.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="lines">@@ -189,7 +190,7 @@
</span><span class="cx"> [theHeaders appendBytes:"\0" length:1];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), [r MIMEType], theHeaders);
</del><ins>+ startStream([r URL], expectedContentLength, [r _lastModifiedDate], [r MIMEType], theHeaders);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NPReason HostedNetscapePluginStream::reasonForError(NSError *error)
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import "WebNetscapePluginView.h"
</span><span class="cx"> #import "WebResourceLoadScheduler.h"
</span><span class="cx"> #import <Foundation/NSURLResponse.h>
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/Document.h>
</span><span class="cx"> #import <WebCore/DocumentLoader.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span><span class="lines">@@ -358,7 +359,7 @@
</span><span class="cx"> // startStreamResponseURL:... will null-terminate.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), response.mimeType(), theHeaders);
</del><ins>+ startStream([r URL], expectedContentLength, [r _lastModifiedDate], response.mimeType(), theHeaders);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebNetscapePluginStream::startStreamWithResponse(NSURLResponse *response)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -46,18 +46,12 @@
</span><span class="cx"> INIT(AdvanceDefaultButtonPulseAnimation);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CALayerEnumerateRectsBeingDrawnWithBlock);
</span><del>-#if !PLATFORM(IOS)
- INIT(CGContextGetShouldSmoothFonts);
-#endif
</del><span class="cx"> INIT(CGPatternCreateWithImageAndTransform);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(CGContextDrawsWithCorrectShadowOffsets);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CopyCONNECTProxyResponse);
</span><del>- INIT(CopyNSURLResponseStatusLine);
- INIT(CopyNSURLResponseCertificateChain);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><del>- INIT(DrawCapsLockIndicator);
</del><span class="cx"> INIT(DrawBezeledTextArea);
</span><span class="cx"> INIT(DrawFocusRing);
</span><span class="cx"> INIT(DrawFocusRingAtTime);
</span><span class="lines">@@ -65,47 +59,34 @@
</span><span class="cx"> INIT(DrawMediaUIPart);
</span><span class="cx"> INIT(DrawMediaSliderTrack);
</span><span class="cx"> #endif
</span><del>- INIT(GetHTTPRequestPriority);
- INIT(GetNSURLResponseLastModifiedDate);
</del><span class="cx"> INIT(GetWebDefaultCFStringEncoding);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SignedPublicKeyAndChallengeString);
</span><span class="cx"> INIT(GetWheelEventDeltas);
</span><span class="cx"> INIT(GetNSEventKeyChar);
</span><span class="cx"> INIT(HitTestMediaUIPart);
</span><del>-#endif
- INIT(InitializeMaximumHTTPConnectionCountPerHost);
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(MeasureMediaUIPart);
</span><span class="cx"> INIT(CreateMediaUIBackgroundView);
</span><span class="cx"> INIT(CreateMediaUIControl);
</span><span class="cx"> INIT(WindowSetAlpha);
</span><span class="cx"> INIT(WindowSetScaledFrame);
</span><del>- INIT(SetCGFontRenderingMode);
</del><span class="cx"> #endif
</span><span class="cx"> INIT(SetCONNECTProxyAuthorizationForStream);
</span><span class="cx"> INIT(SetCONNECTProxyForStream);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SetDragImage);
</span><span class="cx"> #endif
</span><del>- INIT(SetHTTPRequestMaximumPriority);
- INIT(SetHTTPRequestPriority);
- INIT(SetHTTPRequestMinimumFastLanePriority);
- INIT(HTTPRequestEnablePipelining);
- INIT(SetNSURLRequestShouldContentSniff);
</del><span class="cx"> INIT(CGContextIsPDFContext);
</span><span class="cx"> #if ENABLE(VIDEO) && !PLATFORM(IOS)
</span><span class="cx"> INIT(QTIncludeOnlyModernMediaFileTypes);
</span><span class="cx"> INIT(QTMovieDisableComponent);
</span><span class="cx"> INIT(QTMovieMaxTimeLoaded);
</span><span class="cx"> INIT(QTMovieMaxTimeLoadedChangeNotification);
</span><del>- INIT(QTMovieMaxTimeSeekable);
</del><span class="cx"> INIT(QTMovieGetType);
</span><span class="cx"> INIT(QTMovieHasClosedCaptions);
</span><span class="cx"> INIT(QTMovieResolvedURL);
</span><span class="cx"> INIT(QTMovieSetShowClosedCaptions);
</span><span class="cx"> INIT(QTMovieSelectPreferredAlternates);
</span><del>- INIT(QTMovieViewSetDrawSynchronously);
</del><span class="cx"> INIT(QTGetSitesInMediaDownloadCache);
</span><span class="cx"> INIT(QTClearMediaDownloadCacheForSite);
</span><span class="cx"> INIT(QTClearMediaDownloadCache);
</span><span class="lines">@@ -115,16 +96,6 @@
</span><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
</span><span class="cx"> INIT(CopyDefaultSearchProviderDisplayName);
</span><span class="cx"> INIT(Cursor);
</span><del>-#endif
-
-#if USE(CFNETWORK)
- INIT(GetDefaultHTTPCookieStorage);
- INIT(CopyCredentialFromCFPersistentStorage);
- INIT(SetCFURLRequestShouldContentSniff);
- INIT(SetRequestStorageSession);
-#endif
-
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(SpeechSynthesisGetVoiceIdentifiers);
</span><span class="cx"> INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
</span><span class="cx"> INIT(GetAXTextMarkerTypeID);
</span><span class="lines">@@ -140,7 +111,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CreatePrivateStorageSession);
</span><span class="cx"> INIT(CopyRequestWithStorageSession);
</span><del>- INIT(CopyHTTPCookieStorage);
</del><span class="cx"> INIT(GetHTTPCookieAcceptPolicy);
</span><span class="cx"> INIT(HTTPCookies);
</span><span class="cx"> INIT(HTTPCookiesForURL);
</span><span class="lines">@@ -148,19 +118,8 @@
</span><span class="cx"> INIT(DeleteAllHTTPCookies);
</span><span class="cx"> INIT(DeleteHTTPCookie);
</span><span class="cx">
</span><del>- INIT(GetCFURLResponseMIMEType);
- INIT(GetCFURLResponseURL);
- INIT(GetCFURLResponseHTTPResponse);
- INIT(CopyCFURLResponseSuggestedFilename);
- INIT(SetCFURLResponseMIMEType);
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SetMetadataURL);
</span><del>-#endif
-
- INIT(CFURLRequestAllowAllPostCaching);
-
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span><span class="cx"> INIT(NSReboundDeltaForElasticDelta);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #import "WebSystemInterface.h"
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #import <WebCore/AudioSession.h>
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/NetworkStorageSession.h>
</span><span class="cx"> #import <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="lines">@@ -51,10 +52,6 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-enum {
- NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3
-};
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -1767,7 +1764,7 @@
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage();
</span><span class="cx"> ASSERT(cookieStorage); // Will fail when building without USE(CFNETWORK) and NetworkStorageSession::switchToNewTestingSession() was not called beforehand.
</span><del>- WKSetHTTPCookieAcceptPolicy(cookieStorage.get(), policy);
</del><ins>+ CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isDOMPasteAllowed
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-22 Andy Estes <aestes@apple.com>
+
+ [CF] Replace CFNetwork-related WebKitSystemInterface calls with SPI
+ https://bugs.webkit.org/show_bug.cgi?id=152463
+
+ Reviewed by Alexey Proskuryakov.
+
+ Replaced WebkitSystemInterface calls that wrapped CFNetwork SPI with direct calls to SPI that is now forward
+ declared in CFNetworkSPI.h.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::initializeNetworkSettings):
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::overrideSystemProxies):
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::setCookieAcceptPolicyForAllContexts):
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
</ins><span class="cx"> 2015-12-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow JavaScript to iterate over plugins for local SecurityOrigins
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> static const unsigned preferredConnectionCount = 6;
</span><span class="cx">
</span><del>- WKInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
</ins><span class="cx">
</span><span class="cx"> Boolean keyExistsAndHasValidFormat = false;
</span><span class="cx"> Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
</span><span class="lines">@@ -59,8 +59,10 @@
</span><span class="cx"> WebCore::ResourceRequest::setHTTPPipeliningEnabled(prefValue);
</span><span class="cx">
</span><span class="cx"> if (WebCore::ResourceRequest::resourcePrioritiesEnabled()) {
</span><del>- WKSetHTTPRequestMaximumPriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Highest));
- WKSetHTTPRequestMinimumFastLanePriority(toPlatformRequestPriority(WebCore::ResourceLoadPriority::Medium));
</del><ins>+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPPriorityNumLevels, toPlatformRequestPriority(WebCore::ResourceLoadPriority::Highest));
+#if PLATFORM(IOS)
+ _CFNetworkHTTPConnectionCacheSetLimit(kHTTPMinimumFastLanePriority, toPlatformRequestPriority(WebCore::ResourceLoadPriority::Medium));
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import "SandboxInitializationParameters.h"
</span><span class="cx"> #import "SecItemShim.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/CertificateInfo.h>
</span><span class="cx"> #import <WebCore/FileSystem.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ([proxySettings count] > 0)
</span><del>- WKCFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
</del><ins>+ _CFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebProcess.h"
</span><ins>+#include <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><span class="lines">@@ -69,11 +70,11 @@
</span><span class="cx"> [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:static_cast<NSHTTPCookieAcceptPolicy>(policy)];
</span><span class="cx">
</span><span class="cx"> if (RetainPtr<CFHTTPCookieStorageRef> cookieStorage = NetworkStorageSession::defaultStorageSession().cookieStorage())
</span><del>- WKSetHTTPCookieAcceptPolicy(cookieStorage.get(), policy);
</del><ins>+ CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
</ins><span class="cx">
</span><span class="cx"> for (const auto& session : SessionTracker::storageSessionMap().values()) {
</span><span class="cx"> if (session)
</span><del>- WKSetHTTPCookieAcceptPolicy(session->cookieStorage().get(), policy);
</del><ins>+ CFHTTPCookieStorageSetCookieAcceptPolicy(session->cookieStorage().get(), policy);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (194377 => 194378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-12-22 23:15:25 UTC (rev 194377)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-12-22 23:52:00 UTC (rev 194378)
</span><span class="lines">@@ -40,26 +40,18 @@
</span><span class="cx"> INIT(AdvanceDefaultButtonPulseAnimation);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CALayerEnumerateRectsBeingDrawnWithBlock);
</span><del>- INIT(CGContextGetShouldSmoothFonts);
</del><span class="cx"> INIT(CGPatternCreateWithImageAndTransform);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(CGContextDrawsWithCorrectShadowOffsets);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(CopyCONNECTProxyResponse);
</span><del>- INIT(CopyNSURLResponseStatusLine);
- INIT(CopyNSURLResponseCertificateChain);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(DrawBezeledTextArea);
</span><del>- INIT(DrawCapsLockIndicator);
</del><span class="cx"> INIT(DrawFocusRing);
</span><span class="cx"> INIT(DrawFocusRingAtTime);
</span><span class="cx"> INIT(DrawCellFocusRingWithFrameAtTime);
</span><span class="cx"> INIT(DrawMediaSliderTrack);
</span><span class="cx"> INIT(DrawMediaUIPart);
</span><del>-#endif
- INIT(GetHTTPRequestPriority);
- INIT(GetNSURLResponseLastModifiedDate);
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(SignedPublicKeyAndChallengeString);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(GetWebDefaultCFStringEncoding);
</span><span class="lines">@@ -68,10 +60,6 @@
</span><span class="cx"> INIT(GetWheelEventDeltas);
</span><span class="cx"> INIT(GetNSEventKeyChar);
</span><span class="cx"> INIT(HitTestMediaUIPart);
</span><del>-#endif
- INIT(InitializeMaximumHTTPConnectionCountPerHost);
- INIT(HTTPRequestEnablePipelining);
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(MeasureMediaUIPart);
</span><span class="cx"> INIT(QTIncludeOnlyModernMediaFileTypes);
</span><span class="cx"> INIT(QTMovieDisableComponent);
</span><span class="lines">@@ -79,30 +67,21 @@
</span><span class="cx"> INIT(QTMovieHasClosedCaptions);
</span><span class="cx"> INIT(QTMovieMaxTimeLoaded);
</span><span class="cx"> INIT(QTMovieMaxTimeLoadedChangeNotification);
</span><del>- INIT(QTMovieMaxTimeSeekable);
</del><span class="cx"> INIT(QTMovieResolvedURL);
</span><span class="cx"> INIT(QTMovieSelectPreferredAlternates);
</span><span class="cx"> INIT(QTMovieSetShowClosedCaptions);
</span><del>- INIT(QTMovieViewSetDrawSynchronously);
</del><span class="cx"> INIT(QTGetSitesInMediaDownloadCache);
</span><span class="cx"> INIT(QTClearMediaDownloadCacheForSite);
</span><span class="cx"> INIT(QTClearMediaDownloadCache);
</span><del>- INIT(SetCGFontRenderingMode);
</del><span class="cx"> #endif
</span><span class="cx"> INIT(SetCONNECTProxyAuthorizationForStream);
</span><span class="cx"> INIT(SetCONNECTProxyForStream);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SetDragImage);
</span><span class="cx"> #endif
</span><del>- INIT(SetHTTPRequestMaximumPriority);
- INIT(SetHTTPRequestPriority);
- INIT(SetHTTPRequestMinimumFastLanePriority);
- INIT(SetNSURLRequestShouldContentSniff);
</del><span class="cx"> INIT(CreatePrivateStorageSession);
</span><span class="cx"> INIT(CopyRequestWithStorageSession);
</span><del>- INIT(CopyHTTPCookieStorage);
</del><span class="cx"> INIT(GetHTTPCookieAcceptPolicy);
</span><del>- INIT(SetHTTPCookieAcceptPolicy);
</del><span class="cx"> INIT(HTTPCookies);
</span><span class="cx"> INIT(HTTPCookiesForURL);
</span><span class="cx"> INIT(SetHTTPCookiesForURL);
</span><span class="lines">@@ -111,24 +90,11 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SetMetadataURL);
</span><del>-#endif // !PLATFORM(IOS)
-
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(ExecutableWasLinkedOnOrBeforeSnowLeopard);
</span><span class="cx"> INIT(CopyDefaultSearchProviderDisplayName);
</span><span class="cx"> INIT(Cursor);
</span><span class="cx"> INIT(WindowSetScaledFrame);
</span><span class="cx"> INIT(WindowSetAlpha);
</span><del>-#endif // !PLATFORM(IOS)
-
-#if USE(CFNETWORK)
- INIT(GetDefaultHTTPCookieStorage);
- INIT(CopyCredentialFromCFPersistentStorage);
- INIT(SetCFURLRequestShouldContentSniff);
- INIT(SetRequestStorageSession);
-#endif
-
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(SpeechSynthesisGetVoiceIdentifiers);
</span><span class="cx"> INIT(SpeechSynthesisGetDefaultVoiceIdentifierForLocale);
</span><span class="cx"> INIT(GetAXTextMarkerTypeID);
</span><span class="lines">@@ -141,17 +107,6 @@
</span><span class="cx"> INIT(AccessibilityHandleFocusChanged);
</span><span class="cx"> INIT(CreateAXUIElementRef);
</span><span class="cx"> INIT(UnregisterUniqueIdForElement);
</span><del>-#endif
-
- INIT(GetCFURLResponseMIMEType);
- INIT(GetCFURLResponseURL);
- INIT(GetCFURLResponseHTTPResponse);
- INIT(CopyCFURLResponseSuggestedFilename);
- INIT(SetCFURLResponseMIMEType);
-
- INIT(CFURLRequestAllowAllPostCaching);
-
-#if !PLATFORM(IOS)
</del><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span><span class="cx"> INIT(NSReboundDeltaForElasticDelta);
</span></span></pre>
</div>
</div>
</body>
</html>