<!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>[176347] 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/176347">176347</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-19 14:32:04 -0800 (Wed, 19 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Make WebKit build with public iOS SDK
https://bugs.webkit.org/show_bug.cgi?id=136863
Reviewed by David Kilzer.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Add private headers CFNetworkSPI.h and
NS{CalendarDate, String, URLDownload}SPI.h.
* loader/cocoa/DiskCacheMonitorCocoa.mm: Move forward declaration of
CFNetwork data types and functions from here to file CFNetworkSPI.h and
include header CFNetworkSPI.h.
* platform/network/mac/ResourceHandleMac.mm: Substitute CFNetworkSPI.h for
CFURLRequestSPI.h as the content of the latter was incorporated into the former.
* platform/spi/cf/CFNetworkSPI.h: Added.
* platform/spi/cf/CFURLRequestSPI.h: Removed; incorporated its functionality
into CFNetworkSPI.h
* platform/spi/cocoa/NSCalendarDateSPI.h: Added.
* platform/spi/cocoa/NSStringSPI.h: Added.
* platform/spi/cocoa/NSURLDownloadSPI.h: Added.
Source/WebKit/ios:
* Misc/WebGeolocationCoreLocationProvider.mm: Remove unnecessary include of header <CoreLocation/CoreLocationPriv.h>.
* Misc/WebNSStringExtrasIOS.m: Substitute header <WebCore/NSStringSPI.h> for <Foundation/NSString_NSURLExtras.h>.
* Misc/WebUIKitSupport.mm: Remove unnecessary include of header CoreFoundation/CFPriv.h.
Source/WebKit/mac:
* History/WebHistory.mm: Include header NSCalendarDateSPI.h.
* History/WebHistoryItemPrivate.h: Remove include of private header Foundation/NSCalendarDate.h.
* Misc/WebDownload.h: Forward declare NSURLDownload when building without header Foundation/NSURLDownload.h.
We use __has_include() instead of WTF_USE_APPLE_INTERNAL_SDK since this header
may be used by Apple internal clients that do not include wtf/Platform.h.
* Misc/WebDownload.mm: Include header NSURLDownloadSPI.h instead of including
private Foundation headers directly.
* Misc/WebNSURLExtras.mm: Remove unnecessary include of private Foundation header.
* WebCoreSupport/WebFrameNetworkingContext.mm: Include header CFNetworkSPI.h
instead of including private CFNetwork headers directly. Also fixed up style and
ordering of header include directives.
* WebView/WebView.mm: Include header CFNetworkSPI.h instead of including private
CFNetwork headers directly. Also sort the #import directives.
* WebView/WebViewPrivate.h: Define ENABLE_TOUCH_EVENTS if not otherwise defined
and added ENABLE_TOUCH_EVENTS-guard around -_touchEventRegions.
Source/WebKit2:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm: Moved CFNetwork forward declarations
from this file to file CFNetworkSPI.h and included header CFNetworkSPI.h.
* NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Ditto.
* NetworkProcess/mac/NetworkResourceLoaderMac.mm: Ditto.
* UIProcess/API/Cocoa/WKProcessPool.mm: Ditto.
* UIProcess/mac/WebContextMac.mm: Ditto.
* WebProcess/cocoa/WebProcessCocoa.mm: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm">trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebGeolocationCoreLocationProvidermm">trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebNSStringExtrasIOSm">trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIOS.m</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebUIKitSupportmm">trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistorymm">trunk/Source/WebKit/mac/History/WebHistory.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemPrivateh">trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadmm">trunk/Source/WebKit/mac/Misc/WebDownload.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrasmm">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewPrivateh">trunk/Source/WebKit/mac/WebView/WebViewPrivate.h</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="#trunkSourceWebKit2NetworkProcessmacNetworkDiskCacheMonitormm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSCalendarDateSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSStringSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSStringSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSURLDownloadSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicfCFURLRequestSPIh">trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebCore/ChangeLog 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-19 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make WebKit build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=136863
+
+ Reviewed by David Kilzer.
+
+ * WebCore.xcodeproj/project.pbxproj: Add private headers CFNetworkSPI.h and
+ NS{CalendarDate, String, URLDownload}SPI.h.
+ * loader/cocoa/DiskCacheMonitorCocoa.mm: Move forward declaration of
+ CFNetwork data types and functions from here to file CFNetworkSPI.h and
+ include header CFNetworkSPI.h.
+ * platform/network/mac/ResourceHandleMac.mm: Substitute CFNetworkSPI.h for
+ CFURLRequestSPI.h as the content of the latter was incorporated into the former.
+ * platform/spi/cf/CFNetworkSPI.h: Added.
+ * platform/spi/cf/CFURLRequestSPI.h: Removed; incorporated its functionality
+ into CFNetworkSPI.h
+ * platform/spi/cocoa/NSCalendarDateSPI.h: Added.
+ * platform/spi/cocoa/NSStringSPI.h: Added.
+ * platform/spi/cocoa/NSURLDownloadSPI.h: Added.
+
</ins><span class="cx"> 2014-11-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of AccessibilityObject::setRoleValue()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -5762,12 +5762,15 @@
</span><span class="cx"> CE12524B1A16C79B00864480 /* DispatchSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524A1A16C79B00864480 /* DispatchSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */; };
</span><span class="cx"> CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524E1A1A78D200864480 /* MachVMSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252521A1BEC0600864480 /* NSStringSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12525A1A1C018200864480 /* CFNetworkSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</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><span class="cx"> CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><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">@@ -13259,6 +13262,10 @@
</span><span class="cx"> CE12524A1A16C79B00864480 /* DispatchSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOPMLibSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12524E1A1A78D200864480 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; };
</span><ins>+ CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCalendarDateSPI.h; sourceTree = "<group>"; };
+ CE1252521A1BEC0600864480 /* NSStringSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSStringSPI.h; sourceTree = "<group>"; };
+ CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLDownloadSPI.h; sourceTree = "<group>"; };
+ CE12525A1A1C018200864480 /* CFNetworkSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
</span><span class="cx"> CE6D89294C7AACE0AD89B3DD /* MathMLMencloseElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLMencloseElement.h; sourceTree = "<group>"; };
</span><span class="cx"> CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextUIController.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13266,7 +13273,6 @@
</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><span class="cx"> CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFNetworkConnectionCacheSPI.h; sourceTree = "<group>"; };
</span><del>- CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFURLRequestSPI.h; sourceTree = "<group>"; };
</del><span class="cx"> CECADFC2153778FF00E37068 /* DictationAlternative.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationAlternative.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CECADFC3153778FF00E37068 /* DictationAlternative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictationAlternative.h; sourceTree = "<group>"; };
</span><span class="cx"> CECADFC4153778FF00E37068 /* DictationCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictationCommand.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16203,7 +16209,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
</span><span class="cx"> CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
</span><del>- CE8245F119B671D500AC0122 /* CFURLRequestSPI.h */,
</del><ins>+ CE12525A1A1C018200864480 /* CFNetworkSPI.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cf;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -16228,9 +16234,12 @@
</span><span class="cx"> CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
</span><span class="cx"> CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
</span><span class="cx"> CE12524E1A1A78D200864480 /* MachVMSPI.h */,
</span><ins>+ CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */,
</ins><span class="cx"> 2DDB97F319F9AECA002025D8 /* NSExtensionSPI.h */,
</span><span class="cx"> CE12523A1A16711000864480 /* NSFileManagerSPI.h */,
</span><span class="cx"> CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */,
</span><ins>+ CE1252521A1BEC0600864480 /* NSStringSPI.h */,
+ CE1252541A1BEC0E00864480 /* NSURLDownloadSPI.h */,
</ins><span class="cx"> 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
</span><span class="cx"> CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -23567,8 +23576,8 @@
</span><span class="cx"> CDDD571518B57A8200A94FCB /* CDMSession.h in Headers */,
</span><span class="cx"> 5FA904CA178E61F5004C8A2D /* CertificateInfo.h in Headers */,
</span><span class="cx"> CE8245F019B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h in Headers */,
</span><ins>+ CE12525B1A1C018200864480 /* CFNetworkSPI.h in Headers */,
</ins><span class="cx"> E1A8E56717552B2A007488E7 /* CFURLExtras.h in Headers */,
</span><del>- CE8245F219B671D500AC0122 /* CFURLRequestSPI.h in Headers */,
</del><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 class="lines">@@ -25508,6 +25517,7 @@
</span><span class="cx"> 1A569D100D7E2B82007C3983 /* npruntime_internal.h in Headers */,
</span><span class="cx"> 1A569D110D7E2B82007C3983 /* npruntime_priv.h in Headers */,
</span><span class="cx"> 1A927FD41416A15B003A83C8 /* nptypes.h in Headers */,
</span><ins>+ CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */,
</ins><span class="cx"> 2DDB97F419F9AECA002025D8 /* NSExtensionSPI.h in Headers */,
</span><span class="cx"> CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */,
</span><span class="cx"> 1C6466281A12C4200094603C /* NSFontSPI.h in Headers */,
</span><span class="lines">@@ -25515,6 +25525,8 @@
</span><span class="cx"> 93500F3213FDE3BE0099EC24 /* NSScrollerImpDetails.h in Headers */,
</span><span class="cx"> 2DCB837919F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h in Headers */,
</span><span class="cx"> 2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */,
</span><ins>+ CE1252531A1BEC0600864480 /* NSStringSPI.h in Headers */,
+ CE1252551A1BEC0E00864480 /* NSURLDownloadSPI.h in Headers */,
</ins><span class="cx"> 658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */,
</span><span class="cx"> 9348428219F1A9190009D5AE /* NSViewSPI.h in Headers */,
</span><span class="cx"> F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaDiskCacheMonitorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "DiskCacheMonitorCocoa.h"
</span><span class="cx">
</span><ins>+#import "CFNetworkSPI.h"
</ins><span class="cx"> #import "CachedResource.h"
</span><span class="cx"> #import "MemoryCache.h"
</span><span class="cx"> #import "ResourceRequest.h"
</span><span class="lines">@@ -36,22 +37,12 @@
</span><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx">
</span><del>-#ifdef __has_include
-#if __has_include(<CFNetwork/CFURLCachePriv.h>)
-#include <CFNetwork/CFURLCachePriv.h>
-#endif
-#endif
-
</del><span class="cx"> #if USE(WEB_THREAD)
</span><span class="cx"> #include "WebCoreThreadRun.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</span><span class="cx">
</span><del>-typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
-extern "C" void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
-extern "C" CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // The maximum number of seconds we'll try to wait for a resource to be disk cached before we forget the request.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import "CFURLRequestSPI.h"
</del><ins>+#import "CFNetworkSPI.h"
</ins><span class="cx"> #import "RuntimeApplicationChecksIOS.h"
</span><span class="cx"> #import "WebCoreThreadRun.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (0 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -0,0 +1,104 @@
</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. 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.
+ */
+
+#ifndef CFNetworkSPI_h
+#define CFNetworkSPI_h
+
+#include <CFNetwork/CFNetwork.h>
+
+#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
+
+#include <CFNetwork/CFHTTPCookies.h>
+#include <CFNetwork/CFURLCachePriv.h>
+#include <CFNetwork/CFURLProtocolPriv.h>
+#include <CFNetwork/CFURLRequest.h>
+
+#ifdef __OBJC__
+// FIXME: As a workaround for <rdar://problem/18337182>, we conditionally enclose the header
+// in an extern "C" linkage block to make it suitable for C++ use.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#import <CFNetwork/CFNSURLConnection.h>
+
+#ifdef __cplusplus
+}
+#endif
+#endif // __OBJC__
+
+#else
+
+typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
+typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
+typedef const struct _CFURLCache* CFURLCacheRef;
+typedef const struct _CFURLRequest *CFURLRequestRef;
+
+#ifdef __BLOCKS__
+typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
+#endif
+
+#ifdef __OBJC__
+enum : NSUInteger {
+ NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
+};
+#endif
+
+#endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
+
+EXTERN_C void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
+
+EXTERN_C CFURLCacheRef CFURLCacheCopySharedURLCache();
+EXTERN_C void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
+EXTERN_C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+EXTERN_C CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
+EXTERN_C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
+
+EXTERN_C Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef, CFURLStorageSessionRef);
+EXTERN_C void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef);
+#endif
+
+EXTERN_C void CFHTTPCookieStorageDeleteAllCookies(CFHTTPCookieStorageRef);
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+EXTERN_C CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
+#ifdef __BLOCKS__
+EXTERN_C void _CFCachedURLResponseSetBecameFileBackedCallBackBlock(CFCachedURLResponseRef, CFCachedURLResponseCallBackBlock, dispatch_queue_t);
+#endif
+#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+
+EXTERN_C void CFURLConnectionInvalidateConnectionCache();
+
+// FIXME: We should only forward declare this SPI when building for iOS without the Apple Internal SDK.
+// As a workaround for <rdar://problem/19025016>, we must forward declare this SPI regardless of whether
+// we are building with the Apple Internal SDK.
+#if PLATFORM(IOS) && defined(__OBJC__)
+@interface NSURLCache (Details)
+-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
+@end
+#endif
+
+#endif // CFNetworkSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFURLRequestSPIh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebCore/platform/spi/cf/CFURLRequestSPI.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * 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 <CFNetwork/CFURLRequest.h>
-#else
-#include <CoreFoundation/CFBase.h>
-typedef const struct _CFURLRequest *CFURLRequestRef;
-#endif
-
-extern "C" void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSCalendarDateSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h (0 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSCalendarDateSPI.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -0,0 +1,42 @@
</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. 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.
+ */
+
+#import <Foundation/NSDate.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#import <Foundation/NSCalendarDate.h>
+
+#else
+
+@interface NSCalendarDate : NSDate
+@end
+
+@interface NSCalendarDate (Details)
++ (id)calendarDate;
+- (NSCalendarDate *)dateByAddingYears:(NSInteger)year months:(NSInteger)month days:(NSInteger)day hours:(NSInteger)hour minutes:(NSInteger)minute seconds:(NSInteger)second;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSStringSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/NSStringSPI.h (0 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSStringSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSStringSPI.h 2014-11-19 22:32:04 UTC (rev 176347)
</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. 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.
+ */
+
+#import <Foundation/NSString.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <Foundation/NSString_NSURLExtras.h>
+
+#else
+
+@interface NSString (Details)
+- (BOOL)_web_hasCaseInsensitivePrefix:(NSString *)suffix;
+- (NSString *)_web_stringByExpandingTildeInPath;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSURLDownloadSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h (0 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -0,0 +1,63 @@
</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. 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.
+ */
+
+#import <Foundation/NSObject.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#import <Foundation/NSURLDownload.h>
+
+#else
+
+@class NSString;
+@class NSURLAuthenticationChallenge;
+@class NSURLDownload;
+@class NSURLProtectionSpace;
+@class NSURLRequest;
+@class NSURLResponse;
+
+@protocol NSURLDownloadDelegate <NSObject>
+@optional
+- (void)downloadDidBegin:(NSURLDownload *)download;
+- (NSURLRequest *)download:(NSURLDownload *)download willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse;
+- (BOOL)download:(NSURLDownload *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace;
+- (void)download:(NSURLDownload *)download didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
+- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
+- (BOOL)downloadShouldUseCredentialStorage:(NSURLDownload *)download;
+- (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)response;
+- (void)download:(NSURLDownload *)download willResumeWithResponse:(NSURLResponse *)response fromByte:(long long)startingByte;
+- (void)download:(NSURLDownload *)download didReceiveDataOfLength:(NSUInteger)length;
+- (BOOL)download:(NSURLDownload *)download shouldDecodeSourceDataOfMIMEType:(NSString *)encodingType;
+- (void)download:(NSURLDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename;
+- (void)download:(NSURLDownload *)download didCreateDestination:(NSString *)path;
+- (void)downloadDidFinish:(NSURLDownload *)download;
+- (void)download:(NSURLDownload *)download didFailWithError:(NSError *)error;
+@end
+
+@interface NSURLDownload (Details)
+- (instancetype)initWithRequest:(NSURLRequest *)request delegate:(id <NSURLDownloadDelegate>)delegate;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-19 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make WebKit build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=136863
+
+ Reviewed by David Kilzer.
+
+ * Misc/WebGeolocationCoreLocationProvider.mm: Remove unnecessary include of header <CoreLocation/CoreLocationPriv.h>.
+ * Misc/WebNSStringExtrasIOS.m: Substitute header <WebCore/NSStringSPI.h> for <Foundation/NSString_NSURLExtras.h>.
+ * Misc/WebUIKitSupport.mm: Remove unnecessary include of header CoreFoundation/CFPriv.h.
+
</ins><span class="cx"> 2014-11-14 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] CoreGraphics SPI not available in public SDK
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebGeolocationCoreLocationProvidermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/ios/Misc/WebGeolocationCoreLocationProvider.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import <CoreLocation/CLLocation.h>
</span><span class="cx"> #import <CoreLocation/CLLocationManagerDelegate.h>
</span><span class="cx"> #import <CoreLocation/CoreLocation.h>
</span><del>-#import <CoreLocation/CoreLocationPriv.h>
</del><span class="cx"> #import <WebCore/GeolocationPosition.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <WebKitLogging.h>
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebNSStringExtrasIOSm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIOS.m (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIOS.m 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIOS.m 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import <Foundation/NSString_NSURLExtras.h>
</del><span class="cx"> #import "WebNSStringExtrasIOS.h"
</span><span class="cx"> #import "WebNSURLExtras.h"
</span><ins>+#import <WebCore/NSStringSPI.h>
</ins><span class="cx">
</span><span class="cx"> @implementation NSString (WebNSStringExtrasIOS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebUIKitSupportmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebUIKitSupport.h"
</span><span class="cx">
</span><del>-#import <CoreFoundation/CFPriv.h>
</del><span class="cx"> #import <WebCore/break_lines.h>
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/TextBreakIterator.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-11-19 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make WebKit build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=136863
+
+ Reviewed by David Kilzer.
+
+ * History/WebHistory.mm: Include header NSCalendarDateSPI.h.
+ * History/WebHistoryItemPrivate.h: Remove include of private header Foundation/NSCalendarDate.h.
+ * Misc/WebDownload.h: Forward declare NSURLDownload when building without header Foundation/NSURLDownload.h.
+ We use __has_include() instead of WTF_USE_APPLE_INTERNAL_SDK since this header
+ may be used by Apple internal clients that do not include wtf/Platform.h.
+ * Misc/WebDownload.mm: Include header NSURLDownloadSPI.h instead of including
+ private Foundation headers directly.
+ * Misc/WebNSURLExtras.mm: Remove unnecessary include of private Foundation header.
+ * WebCoreSupport/WebFrameNetworkingContext.mm: Include header CFNetworkSPI.h
+ instead of including private CFNetwork headers directly. Also fixed up style and
+ ordering of header include directives.
+ * WebView/WebView.mm: Include header CFNetworkSPI.h instead of including private
+ CFNetwork headers directly. Also sort the #import directives.
+ * WebView/WebViewPrivate.h: Define ENABLE_TOUCH_EVENTS if not otherwise defined
+ and added ENABLE_TOUCH_EVENTS-guard around -_touchEventRegions.
+
</ins><span class="cx"> 2014-11-18 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> FeatureDefines.xcconfig: Switch from using PLATFORM_NAME to SDK selectors
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WebNSURLExtras.h"
</span><span class="cx"> #import "WebTypesInternal.h"
</span><span class="cx"> #import <WebCore/HistoryItem.h>
</span><ins>+#import <WebCore/NSCalendarDateSPI.h>
</ins><span class="cx"> #import <WebCore/PageGroup.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #import <WebKitLegacy/WebHistoryItem.h>
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#import <Foundation/NSCalendarDate.h>
-
</del><span class="cx"> extern NSString *WebViewportInitialScaleKey;
</span><span class="cx"> extern NSString *WebViewportMinimumScaleKey;
</span><span class="cx"> extern NSString *WebViewportMaximumScaleKey;
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -26,7 +26,15 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
+// the condition for including the header Foundation/NSURLDownload.h to support internal Apple
+// clients that build without header wtf/Platform.h. See <rdar://problem/19034131>.
+#if __has_include(<Foundation/NSURLDownload.h>)
</ins><span class="cx"> #import <Foundation/NSURLDownload.h>
</span><ins>+#else
+@interface NSURLDownload : NSObject
+@end
+#endif
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #import <WebKitLegacy/WAKAppKitStubs.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx"> #import <WebKitLegacy/WebDownload.h>
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLAuthenticationChallenge.h>
</span><del>-#import <Foundation/NSURLDownload.h>
</del><span class="cx"> #import <WebCore/AuthenticationCF.h>
</span><span class="cx"> #import <WebCore/AuthenticationMac.h>
</span><span class="cx"> #import <WebCore/Credential.h>
</span><span class="cx"> #import <WebCore/CredentialStorage.h>
</span><ins>+#import <WebCore/NSURLDownloadSPI.h>
</ins><span class="cx"> #import <WebCore/ProtectionSpace.h>
</span><span class="cx"> #import <WebKitLegacy/WebPanelAuthenticationHandler.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -43,10 +43,6 @@
</span><span class="cx"> #import <unicode/uchar.h>
</span><span class="cx"> #import <unicode/uscript.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#import <Foundation/NSString_NSURLExtras.h>
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WTF;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -23,19 +23,20 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "WebViewPrivate.h"
-#include "WebFrameInternal.h"
-#include <WebFrameNetworkingContext.h>
-#include <WebCore/FrameLoader.h>
-#include <WebCore/FrameLoaderClient.h>
-#include <WebCore/NetworkStorageSession.h>
-#include <WebCore/Page.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/Settings.h>
-#include <wtf/NeverDestroyed.h>
</del><ins>+#import "WebFrameNetworkingContext.h"
</ins><span class="cx">
</span><ins>+#import "WebFrameInternal.h"
+#import "WebViewPrivate.h"
+#import <WebCore/CFNetworkSPI.h>
+#import <WebCore/FrameLoader.h>
+#import <WebCore/FrameLoaderClient.h>
+#import <WebCore/NetworkStorageSession.h>
+#import <WebCore/Page.h>
+#import <WebCore/ResourceError.h>
+#import <WebCore/Settings.h>
+#import <wtf/NeverDestroyed.h>
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import <CFNetwork/CFHTTPCookiesPriv.h>
</del><span class="cx"> #import <WebCore/WebCoreThread.h>
</span><span class="cx"> #import <WebKitLegacy/WebFrameLoadDelegate.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> #import <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #import <WebCore/BackForwardController.h>
</span><span class="cx"> #import <WebCore/BackForwardList.h>
</span><del>-#import <WebCore/MemoryCache.h>
</del><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/Chrome.h>
</span><span class="cx"> #import <WebCore/ColorMac.h>
</span><span class="cx"> #import <WebCore/Cursor.h>
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> #import <WebCore/Logging.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/MemoryCache.h>
</ins><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #import <WebCore/NSURLFileTypeMappingsSPI.h>
</span><span class="cx"> #import <WebCore/NodeList.h>
</span><span class="lines">@@ -188,8 +189,8 @@
</span><span class="cx"> #import <runtime/ArrayPrototype.h>
</span><span class="cx"> #import <runtime/DateInstance.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><ins>+#import <runtime/JSCJSValue.h>
</ins><span class="cx"> #import <runtime/JSLock.h>
</span><del>-#import <runtime/JSCJSValue.h>
</del><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/HashTraits.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="lines">@@ -229,7 +230,6 @@
</span><span class="cx"> #import "WebStorageManagerPrivate.h"
</span><span class="cx"> #import "WebUIKitSupport.h"
</span><span class="cx"> #import "WebVisiblePosition.h"
</span><del>-#import <CFNetwork/CFURLCachePriv.h>
</del><span class="cx"> #import <WebCore/DispatchSPI.h>
</span><span class="cx"> #import <WebCore/EventNames.h>
</span><span class="cx"> #import <WebCore/FontCache.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -47,6 +47,14 @@
</span><span class="cx"> #define ENABLE_REMOTE_INSPECTOR 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !defined(ENABLE_TOUCH_EVENTS)
+#if TARGET_OS_IPHONE
+#define ENABLE_TOUCH_EVENTS 1
+#else
+#define ENABLE_TOUCH_EVENTS 0
+#endif
+#endif
+
</ins><span class="cx"> @class NSError;
</span><span class="cx"> @class WebFrame;
</span><span class="cx"> @class WebDeviceOrientation;
</span><span class="lines">@@ -556,7 +564,9 @@
</span><span class="cx"> - (void)_viewGeometryDidChange;
</span><span class="cx"> - (void)_overflowScrollPositionChangedTo:(CGPoint)offset forNode:(DOMNode *)node isUserScroll:(BOOL)userScroll;
</span><span class="cx">
</span><ins>+#if ENABLE_TOUCH_EVENTS
</ins><span class="cx"> - (NSArray *)_touchEventRegions;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method _doNotStartObservingNetworkReachability
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-19 Daniel Bates <dabates@apple.com>
+
+ [iOS] Make WebKit build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=136863
+
+ Reviewed by David Kilzer.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm: Moved CFNetwork forward declarations
+ from this file to file CFNetworkSPI.h and included header CFNetworkSPI.h.
+ * NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Ditto.
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm: Ditto.
+ * UIProcess/API/Cocoa/WKProcessPool.mm: Ditto.
+ * UIProcess/mac/WebContextMac.mm: Ditto.
+ * WebProcess/cocoa/WebProcessCocoa.mm: Ditto.
+
</ins><span class="cx"> 2014-11-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add APIs for customizing the user agent
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -31,25 +31,11 @@
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "SandboxExtension.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <mach/host_info.h>
</span><span class="cx"> #import <mach/mach.h>
</span><span class="cx"> #import <mach/mach_error.h>
</span><span class="cx">
</span><del>-typedef const struct _CFURLCache* CFURLCacheRef;
-extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
-extern "C" void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
-extern "C" void CFURLConnectionInvalidateConnectionCache();
-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-extern "C" void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
-#endif
-
-#if PLATFORM(IOS)
-@interface NSURLCache (WKDetails)
--(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
-@end
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformLowMemoryHandler(bool)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkDiskCacheMonitormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -30,13 +30,8 @@
</span><span class="cx"> #import "NetworkProcessConnectionMessages.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx">
</span><del>-#ifdef __has_include
-#if __has_include(<CFNetwork/CFURLCachePriv.h>)
-#include <CFNetwork/CFURLCachePriv.h>
-#endif
-#endif
-
</del><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -30,29 +30,12 @@
</span><span class="cx">
</span><span class="cx"> #import "NetworkDiskCacheMonitor.h"
</span><span class="cx"> #import "ShareableResource.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/ResourceHandle.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#ifdef __has_include
-#if __has_include(<CFNetwork/CFURLCache.h>)
-#include <CFNetwork/CFURLCache.h>
-#endif
-#if __has_include(<CFNetwork/CFURLCachePriv.h>)
-#include <CFNetwork/CFURLCachePriv.h>
-#endif
-#endif
-
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-typedef const struct _CFURLCache* CFURLCacheRef;
-typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
-extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
-extern "C" CFCachedURLResponseRef CFURLCacheCopyResponseForRequest(CFURLCacheRef, CFURLRequestRef);
-extern "C" CFDataRef _CFCachedURLResponseGetMemMappedData(CFCachedURLResponseRef);
-extern "C" CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
-#endif
-
</del><span class="cx"> @interface NSCachedURLResponse (NSCachedURLResponseDetails)
</span><span class="cx"> -(CFCachedURLResponseRef)_CFCachedURLResponse;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #import "WebProcessMessages.h"
</span><span class="cx"> #import "_WKDownloadDelegate.h"
</span><span class="cx"> #import "_WKProcessPoolConfiguration.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/CertificateInfo.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -49,14 +50,6 @@
</span><span class="cx"> #import "WKGeolocationProviderIOS.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<CFNetwork/CFNSURLConnection.h>)
-#import <CFNetwork/CFNSURLConnection.h>
-#else
-enum : NSUInteger {
- NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
-};
-#endif
-
</del><span class="cx"> @implementation WKProcessPool {
</span><span class="cx"> WebKit::WeakObjCPtr<id <_WKDownloadDelegate>> _downloadDelegate;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WebProcessCreationParameters.h"
</span><span class="cx"> #import "WebProcessMessages.h"
</span><span class="cx"> #import "WindowServerConnection.h"
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/Color.h>
</span><span class="cx"> #import <WebCore/FileSystem.h>
</span><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="lines">@@ -57,17 +58,6 @@
</span><span class="cx"> #import <WebCore/QuickLookMac.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-
-#if __has_include(<CFNetwork/CFURLProtocolPriv.h>)
-#include <CFNetwork/CFURLProtocolPriv.h>
-#else
-extern "C" Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef url, CFURLStorageSessionRef session);
-extern "C" void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef session);
-#endif
-
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (176346 => 176347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-11-19 22:24:16 UTC (rev 176346)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-11-19 22:32:04 UTC (rev 176347)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WebProcessProxyMessages.h"
</span><span class="cx"> #import <JavaScriptCore/Options.h>
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><ins>+#import <WebCore/CFNetworkSPI.h>
</ins><span class="cx"> #import <WebCore/FileSystem.h>
</span><span class="cx"> #import <WebCore/Font.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="lines">@@ -56,12 +57,6 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_MANUAL_WEBPROCESS_SANDBOXING !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-@interface NSURLCache (WKDetails)
--(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
-@end
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre>
</div>
</div>
</body>
</html>