<!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>[196148] 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/196148">196148</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-04 13:52:42 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit for iOS Simulator fails to build with public iOS SDK
https://bugs.webkit.org/show_bug.cgi?id=153881
Reviewed by Alex Christensen.
Source/WebCore:
Make constants have internal linkage to match the Apple Internal SDK.
* platform/spi/ios/MobileGestaltSPI.h:
Source/WebKit2:
Add version guards around SPI that is now API as of iOS SDK 9.2. Until we upgrade the iOS EWS
and iOS buildbots to use the 9.2 SDK we need to keep these SPI declarations to avoid breaking
the build.
* Platform/spi/ios/UIKitSPI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosMobileGestaltSPIh">trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196147 => 196148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 21:51:40 UTC (rev 196147)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 21:52:42 UTC (rev 196148)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-04 Daniel Bates <dabates@apple.com>
+
+ WebKit for iOS Simulator fails to build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=153881
+
+ Reviewed by Alex Christensen.
+
+ Make constants have internal linkage to match the Apple Internal SDK.
+
+ * platform/spi/ios/MobileGestaltSPI.h:
+
</ins><span class="cx"> 2016-02-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Object.getOwnPropertyDescriptor() returns incomplete descriptor for instance properties
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosMobileGestaltSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h (196147 => 196148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h 2016-02-04 21:51:40 UTC (rev 196147)
+++ trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h 2016-02-04 21:52:42 UTC (rev 196148)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-EXTERN_C const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
-EXTERN_C const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
-EXTERN_C const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
-EXTERN_C const CFStringRef kMGQiPadCapability = CFSTR("ipad");
-EXTERN_C const CFStringRef kMGQDeviceName = CFSTR("DeviceName");
-EXTERN_C const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
</del><ins>+static const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
+static const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
+static const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
+static const CFStringRef kMGQiPadCapability = CFSTR("ipad");
+static const CFStringRef kMGQDeviceName = CFSTR("DeviceName");
+static const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> MGDeviceClassInvalid = -1,
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196147 => 196148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-04 21:51:40 UTC (rev 196147)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-04 21:52:42 UTC (rev 196148)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-02-04 Daniel Bates <dabates@apple.com>
+
+ WebKit for iOS Simulator fails to build with public iOS SDK
+ https://bugs.webkit.org/show_bug.cgi?id=153881
+
+ Reviewed by Alex Christensen.
+
+ Add version guards around SPI that is now API as of iOS SDK 9.2. Until we upgrade the iOS EWS
+ and iOS buildbots to use the 9.2 SDK we need to keep these SPI declarations to avoid breaking
+ the build.
+
+ * Platform/spi/ios/UIKitSPI.h:
+
</ins><span class="cx"> 2016-02-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Give nested inspectors their own process pool
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (196147 => 196148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-04 21:51:40 UTC (rev 196147)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-04 21:52:42 UTC (rev 196148)
</span><span class="lines">@@ -233,7 +233,9 @@
</span><span class="cx">
</span><span class="cx"> @interface UIGestureRecognizer ()
</span><span class="cx"> - (void)requireOtherGestureToFail:(UIGestureRecognizer *)gestureRecognizer;
</span><ins>+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200
</ins><span class="cx"> @property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;
</span><ins>+#endif
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface UILongPressGestureRecognizer ()
</span><span class="lines">@@ -287,6 +289,7 @@
</span><span class="cx"> - (CADisplay *)_display;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100
</ins><span class="cx"> typedef enum {
</span><span class="cx"> UITouchTypeDirect
</span><span class="cx"> } UITouchType;
</span><span class="lines">@@ -294,6 +297,7 @@
</span><span class="cx"> @interface UITouch ()
</span><span class="cx"> @property(nonatomic,readonly) UITouchType type;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @interface UIScrollView ()
</span><span class="cx"> - (void)_stopScrollingAndZoomingAnimations;
</span></span></pre>
</div>
</div>
</body>
</html>