<!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>[190336] 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/190336">190336</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-29 18:30:22 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WebKit for iOS Simulator build with the public iOS 9 SDK
https://bugs.webkit.org/show_bug.cgi?id=149652
Reviewed by Simon Fraser.
Source/WebCore:
* WebCore.xcodeproj/project.pbxproj: Add private header pthreadSPI.h. Also move entry for IDBTransaction.h so that it is in sorted order.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Substitute AVPlayerViewControllerDelegate_WebKitOnly for AVPlayerViewControllerDelegate.
* platform/spi/cocoa/AVKitSPI.h: As of iOS 9, AVPlayerViewControllerDelegate is a public protocol. Separate out WebKit-specific SPI into protocol
AVPlayerViewControllerDelegate_WebKitOnly, which extends AVPlayerViewControllerDelegate. Also, the properties -[AVPlayerViewController allowsPictureInPicturePlayback] and -[AVPlayerViewController delegate] are public in iOS 9.
* platform/spi/cocoa/pthreadSPI.h: Added.
* platform/spi/ios/LaunchServicesSPI.h: Add more SPI.
* platform/spi/ios/MediaPlayerSPI.h: Ignore deprecation warnings for UIPopoverController and UIActionSheet.
Source/WebKit2:
* Platform/spi/ios/SafariServicesSPI.h: Add definition for SFSafariViewController.
* Platform/spi/ios/UIKitSPI.h: Add more SPI.
* WebProcess/cocoa/WebProcessCocoa.mm: Include header pthreadSPI.h.</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="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaAVKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosLaunchServicesSPIh">trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosMediaPlayerSPIh">trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosSafariServicesSPIh">trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspicocoapthreadSPIh">trunk/Source/WebCore/platform/spi/cocoa/pthreadSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/ChangeLog 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-29 Daniel Bates <dabates@apple.com>
+
+ Make WebKit for iOS Simulator build with the public iOS 9 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=149652
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.xcodeproj/project.pbxproj: Add private header pthreadSPI.h. Also move entry for IDBTransaction.h so that it is in sorted order.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Substitute AVPlayerViewControllerDelegate_WebKitOnly for AVPlayerViewControllerDelegate.
+ * platform/spi/cocoa/AVKitSPI.h: As of iOS 9, AVPlayerViewControllerDelegate is a public protocol. Separate out WebKit-specific SPI into protocol
+ AVPlayerViewControllerDelegate_WebKitOnly, which extends AVPlayerViewControllerDelegate. Also, the properties -[AVPlayerViewController allowsPictureInPicturePlayback] and -[AVPlayerViewController delegate] are public in iOS 9.
+ * platform/spi/cocoa/pthreadSPI.h: Added.
+ * platform/spi/ios/LaunchServicesSPI.h: Add more SPI.
+ * platform/spi/ios/MediaPlayerSPI.h: Ignore deprecation warnings for UIPopoverController and UIActionSheet.
+
</ins><span class="cx"> 2015-09-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Followup to "Move WebKit2 AsyncTask to WebCore CrossThreadTask."
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -6027,6 +6027,7 @@
</span><span class="cx"> CECADFCE1537791D00E37068 /* TextInsertionBaseCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = CECADFCC1537791D00E37068 /* TextInsertionBaseCommand.h */; };
</span><span class="cx"> CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */ = {isa = PBXBuildFile; fileRef = CECCFC3A141973D5002A0AC1 /* DecodeEscapeSequences.h */; };
</span><span class="cx"> CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ CEE27ACB1BBB53A20072400A /* pthreadSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CEE27ACA1BBB53A20072400A /* pthreadSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> CEEFCD7919DB31F7003876D7 /* MediaResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEEFCD7719DB31F7003876D7 /* MediaResourceLoader.cpp */; };
</span><span class="cx"> CEEFCD7A19DB31F7003876D7 /* MediaResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = CEEFCD7819DB31F7003876D7 /* MediaResourceLoader.h */; };
</span><span class="cx"> CEEFCD7C19DB33DC003876D7 /* PlatformMediaResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = CEEFCD7B19DB33DC003876D7 /* PlatformMediaResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -13778,6 +13779,7 @@
</span><span class="cx"> CECADFCC1537791D00E37068 /* TextInsertionBaseCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInsertionBaseCommand.h; sourceTree = "<group>"; };
</span><span class="cx"> CECCFC3A141973D5002A0AC1 /* DecodeEscapeSequences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecodeEscapeSequences.h; sourceTree = "<group>"; };
</span><span class="cx"> CEDA12D6152CA1CB00D9E08D /* AlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextClient.h; sourceTree = "<group>"; };
</span><ins>+ CEE27ACA1BBB53A20072400A /* pthreadSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pthreadSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CEEC6034187DD962003E43BB /* TextTrackRepresentationIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> CEEFCD7719DB31F7003876D7 /* MediaResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaResourceLoader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CEEFCD7819DB31F7003876D7 /* MediaResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaResourceLoader.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16981,6 +16983,7 @@
</span><span class="cx"> 371783391AACDCF7000910E3 /* SecuritySPI.h */,
</span><span class="cx"> CEC337AC1A46071F009B8523 /* ServersSPI.h */,
</span><span class="cx"> A19D93451A9FEC7200B46C24 /* WebFilterEvaluatorSPI.h */,
</span><ins>+ CEE27ACA1BBB53A20072400A /* pthreadSPI.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -25473,6 +25476,7 @@
</span><span class="cx"> 516D7D721BB5F0BD00AF7C77 /* IDBConnectionToClientDelegate.h in Headers */,
</span><span class="cx"> 51F41A7C1BA73B5B002E053B /* IDBPendingTransactionMonitor.h in Headers */,
</span><span class="cx"> 5103105D1BA8DB56003329C0 /* IDBRequestImpl.h in Headers */,
</span><ins>+ 5185FCAD1BB4C4E80012898F /* IDBTransaction.h in Headers */,
</ins><span class="cx"> 51F41A741BA73B5B002E053B /* IDBTransactionBackend.h in Headers */,
</span><span class="cx"> 51F41A761BA73B5B002E053B /* IDBTransactionBackendOperations.h in Headers */,
</span><span class="cx"> 51F41A781BA73B5B002E053B /* IDBTransactionCoordinator.h in Headers */,
</span><span class="lines">@@ -26608,9 +26612,9 @@
</span><span class="cx"> 51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */,
</span><span class="cx"> 1AF8E11A1256592600230FF7 /* ProxyServer.h in Headers */,
</span><span class="cx"> FF945ECC161F7F3600971BC8 /* PseudoElement.h in Headers */,
</span><del>- 5185FCAD1BB4C4E80012898F /* IDBTransaction.h in Headers */,
</del><span class="cx"> 0081FF0016B0A2D3008AAA7A /* PublicSuffix.h in Headers */,
</span><span class="cx"> 10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */,
</span><ins>+ CEE27ACB1BBB53A20072400A /* pthreadSPI.h in Headers */,
</ins><span class="cx"> 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
</span><span class="cx"> CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */,
</span><span class="cx"> 442AF7A9102CDDEA008FD4D3 /* QuickLook.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> @class WebAVMediaSelectionOption;
</span><span class="cx">
</span><del>-@interface WebAVPlayerController : NSObject <AVPlayerViewControllerDelegate> {
</del><ins>+@interface WebAVPlayerController : NSObject <AVPlayerViewControllerDelegate_WebKitOnly> {
</ins><span class="cx"> WebAVMediaSelectionOption *_currentAudioMediaSelectionOption;
</span><span class="cx"> WebAVMediaSelectionOption *_currentLegibleMediaSelectionOption;
</span><span class="cx"> BOOL _pictureInPictureInterrupted;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -74,7 +74,13 @@
</span><span class="cx"> - (void)stopRoutingVideoToPictureInPicturePlayerLayerView;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
</ins><span class="cx"> @protocol AVPlayerViewControllerDelegate <NSObject>
</span><ins>+- (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
+@end
+#endif
+
+@protocol AVPlayerViewControllerDelegate_WebKitOnly <AVPlayerViewControllerDelegate>
</ins><span class="cx"> @optional
</span><span class="cx"> typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
</span><span class="cx"> AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped,
</span><span class="lines">@@ -84,7 +90,6 @@
</span><span class="cx"> AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted
</span><span class="cx"> };
</span><span class="cx"> - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
</span><del>-- (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface AVPlayerViewController ()
</span><span class="lines">@@ -96,9 +101,11 @@
</span><span class="cx"> - (void)startPictureInPicture;
</span><span class="cx"> - (void)stopPictureInPicture;
</span><span class="cx">
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
</ins><span class="cx"> @property (nonatomic) BOOL allowsPictureInPicturePlayback;
</span><ins>+@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
+#endif
</ins><span class="cx"> @property (nonatomic, strong) AVPlayerController *playerController;
</span><del>-@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoapthreadSPIhfromrev190335trunkSourceWebCoreplatformspiiosLaunchServicesSPIh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/spi/cocoa/pthreadSPI.h (from rev 190335, trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h) (0 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/pthreadSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/pthreadSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2015 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 PthreadSPI_h
+#define PthreadSPI_h
+
+#include <pthread.h>
+
+WTF_EXTERN_C_BEGIN
+
+int pthread_set_fixedpriority_self(void);
+
+WTF_EXTERN_C_END
+
+#endif // PthreadSPI_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosLaunchServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -36,17 +36,31 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+@class LSAppLink;
+typedef void (^LSAppLinkCompletionHandler)(LSAppLink *appLink, NSError *error);
</ins><span class="cx"> typedef void (^LSAppLinkOpenCompletionHandler)(BOOL success, NSError *error);
</span><span class="cx">
</span><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</span><ins>+@interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding>
+@end
+
+@interface LSBundleProxy : LSResourceProxy <NSSecureCoding>
+@end
+
+@interface LSApplicationProxy : LSBundleProxy <NSSecureCoding>
+- (NSString *)localizedNameForContext:(NSString *)context;
+@end
+
</ins><span class="cx"> @interface LSAppLink : NSObject <NSSecureCoding>
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface LSAppLink ()
</span><ins>++ (void)getAppLinkWithURL:(NSURL *)aURL completionHandler:(LSAppLinkCompletionHandler)completionHandler;
</ins><span class="cx"> + (void)openWithURL:(NSURL *)aURL completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
</span><span class="cx"> - (void)openInWebBrowser:(BOOL)inWebBrowser setAppropriateOpenStrategyAndWebBrowserState:(NSDictionary<NSString *, id> *)state completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
</span><ins>+@property (readonly, strong) LSApplicationProxy *targetApplicationProxy;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosMediaPlayerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebCore/platform/spi/ios/MediaPlayerSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -60,15 +60,21 @@
</span><span class="cx"> @property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> @interface MPAudioVideoRoutingPopoverController : UIPopoverController
</span><span class="cx"> @end
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> @interface MPAudioVideoRoutingPopoverController ()
</span><span class="cx"> - (id)initWithType:(MPAVItemType)avItemType;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> @interface MPAudioVideoRoutingActionSheet : UIActionSheet
</span><span class="cx"> @end
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> @interface MPAudioVideoRoutingActionSheet ()
</span><span class="cx"> - (id)initWithType:(MPAVItemType)avItemType;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-29 Daniel Bates <dabates@apple.com>
+
+ Make WebKit for iOS Simulator build with the public iOS 9 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=149652
+
+ Reviewed by Simon Fraser.
+
+ * Platform/spi/ios/SafariServicesSPI.h: Add definition for SFSafariViewController.
+ * Platform/spi/ios/UIKitSPI.h: Add more SPI.
+ * WebProcess/cocoa/WebProcessCocoa.mm: Include header pthreadSPI.h.
+
</ins><span class="cx"> 2015-09-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Followup to "Move WebKit2 AsyncTask to WebCore CrossThreadTask."
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosSafariServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #if HAVE(SAFARI_SERVICES_FRAMEWORK) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</span><span class="cx">
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span><ins>+#import <SafariServices/SFSafariViewController.h>
</ins><span class="cx">
</span><span class="cx"> @class _WKActivatedElementInfo;
</span><span class="cx"> @class _WKElementAction;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -89,6 +89,42 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><ins>+#if HAVE(LINK_PREVIEW)
+typedef NS_ENUM(NSInteger, UIPreviewItemType) {
+ UIPreviewItemTypeNone,
+ UIPreviewItemTypeClientCustom,
+ UIPreviewItemTypeLink,
+ UIPreviewItemTypeImage,
+ UIPreviewItemTypeText,
+};
+
+@class UIPreviewItemController;
+
+@protocol UIPreviewItemDelegate <NSObject>
+- (NSDictionary *)_dataForPreviewItemController:(UIPreviewItemController *)controller atPosition:(CGPoint)position type:(UIPreviewItemType *)type;
+@optional
+- (BOOL)_interactionShouldBeginFromPreviewItemController:(UIPreviewItemController *)controller forPosition:(CGPoint)position;
+- (void)_interactionStartedFromPreviewItemController:(UIPreviewItemController *)controller;
+- (void)_interactionStoppedFromPreviewItemController:(UIPreviewItemController *)controller;
+- (UIViewController *)_presentedViewControllerForPreviewItemController:(UIPreviewItemController *)controller;
+- (void)_previewItemController:(UIPreviewItemController *)controller didDismissPreview:(UIViewController *)viewController committing:(BOOL)committing;
+- (void)_previewItemController:(UIPreviewItemController *)controller commitPreview:(UIViewController *)viewController;
+- (void)_previewItemControllerDidCancelPreview:(UIPreviewItemController *)controller;
+- (UIImage *)_presentationSnapshotForPreviewItemController:(UIPreviewItemController *)controller;
+- (NSArray *)_presentationRectsForPreviewItemController:(UIPreviewItemController *)controller;
+- (CGRect)_presentationRectForPreviewItemController:(UIPreviewItemController *)controller;
+@end
+
+@interface UIPreviewItemController : NSObject
+- (instancetype)initWithView:(UIView *)view;
+@property (assign, nonatomic) id<UIPreviewItemDelegate> delegate;
+@property (assign, nonatomic, readonly) UIPreviewItemType type;
+@property (strong, nonatomic, readonly) NSDictionary *previewData;
+@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationGestureRecognizer;
+@property (strong, nonatomic, readonly) UIGestureRecognizer *presentationSecondaryGestureRecognizer;
+@end
+#endif
+
</ins><span class="cx"> @interface UIAlertController ()
</span><span class="cx"> - (void)_addActionWithTitle:(NSString *)title style:(UIAlertActionStyle)style handler:(void (^)(void))handler;
</span><span class="cx"> - (void)_addActionWithTitle:(NSString *)title style:(UIAlertActionStyle)style handler:(void (^)(void))handler shouldDismissHandler:(BOOL (^)(void))shouldDismissHandler;
</span><span class="lines">@@ -559,6 +595,9 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, assign, getter=isNextEnabled) BOOL nextEnabled;
</span><span class="cx"> @property (nonatomic, assign, getter=isPreviousEnabled) BOOL previousEnabled;
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+- (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol UIWebFormAccessoryDelegate
</span><span class="lines">@@ -805,4 +844,6 @@
</span><span class="cx"> extern NSString *const UIKeyInputPageUp;
</span><span class="cx"> extern NSString *const UIKeyInputPageDown;
</span><span class="cx">
</span><ins>+extern const NSString *UIPreviewDataLink;
+
</ins><span class="cx"> WTF_EXTERN_C_END
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (190335 => 190336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-09-30 01:20:23 UTC (rev 190335)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-09-30 01:30:22 UTC (rev 190336)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import <WebCore/MemoryCache.h>
</span><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><span class="cx"> #import <WebCore/PageCache.h>
</span><ins>+#import <WebCore/pthreadSPI.h>
</ins><span class="cx"> #import <WebCore/VNodeTracker.h>
</span><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span></span></pre>
</div>
</div>
</body>
</html>