<!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>[173192] 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/173192">173192</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-02 17:14:06 -0700 (Tue, 02 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] Support using Foundation networking code
https://bugs.webkit.org/show_bug.cgi?id=136467

Reviewed by Pratik Solanki.

Source/WebCore:

We should support building iOS WebKit with the Foundation networking code
(i.e. !USE(CFNETWORK)).

Additionally, disable USE(CFNETWORK) and use the Foundation networking code
by default when building iOS WebKit without the Apple Internal SDK.

* Configurations/WebCore.xcconfig: Remove file WebCoreURLResponse.mm from the list of excluded files
so that we compile an implementation for function WebCore::synthesizeRedirectResponseIfNecessary when
building without USE(CFNETWORK).
* WebCore.exp.in: Add symbols for WebCore::synthesizeRedirectResponseIfNecessary() and WebCore::ResourceHandleClient::willCacheResponseAsync().
* WebCore.xcodeproj/project.pbxproj: Add new files CFNetworkConnectionCacheSPI.h and CFURLRequestSPI.h.
Also move group platform/spi such that it appears in alphabetical order in the platform group.
* platform/cf/URLCF.cpp: Remove unnecessary header &lt;CoreFoundation/CFPriv.h&gt;.
* platform/network/ResourceHandle.h: Declare iOS-specific variant of ResourceHandle::createNSURLConnection().
* platform/network/ResourceHandleClient.h: Always include header &lt;wtf/RetainPtr.h&gt; when building for iOS.
(WebCore::ResourceHandleClient::connectionProperties): Add PLATFORM(IOS)-guard around declaration.
* platform/network/cf/ResourceRequestCFNet.cpp: Substitute header CFNetworkConnectionCacheSPI.h for
&lt;CFNetwork/CFNetworkConnectionCachePriv.h&gt;.
* platform/network/mac/CredentialStorageMac.mm:
(WebCore::CredentialStorage::saveToPersistentStorage): Use Credential::nsCredential() and ProtectionSpace::nsSpace()
instead of WebCore::mac(const {Credential, ProtectionSpace}&amp;) as the latter were removed in &lt;http://trac.webkit.org/changeset/171801&gt;
and &lt;http://trac.webkit.org/changeset/171540&gt;, respectively.
* platform/network/mac/ResourceErrorMac.mm: Add USE(CFNETWORK)-guard around &lt;CFNetwork/CFSocketStreamPriv.h&gt;.
* platform/network/mac/ResourceHandleMac.mm: Substitute header CFURLRequestSPI.h for &lt;CFNetwork/CFURLRequest.h&gt;.
(WebCore::ResourceHandle::start): Modified to use ResourceHandle::makeDelegate() instead of d-&gt;m_proxy, which
was removed in &lt;http://trac.webkit.org/changeset/147476&gt;.
(WebCore::ResourceHandle::platformLoadResourceSynchronously): Ditto.
* platform/network/mac/WebCoreURLResponse.mm:
(WebCore::synthesizeRedirectResponseIfNecessary): Add !USE(CFNETWORK)- and PLATFORM(IOS)- guards.
* platform/spi/cf/CFNetworkConnectionCacheSPI.h: Added.
* platform/spi/cf/CFURLRequestSPI.h: Added.

Source/WTF:

Disable USE(CFNETWORK) and use the Foundation networking code by default when building
iOS WebKit without the Apple Internal SDK.

* wtf/Platform.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformcfURLCFcpp">trunk/Source/WebCore/platform/cf/URLCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleClienth">trunk/Source/WebCore/platform/network/ResourceHandleClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCredentialStorageMacmm">trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceErrorMacmm">trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm">trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkConnectionCacheSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFURLRequestSPIh">trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WTF/ChangeLog        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-02  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        [iOS] Support using Foundation networking code
+        https://bugs.webkit.org/show_bug.cgi?id=136467
+
+        Reviewed by Pratik Solanki.
+
+        Disable USE(CFNETWORK) and use the Foundation networking code by default when building
+        iOS WebKit without the Apple Internal SDK.
+
+        * wtf/Platform.h:
+
</ins><span class="cx"> 2014-08-26  Maciej Stachowiak  &lt;mjs@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use RetainPtr::autorelease in some places where it seems appropriate
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WTF/wtf/Platform.h        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -451,6 +451,12 @@
</span><span class="cx"> #define WTF_PLATFORM_COCOA 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(COCOA)
+#if defined __has_include &amp;&amp; __has_include(&lt;CoreFoundation/CFPriv.h&gt;)
+#define WTF_USE_APPLE_INTERNAL_SDK 1
+#endif
+#endif
+
</ins><span class="cx"> /* Graphics engines */
</span><span class="cx"> 
</span><span class="cx"> /* USE(CG) and PLATFORM(CI) */
</span><span class="lines">@@ -508,7 +514,9 @@
</span><span class="cx"> 
</span><span class="cx"> #define DONT_FINALIZE_ON_MAIN_THREAD 1
</span><span class="cx"> #define HAVE_READLINE 1
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #define WTF_USE_CFNETWORK 1
</span><ins>+#endif
</ins><span class="cx"> #define WTF_USE_UIKIT_EDITING 1
</span><span class="cx"> #define WTF_USE_WEB_THREAD 1
</span><span class="cx"> #define WTF_USE_QUICK_LOOK 1
</span><span class="lines">@@ -1054,12 +1062,6 @@
</span><span class="cx"> #define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
-#if defined __has_include &amp;&amp; __has_include(&lt;CoreFoundation/CFPriv.h&gt;)
-#define WTF_USE_APPLE_INTERNAL_SDK 1
-#endif
-#endif
-
</del><span class="cx"> #if (OS(DARWIN) &amp;&amp; USE(CG)) || USE(FREETYPE) || (PLATFORM(WIN) &amp;&amp; (USE(CG) || USE(CAIRO)))
</span><span class="cx"> #undef ENABLE_OPENTYPE_MATH
</span><span class="cx"> #define ENABLE_OPENTYPE_MATH 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/ChangeLog        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-09-02  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        [iOS] Support using Foundation networking code
+        https://bugs.webkit.org/show_bug.cgi?id=136467
+
+        Reviewed by Pratik Solanki.
+
+        We should support building iOS WebKit with the Foundation networking code
+        (i.e. !USE(CFNETWORK)).
+
+        Additionally, disable USE(CFNETWORK) and use the Foundation networking code
+        by default when building iOS WebKit without the Apple Internal SDK.
+
+        * Configurations/WebCore.xcconfig: Remove file WebCoreURLResponse.mm from the list of excluded files
+        so that we compile an implementation for function WebCore::synthesizeRedirectResponseIfNecessary when
+        building without USE(CFNETWORK).
+        * WebCore.exp.in: Add symbols for WebCore::synthesizeRedirectResponseIfNecessary() and WebCore::ResourceHandleClient::willCacheResponseAsync().
+        * WebCore.xcodeproj/project.pbxproj: Add new files CFNetworkConnectionCacheSPI.h and CFURLRequestSPI.h.
+        Also move group platform/spi such that it appears in alphabetical order in the platform group.
+        * platform/cf/URLCF.cpp: Remove unnecessary header &lt;CoreFoundation/CFPriv.h&gt;.
+        * platform/network/ResourceHandle.h: Declare iOS-specific variant of ResourceHandle::createNSURLConnection().
+        * platform/network/ResourceHandleClient.h: Always include header &lt;wtf/RetainPtr.h&gt; when building for iOS.
+        (WebCore::ResourceHandleClient::connectionProperties): Add PLATFORM(IOS)-guard around declaration.
+        * platform/network/cf/ResourceRequestCFNet.cpp: Substitute header CFNetworkConnectionCacheSPI.h for
+        &lt;CFNetwork/CFNetworkConnectionCachePriv.h&gt;.
+        * platform/network/mac/CredentialStorageMac.mm:
+        (WebCore::CredentialStorage::saveToPersistentStorage): Use Credential::nsCredential() and ProtectionSpace::nsSpace()
+        instead of WebCore::mac(const {Credential, ProtectionSpace}&amp;) as the latter were removed in &lt;http://trac.webkit.org/changeset/171801&gt;
+        and &lt;http://trac.webkit.org/changeset/171540&gt;, respectively.
+        * platform/network/mac/ResourceErrorMac.mm: Add USE(CFNETWORK)-guard around &lt;CFNetwork/CFSocketStreamPriv.h&gt;.
+        * platform/network/mac/ResourceHandleMac.mm: Substitute header CFURLRequestSPI.h for &lt;CFNetwork/CFURLRequest.h&gt;.
+        (WebCore::ResourceHandle::start): Modified to use ResourceHandle::makeDelegate() instead of d-&gt;m_proxy, which 
+        was removed in &lt;http://trac.webkit.org/changeset/147476&gt;.
+        (WebCore::ResourceHandle::platformLoadResourceSynchronously): Ditto.
+        * platform/network/mac/WebCoreURLResponse.mm:
+        (WebCore::synthesizeRedirectResponseIfNecessary): Add !USE(CFNETWORK)- and PLATFORM(IOS)- guards.
+        * platform/spi/cf/CFNetworkConnectionCacheSPI.h: Added.
+        * platform/spi/cf/CFURLRequestSPI.h: Added.
+
</ins><span class="cx"> 2014-09-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Use references in public EventSender functions
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -122,6 +122,6 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
</span><span class="cx"> 
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/WebCore.exp.in        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -1069,6 +1069,9 @@
</span><span class="cx"> __ZN7WebCore36standardUserAgentWithApplicationNameERKN3WTF6StringES3_
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope11moveWidgetsEv
</span><span class="cx"> __ZN7WebCore37WidgetHierarchyUpdatesSuspensionScope35s_widgetHierarchyUpdateSuspendCountE
</span><ins>+#if !USE(CFNETWORK)
+__ZN7WebCore37synthesizeRedirectResponseIfNecessaryEP15NSURLConnectionP12NSURLRequestP13NSURLResponse
+#endif
</ins><span class="cx"> __ZN7WebCore3URL10invalidateEv
</span><span class="cx"> __ZN7WebCore3URL11setProtocolERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore3URL7setPathERKN3WTF6StringE
</span><span class="lines">@@ -2638,7 +2641,6 @@
</span><span class="cx"> __ZN7WebCore19applicationIsWebAppEv
</span><span class="cx"> __ZN7WebCore19asciiLineBreakTableE
</span><span class="cx"> __ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP8WebEvent
</span><del>-__ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
</del><span class="cx"> __ZN7WebCore20applicationIsOkCupidEv
</span><span class="cx"> __ZN7WebCore20endOfEditableContentERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore20lastOffsetForEditingEPKNS_4NodeE
</span><span class="lines">@@ -2827,6 +2829,10 @@
</span><span class="cx"> _wkSetLayerContentsScale
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS) &amp;&amp; USE(CFNETWORK)
+__ZN7WebCore20ResourceHandleClient22willCacheResponseAsyncEPNS_14ResourceHandleEPK20_CFCachedURLResponse
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS) &amp;&amp; defined(__LP64__) &amp;&amp; __LP64__
</span><span class="cx"> __ZN7WebCore28createCGColorWithDeviceWhiteEdd
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -5736,6 +5736,8 @@
</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><ins>+                CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx">                 CE95208A1811B475007A5392 /* WebSafeIncrementalSweeperIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C2C4CB1D161A131200D214DA /* WebSafeIncrementalSweeperIOS.h */; };
</span><span class="cx">                 CECADFC6153778FF00E37068 /* DictationAlternative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CECADFC2153778FF00E37068 /* DictationAlternative.cpp */; };
</span><span class="cx">                 CECADFC7153778FF00E37068 /* DictationAlternative.h in Headers */ = {isa = PBXBuildFile; fileRef = CECADFC3153778FF00E37068 /* DictationAlternative.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -13198,6 +13200,8 @@
</span><span class="cx">                 CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AlternativeTextUIController.mm; path = mac/AlternativeTextUIController.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextAlternativeWithRange.h; path = mac/TextAlternativeWithRange.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CE7B2DB21586ABAD0098B3FA /* TextAlternativeWithRange.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TextAlternativeWithRange.mm; path = mac/TextAlternativeWithRange.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = &quot;&lt;group&gt;&quot;; };
+                CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFURLRequestSPI.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 CECADFC2153778FF00E37068 /* DictationAlternative.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationAlternative.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CECADFC3153778FF00E37068 /* DictationAlternative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationAlternative.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CECADFC4153778FF00E37068 /* DictationCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommand.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -16140,6 +16144,8 @@
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><span class="cx">                                 65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
</span><ins>+                                CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
+                                CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */,
</ins><span class="cx">                         );
</span><span class="cx">                         path = cf;
</span><span class="cx">                         sourceTree = &quot;&lt;group&gt;&quot;;
</span><span class="lines">@@ -21233,8 +21239,8 @@
</span><span class="cx">                                 59C77F101054591C00506104 /* mock */,
</span><span class="cx">                                 656B84D70AEA1CE900A095B4 /* network */,
</span><span class="cx">                                 516030090CC4245400C8AC25 /* posix */,
</span><ins>+                                653EF83619A043AE0052202C /* spi */,
</ins><span class="cx">                                 1A2E6E560CC551E0004A2062 /* sql */,
</span><del>-                                653EF83619A043AE0052202C /* spi */,
</del><span class="cx">                                 B2C3D9EC0D006C1D00EF6F26 /* text */,
</span><span class="cx">                                 49AE2D94134EE5F90072920A /* CalculationValue.cpp */,
</span><span class="cx">                                 49AE2D95134EE5F90072920A /* CalculationValue.h */,
</span><span class="lines">@@ -23434,7 +23440,9 @@
</span><span class="cx">                                 6550B69E099DF0270090D781 /* CDATASection.h in Headers */,
</span><span class="cx">                                 CDDD571518B57A8200A94FCB /* CDMSession.h in Headers */,
</span><span class="cx">                                 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
</span><ins>+                                CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */,
</ins><span class="cx">                                 E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
</span><ins>+                                CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */,
</ins><span class="cx">                                 FE36FD1516C7826500F887C1 /* ChangeVersionData.h in Headers */,
</span><span class="cx">                                 97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */,
</span><span class="cx">                                 FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfURLCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/URLCF.cpp (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/URLCF.cpp        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/cf/URLCF.cpp        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include &quot;RuntimeApplicationChecksIOS.h&quot;
</span><del>-#include &lt;CoreFoundation/CFPriv.h&gt;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -290,10 +290,14 @@
</span><span class="cx">     void createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff, SchedulingBehavior, CFDictionaryRef clientProperties);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA) &amp;&amp; !USE(CFNETWORK)
</del><ins>+#if PLATFORM(MAC) &amp;&amp; !USE(CFNETWORK)
</ins><span class="cx">     void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, SchedulingBehavior);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS) &amp;&amp; !USE(CFNETWORK)
+    void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff, SchedulingBehavior, NSDictionary *connectionProperties);
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA) &amp;&amp; ENABLE(WEB_TIMING)
</span><span class="cx"> static void getConnectionTimingData(NSDictionary *timingData, ResourceLoadTiming&amp;);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include &lt;CFNetwork/CFURLCachePriv.h&gt;
</span><span class="cx"> #include &lt;CFNetwork/CFURLResponsePriv.h&gt;
</span><ins>+#endif
+
+#if PLATFORM(IOS) || USE(CFNETWORK)
</ins><span class="cx"> #include &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -115,9 +118,12 @@
</span><span class="cx"> #endif
</span><span class="cx">         virtual void receivedCancellation(ResourceHandle*, const AuthenticationChallenge&amp;) { }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS)
+        virtual RetainPtr&lt;CFDictionaryRef&gt; connectionProperties(ResourceHandle*) { return nullptr; }
+#endif
+
</ins><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx">         virtual CFCachedURLResponseRef willCacheResponse(ResourceHandle*, CFCachedURLResponseRef response) { return response; }
</span><del>-        virtual RetainPtr&lt;CFDictionaryRef&gt; connectionProperties(ResourceHandle*) { return nullptr; }
</del><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx">         virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
</span><span class="cx"> #endif // PLATFORM(WIN)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -38,10 +38,11 @@
</span><span class="cx"> #include &quot;FormDataStreamCFNet.h&quot;
</span><span class="cx"> #include &lt;CFNetwork/CFURLRequestPriv.h&gt;
</span><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span><ins>+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include &lt;CFNetwork/CFNetworkConnectionCachePriv.h&gt;
</del><ins>+#include &quot;CFNetworkConnectionCacheSPI.h&quot;
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include &quot;ResourceLoadPriority.h&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCredentialStorageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/mac/CredentialStorageMac.mm        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> {
</span><span class="cx">     if (credential.persistence() == CredentialPersistenceNone) {
</span><span class="cx">         Credential sessionCredential(credential, CredentialPersistenceForSession);
</span><del>-        [[NSURLCredentialStorage sharedCredentialStorage] setDefaultCredential:mac(sessionCredential) forProtectionSpace:mac(protectionSpace)];
</del><ins>+        [[NSURLCredentialStorage sharedCredentialStorage] setDefaultCredential:sessionCredential.nsCredential() forProtectionSpace:protectionSpace.nsSpace()];
</ins><span class="cx">     } else
</span><del>-        [[NSURLCredentialStorage sharedCredentialStorage] setDefaultCredential:mac(credential) forProtectionSpace:mac(protectionSpace)];
</del><ins>+        [[NSURLCredentialStorage sharedCredentialStorage] setDefaultCredential:credential.nsCredential() forProtectionSpace:protectionSpace.nsSpace()];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceErrorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -31,9 +31,8 @@
</span><span class="cx"> #import &lt;CoreFoundation/CFError.h&gt;
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if PLATFORM(IOS) &amp;&amp; USE(CFNETWORK)
</ins><span class="cx"> #import &lt;CFNetwork/CFSocketStreamPriv.h&gt;
</span><del>-#import &lt;Foundation/NSURLError.h&gt;
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> @interface NSError (WebExtras)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -75,8 +75,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import &lt;CFNetwork/CFURLRequest.h&gt;
-
</del><ins>+#import &quot;CFURLRequestSPI.h&quot;
</ins><span class="cx"> #import &quot;RuntimeApplicationChecksIOS.h&quot;
</span><span class="cx"> #import &quot;WebCoreThreadRun.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -106,6 +105,7 @@
</span><span class="cx">     request.setHTTPHeaderField(HTTPHeaderName::Authorization, authenticationHeader);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> static NSOperationQueue *operationQueueForAsyncClients()
</span><span class="cx"> {
</span><span class="cx">     static NSOperationQueue *queue;
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx">     }
</span><span class="cx">     return queue;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> ResourceHandleInternal::~ResourceHandleInternal()
</span><span class="cx"> {
</span><span class="lines">@@ -252,11 +253,11 @@
</span><span class="cx">         SchedulingBehavior::Asynchronous);
</span><span class="cx"> #else
</span><span class="cx">     createNSURLConnection(
</span><del>-        d-&gt;m_proxy.get(),
</del><ins>+        ResourceHandle::makeDelegate(shouldUseCredentialStorage),
</ins><span class="cx">         shouldUseCredentialStorage,
</span><span class="cx">         d-&gt;m_shouldContentSniff || d-&gt;m_context-&gt;localFileContentSniffingEnabled(),
</span><span class="cx">         SchedulingBehavior::Asynchronous,
</span><del>-        (NSDictionary *)client()-&gt;connectionProperties(this));
</del><ins>+        (NSDictionary *)client()-&gt;connectionProperties(this).get());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -409,8 +410,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    bool shouldUseCredentialStorage = storedCredentials == AllowStoredCredentials;
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>-    bool shouldUseCredentialStorage = storedCredentials == AllowStoredCredentials;
</del><span class="cx">     handle-&gt;createNSURLConnection(
</span><span class="cx">         handle-&gt;makeDelegate(shouldUseCredentialStorage),
</span><span class="cx">         shouldUseCredentialStorage,
</span><span class="lines">@@ -418,11 +419,11 @@
</span><span class="cx">         SchedulingBehavior::Synchronous);
</span><span class="cx"> #else
</span><span class="cx">     handle-&gt;createNSURLConnection(
</span><del>-        handle-&gt;delegate(), // A synchronous request cannot turn into a download, so there is no need to proxy the delegate.
-        storedCredentials == AllowStoredCredentials,
</del><ins>+        handle-&gt;makeDelegate(shouldUseCredentialStorage), // A synchronous request cannot turn into a download, so there is no need to proxy the delegate.
+        shouldUseCredentialStorage,
</ins><span class="cx">         handle-&gt;shouldContentSniff() || (context &amp;&amp; context-&gt;localFileContentSniffingEnabled()),
</span><span class="cx">         SchedulingBehavior::Synchronous,
</span><del>-        (NSDictionary *)handle-&gt;client()-&gt;connectionProperties(handle.get()));
</del><ins>+        (NSDictionary *)handle-&gt;client()-&gt;connectionProperties(handle.get()).get());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     [handle-&gt;connection() scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:(NSString *)synchronousLoadRunLoopMode()];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreURLResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm (173191 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm        2014-09-02 23:09:02 UTC (rev 173191)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> // &lt;rdar://problem/7007389&gt; CoreTypes UTI map is missing 100+ file extensions that GateKeeper knew about
</span><span class="cx"> // When we disabled content sniffing for file URLs we caused problems with these 100+ extensions that CoreTypes
</span><span class="cx"> // doesn't know about.
</span><span class="lines">@@ -322,10 +323,12 @@
</span><span class="cx">     if (result != originalResult)
</span><span class="cx">         wkSetCFURLResponseMIMEType(cfResponse, result.get());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><ins>+#if !USE(CFNETWORK)
</ins><span class="cx"> NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLConnection *connection, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</del><ins>+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</ins><span class="cx">     if (redirectResponse)
</span><span class="cx">         return redirectResponse;
</span><span class="cx"> 
</span><span class="lines">@@ -342,5 +345,6 @@
</span><span class="cx">     return redirectResponse;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkConnectionCacheSPIhfromrev173191trunkSourceWebCoreplatformcfURLCFcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h (from rev 173191, trunk/Source/WebCore/platform/cf/URLCF.cpp) (0 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h                                (rev 0)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkConnectionCacheSPI.h        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. 
+ */
+
+#ifndef CFNetworkConnectionCacheSPI_h
+#define CFNetworkConnectionCacheSPI_h
+
+#if USE(APPLE_INTERNAL_SDK)
+#include &lt;CFNetwork/CFNetworkConnectionCachePriv.h&gt;
+#else
+enum HTTPConnectionCacheLimitKeys {
+    kHTTPNumFastLanes = 4,
+};
+#endif
+
+extern &quot;C&quot; void _CFNetworkHTTPConnectionCacheSetLimit(HTTPConnectionCacheLimitKeys, int);
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFURLRequestSPIhfromrev173191trunkSourceWebCoreplatformcfURLCFcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h (from rev 173191, trunk/Source/WebCore/platform/cf/URLCF.cpp) (0 => 173192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h                                (rev 0)
+++ trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h        2014-09-03 00:14:06 UTC (rev 173192)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2014 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. 
+ */
+
+#ifndef CFURLRequestSPI_h
+#define CFURLRequestSPI_h
+
+#if USE(APPLE_INTERNAL_SDK)
+#include &lt;CFNetwork/CFURLRequest.h&gt;
+#else
+#include &lt;CoreFoundation/CFBase.h&gt;
+typedef const struct _CFURLRequest *CFURLRequestRef;
+#endif
+
+extern &quot;C&quot; void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
+
+#endif
</ins></span></pre>
</div>
</div>

</body>
</html>