<!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>[176448] 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/176448">176448</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-21 08:40:55 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WebKit2 fails to build with public SDK due to missing SPI from CFNetwork, QuartzCore, MediaPlayer, XPC
https://bugs.webkit.org/show_bug.cgi?id=138930
Reviewed by Anders Carlsson.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Rename header MPAVRoutingControllerSPI.h to MediaPlayerSPI.h.
* loader/cocoa/SubresourceLoaderCocoa.mm: Move NSCachedURLResponse forward declarations to file
CFNetworkSPI.h and include header CFNetworkSPI.h.
* loader/mac/ResourceLoaderMac.mm: Ditto.
* platform/audio/ios/MediaSessionManagerIOS.mm: Substitute MediaPlayerSPI.h for MPAVRoutingControllerSPI.h.
* platform/spi/cf/CFNetworkSPI.h: Add more SPI.
* platform/spi/cg/CoreGraphicsSPI.h: Ditto.
* platform/spi/cocoa/QuartzCoreSPI.h: Ditto.
* platform/spi/ios/MediaPlayerSPI.h: Renamed from Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h.
Source/WebKit2:
* NetworkProcess/mac/NetworkResourceLoaderMac.mm: Remove forward declaration for NSCachedURLResponse
methods as this functionality was incorporated into CFNetworkSPI.h, which is included by this file.
* Platform/mac/LayerHostingContext.mm: Moved QuartzCore forward declarations from this file to file
QuartzCoreSPI.h and included header QuartzCoreSPI.h.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h: Include header XPCSPI.h.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm: Remove forward declarations of
XPC SPI since these declarations are part of XCPSPI.h, which is included by header XPCServiceEntryPoint.h.
* UIProcess/API/Cocoa/WKWebView.mm: Remove unnecessary include of header QuartzCore/CARenderServer.h
as it will be included by header QuartzCoreSPI.h.
* UIProcess/Network/NetworkProcessProxy.cpp: Include header XPCSPI.h when building for iOS with
USE(XPC_SERVICES) enabled.
* UIProcess/ios/forms/WKAirPlayRoutePicker.mm: Include header MediaPlayerSPI.h instead of including
MediaPlayer private headers directly. Also sort the list of #import directives.</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="#trunkSourceWebCoreloadercocoaSubresourceLoaderCocoamm">trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreloadermacResourceLoaderMacmm">trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicfCFNetworkSPIh">trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicgCoreGraphicsSPIh">trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContextmm">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointmm">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKAirPlayRoutePickermm">trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspiiosMediaPlayerSPIh">trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspiiosMPAVRoutingControllerSPIh">trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-21 Daniel Bates <dabates@apple.com>
+
+ [iOS] WebKit2 fails to build with public SDK due to missing SPI from CFNetwork, QuartzCore, MediaPlayer, XPC
+ https://bugs.webkit.org/show_bug.cgi?id=138930
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.xcodeproj/project.pbxproj: Rename header MPAVRoutingControllerSPI.h to MediaPlayerSPI.h.
+ * loader/cocoa/SubresourceLoaderCocoa.mm: Move NSCachedURLResponse forward declarations to file
+ CFNetworkSPI.h and include header CFNetworkSPI.h.
+ * loader/mac/ResourceLoaderMac.mm: Ditto.
+ * platform/audio/ios/MediaSessionManagerIOS.mm: Substitute MediaPlayerSPI.h for MPAVRoutingControllerSPI.h.
+ * platform/spi/cf/CFNetworkSPI.h: Add more SPI.
+ * platform/spi/cg/CoreGraphicsSPI.h: Ditto.
+ * platform/spi/cocoa/QuartzCoreSPI.h: Ditto.
+ * platform/spi/ios/MediaPlayerSPI.h: Renamed from Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h.
+
</ins><span class="cx"> 2014-11-21 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: MathML expressions are misread by VoiceOver
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -5759,7 +5759,7 @@
</span><span class="cx"> CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523A1A16711000864480 /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE12523F1A16AE1200864480 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523E1A16AE1200864480 /* AVKitSPI.h */; };
</span><del>- CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MediaPlayerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> CE1252431A16C01A00864480 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252421A16C01A00864480 /* CoreUISPI.h */; };
</span><span class="cx"> CE1252451A16C22500864480 /* DynamicLinkerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252441A16C22500864480 /* DynamicLinkerSPI.h */; };
</span><span class="cx"> CE1252471A16C2C200864480 /* NSPointerFunctionsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */; };
</span><span class="lines">@@ -13265,7 +13265,7 @@
</span><span class="cx"> CE12523A1A16711000864480 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12523E1A16AE1200864480 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AVKitSPI.h; path = ios/AVKitSPI.h; sourceTree = "<group>"; };
</span><del>- CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MPAVRoutingControllerSPI.h; path = ios/MPAVRoutingControllerSPI.h; sourceTree = "<group>"; };
</del><ins>+ CE1252401A16B1B600864480 /* MediaPlayerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaPlayerSPI.h; path = ios/MediaPlayerSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CE1252421A16C01A00864480 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreUISPI.h; path = ios/CoreUISPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE1252441A16C22500864480 /* DynamicLinkerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPointerFunctionsSPI.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18519,8 +18519,8 @@
</span><span class="cx"> A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */,
</span><span class="cx"> CE12523E1A16AE1200864480 /* AVKitSPI.h */,
</span><span class="cx"> CE1252421A16C01A00864480 /* CoreUISPI.h */,
</span><del>- CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */,
</del><span class="cx"> CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */,
</span><ins>+ CE1252401A16B1B600864480 /* MediaPlayerSPI.h */,
</ins><span class="cx"> CE1252381A166FA000864480 /* QuickLookSPI.h */,
</span><span class="cx"> );
</span><span class="cx"> name = ios;
</span><span class="lines">@@ -25482,7 +25482,7 @@
</span><span class="cx"> 935C476309AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h in Headers */,
</span><span class="cx"> 85031B480A44EFC700F992E0 /* MouseRelatedEvent.h in Headers */,
</span><span class="cx"> 93309DFC099E64920056E581 /* MoveSelectionCommand.h in Headers */,
</span><del>- CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */,
</del><ins>+ CE1252411A16B1B600864480 /* MediaPlayerSPI.h in Headers */,
</ins><span class="cx"> FDB1700614A2BAB200A2B5D9 /* MultiChannelResampler.h in Headers */,
</span><span class="cx"> C6F0900A14327B6100685849 /* MutationCallback.h in Headers */,
</span><span class="cx"> 85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercocoaSubresourceLoaderCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/loader/cocoa/SubresourceLoaderCocoa.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -26,16 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SubresourceLoader.h"
</span><span class="cx">
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "CachedResource.h"
</span><span class="cx"> #include "DiskCacheMonitorCocoa.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><del>-@interface NSCachedURLResponse (Details)
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceLoader.h"
</span><span class="cx">
</span><ins>+#include "CFNetworkSPI.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="lines">@@ -37,13 +38,6 @@
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(CFNETWORK)
-@interface NSCachedURLResponse (Details)
--(id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "Logging.h"
</span><del>-#import "MPAVRoutingControllerSPI.h"
</del><span class="cx"> #import "MediaPlayer.h"
</span><ins>+#import "MediaPlayerSPI.h"
</ins><span class="cx"> #import "MediaSession.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -61,6 +61,13 @@
</span><span class="cx"> typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifdef __OBJC__
+@interface NSCachedURLResponse (Details)
+-(id)_initWithCFCachedURLResponse:(CFCachedURLResponseRef)cachedResponse;
+-(CFCachedURLResponseRef)_CFCachedURLResponse;
+@end
+#endif
+
</ins><span class="cx"> #endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> EXTERN_C void CFURLRequestSetShouldStartSynchronously(CFURLRequestRef, Boolean);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicgCoreGraphicsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -135,6 +135,8 @@
</span><span class="cx"> EXTERN_C void CGImageSetCachingFlags(CGImageRef, CGImageCachingFlags);
</span><span class="cx"> EXTERN_C CGImageCachingFlags CGImageGetCachingFlags(CGImageRef);
</span><span class="cx">
</span><ins>+EXTERN_C CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> EXTERN_C CGSRegionEnumeratorObj CGSRegionEnumerator(CGRegionRef);
</span><span class="cx"> EXTERN_C CGRect* CGSNextRect(const CGSRegionEnumeratorObj);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #include <QuartzCore/CAColorMatrix.h>
</span><ins>+#include <QuartzCore/CARenderServer.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <QuartzCore/CALayerPrivate.h>
</span><span class="lines">@@ -60,6 +61,11 @@
</span><span class="cx"> + (id)objectForSlot:(uint32_t)name;
</span><span class="cx"> - (uint32_t)createImageSlot:(CGSize)size hasAlpha:(BOOL)flag;
</span><span class="cx"> - (void)deleteSlot:(uint32_t)name;
</span><ins>+- (void)invalidate;
+- (void)setFencePort:(mach_port_t)port;
+@property (readonly) uint32_t contextId;
+@property (strong) CALayer *layer;
+@property CGColorSpaceRef colorSpace;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface CALayer (Details)
</span><span class="lines">@@ -103,6 +109,9 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+EXTERN_C void CARenderServerCaptureLayerWithTransform(mach_port_t serverPort, uint32_t clientId, uint64_t layerId,
+ uint32_t slotId, int32_t ox, int32_t oy, const CATransform3D *);
+
</ins><span class="cx"> EXTERN_C NSString * const kCATiledLayerRemoveImmediately;
</span><span class="cx">
</span><span class="cx"> EXTERN_C NSString * const kCAFilterColorInvert;
</span><span class="lines">@@ -111,6 +120,7 @@
</span><span class="cx"> EXTERN_C NSString * const kCAFilterColorHueRotate;
</span><span class="cx"> EXTERN_C NSString * const kCAFilterColorSaturate;
</span><span class="cx"> EXTERN_C NSString * const kCAFilterGaussianBlur;
</span><ins>+EXTERN_C NSString * const kCAFilterPlusD;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> EXTERN_C NSString * const kCAFilterNormalBlendMode;
</span><span class="lines">@@ -127,3 +137,5 @@
</span><span class="cx"> EXTERN_C NSString * const kCAFilterExclusionBlendMode;
</span><span class="cx">
</span><span class="cx"> EXTERN_C NSString * const kCAContextDisplayName;
</span><ins>+EXTERN_C NSString * const kCAContextDisplayId;
+EXTERN_C NSString * const kCAContextIgnoresHitTest;
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosMPAVRoutingControllerSPIh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -1,49 +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. 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/Foundation.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <MediaPlayer/MPAVRoutingController.h>
-
-#else
-
-enum {
- MPRouteDiscoveryModeDisabled = 0,
- MPRouteDiscoveryModePresence = 1,
- MPRouteDiscoveryModeDetailed = 2,
-};
-typedef NSInteger MPRouteDiscoveryMode;
-
-@interface MPAVRoutingController : NSObject
-@end
-
-@interface MPAVRoutingController (Details)
-- (instancetype)initWithName:(NSString *)name;
-@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosMediaPlayerSPIhfromrev176447trunkSourceWebCoreplatformspiiosMPAVRoutingControllerSPIh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (from rev 176447, trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h) (0 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -0,0 +1,73 @@
</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/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <MediaPlayer/MPAVRoutingController.h>
+#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
+#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
+
+#else
+
+enum {
+ MPAVItemTypeUnknown = 0,
+ MPAVItemTypeAudio = 1,
+ MPAVItemTypeVideo = 2,
+};
+typedef NSUInteger MPAVItemType;
+
+enum {
+ MPRouteDiscoveryModeDisabled = 0,
+ MPRouteDiscoveryModePresence = 1,
+ MPRouteDiscoveryModeDetailed = 2,
+};
+typedef NSInteger MPRouteDiscoveryMode;
+
+@interface MPAVRoutingController : NSObject
+@end
+
+@interface MPAVRoutingController (Details)
+- (instancetype)initWithName:(NSString *)name;
+@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
+@end
+
+@interface MPAudioVideoRoutingPopoverController : UIPopoverController
+@end
+
+@interface MPAudioVideoRoutingPopoverController (Details)
+- (id)initWithType:(MPAVItemType)avItemType;
+@end
+
+@interface MPAudioVideoRoutingActionSheet : UIActionSheet
+@end
+
+@interface MPAudioVideoRoutingActionSheet (Details)
+- (id)initWithType:(MPAVItemType)avItemType;
+- (void)showWithValidInterfaceOrientationMaskBlock:(UIInterfaceOrientationMask (^)(void))block completionHandler:(void (^)())completionHandler;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-21 Daniel Bates <dabates@apple.com>
+
+ [iOS] WebKit2 fails to build with public SDK due to missing SPI from CFNetwork, QuartzCore, MediaPlayer, XPC
+ https://bugs.webkit.org/show_bug.cgi?id=138930
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm: Remove forward declaration for NSCachedURLResponse
+ methods as this functionality was incorporated into CFNetworkSPI.h, which is included by this file.
+ * Platform/mac/LayerHostingContext.mm: Moved QuartzCore forward declarations from this file to file
+ QuartzCoreSPI.h and included header QuartzCoreSPI.h.
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h: Include header XPCSPI.h.
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm: Remove forward declarations of
+ XPC SPI since these declarations are part of XCPSPI.h, which is included by header XPCServiceEntryPoint.h.
+ * UIProcess/API/Cocoa/WKWebView.mm: Remove unnecessary include of header QuartzCore/CARenderServer.h
+ as it will be included by header QuartzCoreSPI.h.
+ * UIProcess/Network/NetworkProcessProxy.cpp: Include header XPCSPI.h when building for iOS with
+ USE(XPC_SERVICES) enabled.
+ * UIProcess/ios/forms/WKAirPlayRoutePicker.mm: Include header MediaPlayerSPI.h instead of including
+ MediaPlayer private headers directly. Also sort the list of #import directives.
+
</ins><span class="cx"> 2014-11-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-@interface NSCachedURLResponse (NSCachedURLResponseDetails)
--(CFCachedURLResponseRef)_CFCachedURLResponse;
-@end
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -26,26 +26,9 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "LayerHostingContext.h"
</span><span class="cx">
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><del>-#if __has_include(<QuartzCore/CAContext.h>)
-#import <QuartzCore/CAContext.h>
-#else
-@interface CAContext : NSObject
-@end
-
-@interface CAContext (Details)
-- (void)invalidate;
-@property (readonly) uint32_t contextId;
-@property (strong) CALayer *layer;
-@property CGColorSpaceRef colorSpace;
-- (void)setFencePort:(mach_port_t)port;
-+ (CAContext *)remoteContextWithOptions:(NSDictionary *)dict;
-@end
-#endif
-
-extern NSString * const kCAContextIgnoresHitTest;
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<LayerHostingContext> LayerHostingContext::createForPort(mach_port_t serverPort)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "ChildProcess.h"
</span><span class="cx"> #import "WebKit2Initialize.h"
</span><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><ins>+#import <wtf/spi/darwin/XPCSPI.h>
</ins><span class="cx">
</span><span class="cx"> #if HAVE(VOUCHERS)
</span><span class="cx"> #if __has_include(<os/voucher_private.h>)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -29,13 +29,6 @@
</span><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "XPCServiceEntryPoint.h"
</span><span class="cx">
</span><del>-#if __has_include(<xpc/private.h>)
-#import <xpc/private.h>
-#else
-extern "C" xpc_object_t xpc_connection_copy_entitlement_value(xpc_connection_t connection, const char *entitlement);
-extern "C" mach_port_t xpc_dictionary_copy_mach_send(xpc_object_t, const char*);
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> XPCServiceInitializerDelegate::~XPCServiceInitializerDelegate()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> #import <UIKit/UIDevice_Private.h>
</span><span class="cx"> #import <UIKit/UIPeripheralHost_Private.h>
</span><span class="cx"> #import <UIKit/UIWindow_Private.h>
</span><del>-#import <QuartzCore/CARenderServer.h>
</del><span class="cx"> #import <WebCore/CoreGraphicsSPI.h>
</span><span class="cx"> #import <WebCore/InspectorOverlay.h>
</span><span class="cx"> #import <WebCore/QuartzCoreSPI.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx"> #include "SecItemShimProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS) && USE(XPC_SERVICES)
+#include <wtf/spi/darwin/XPCSPI.h>
+#endif
+
</ins><span class="cx"> #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection())
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKAirPlayRoutePickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (176447 => 176448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 15:55:01 UTC (rev 176447)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-21 16:40:55 UTC (rev 176448)
</span><span class="lines">@@ -31,13 +31,10 @@
</span><span class="cx"> #import "WKContentView.h"
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><del>-#import <MediaPlayer/MPAVItem.h>
-#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
-#import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
-#import <WebCore/MPAVRoutingControllerSPI.h>
-#import <WebCore/SoftLinking.h>
</del><span class="cx"> #import <UIKit/UIApplication_Private.h>
</span><span class="cx"> #import <UIKit/UIWindow_Private.h>
</span><ins>+#import <WebCore/MediaPlayerSPI.h>
+#import <WebCore/SoftLinking.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(MediaPlayer)
</span></span></pre>
</div>
</div>
</body>
</html>