<!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>[204456] 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/204456">204456</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-14 15:42:21 -0700 (Sun, 14 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix compiler errors when building iOS WebKit using the iOS 10 beta SDK
https://bugs.webkit.org/show_bug.cgi?id=160725
Reviewed by Sam Weinig.
Source/WebCore:
* platform/cocoa/ThemeCocoa.mm: Unconditionally include header dlfcn.h as it
exists in both the public iOS 9.3 SDK and iOS 10 beta SDK.
* platform/spi/cocoa/CoreTextSPI.h: Add SPI declarations for constants that were
used in <a href="http://trac.webkit.org/projects/webkit/changeset/204107">r204107</a>.
* platform/spi/cocoa/PassKitSPI.h: Remove unnecessary #import statements when
building with the Apple Internal SDK. Include header PassKit/PassKit.h when
building for iOS.
* platform/spi/cocoa/QuartzCoreSPI.h: No need to define CLayer.contentsFormat
when building with the iOS 10 beta SDK as it is now part of the public API.
Source/WebKit/mac:
OSAtomicCompareAndSwap32() has been deprecated as of the iOS 10 beta SDK. For now,
silence the complier warning.
* WebView/WebView.mm:
(-[WebView _dispatchTileDidDraw:]):
Source/WebKit2:
* Platform/spi/ios/UIKitSPI.h: Add SPI for UITextInputSuggestionDelegate.
* UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm: Remove unnecessary include of PKPaymentMerchantSession.h.
Source/WTF:
For now, disable OS_LOG when building with the iOS 10 beta SDK until
we have the fix for <rdar://problem/27758343>.
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaThemeCocoamm">trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaPassKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</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>
<li><a href="#trunkSourceWebKit2UIProcessApplePayiosWebPaymentCoordinatorProxyIOSmm">trunk/Source/WebKit2/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WTF/ChangeLog 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-14 Daniel Bates <dabates@apple.com>
+
+ Fix compiler errors when building iOS WebKit using the iOS 10 beta SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160725
+
+ Reviewed by Sam Weinig.
+
+ For now, disable OS_LOG when building with the iOS 10 beta SDK until
+ we have the fix for <rdar://problem/27758343>.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-08-13 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix follow-up to r204433.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WTF/wtf/Platform.h 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1175,7 +1175,8 @@
</span><span class="cx"> #define HAVE_COREANIMATION_FENCES 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
</del><ins>+/* FIXME: Enable USE_OS_LOG when building with the public iOS 10 SDK once we fix <rdar://problem/27758343>. */
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 && USE(APPLE_INTERNAL_SDK))
</ins><span class="cx"> #define USE_OS_LOG 1
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #define USE_OS_STATE 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebCore/ChangeLog 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-14 Daniel Bates <dabates@apple.com>
+
+ Fix compiler errors when building iOS WebKit using the iOS 10 beta SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160725
+
+ Reviewed by Sam Weinig.
+
+ * platform/cocoa/ThemeCocoa.mm: Unconditionally include header dlfcn.h as it
+ exists in both the public iOS 9.3 SDK and iOS 10 beta SDK.
+ * platform/spi/cocoa/CoreTextSPI.h: Add SPI declarations for constants that were
+ used in r204107.
+ * platform/spi/cocoa/PassKitSPI.h: Remove unnecessary #import statements when
+ building with the Apple Internal SDK. Include header PassKit/PassKit.h when
+ building for iOS.
+ * platform/spi/cocoa/QuartzCoreSPI.h: No need to define CLayer.contentsFormat
+ when building with the iOS 10 beta SDK as it is now part of the public API.
+
</ins><span class="cx"> 2016-08-14 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Dereferenced NULL pointer in StyleResolver
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaThemeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -27,10 +27,7 @@
</span><span class="cx"> #import "ThemeCocoa.h"
</span><span class="cx">
</span><span class="cx"> #import "GraphicsContext.h"
</span><del>-
-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> #import <dlfcn.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -111,6 +111,16 @@
</span><span class="cx"> extern const CFStringRef kCTUIFontTextStyleCaption2;
</span><span class="cx">
</span><span class="cx"> extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
</span><ins>+
+extern const CGFloat kCTFontWeightUltraLight;
+extern const CGFloat kCTFontWeightThin;
+extern const CGFloat kCTFontWeightLight;
+extern const CGFloat kCTFontWeightRegular;
+extern const CGFloat kCTFontWeightMedium;
+extern const CGFloat kCTFontWeightSemibold;
+extern const CGFloat kCTFontWeightBold;
+extern const CGFloat kCTFontWeightHeavy;
+extern const CGFloat kCTFontWeightBlack;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaPassKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -27,14 +27,17 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-#import <PassKit/PKPaymentAuthorizationViewController.h>
</del><ins>+#import <PassKit/PassKit.h>
</ins><span class="cx"> #import <PassKit/PKPaymentAuthorizationViewController_Private.h>
</span><del>-#import <PassKit/PassKit.h>
</del><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><ins>+#import <PassKit/PassKit.h>
+
+#elif PLATFORM(MAC)
+
</ins><span class="cx"> #import <Contacts/Contacts.h>
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> @property BOOL hitTestsAsOpaque;
</span><span class="cx"> @property BOOL needsLayoutOnGeometryChange;
</span><span class="cx"> @property BOOL shadowPathIsBounds;
</span><del>-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
</del><ins>+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
</ins><span class="cx"> @property (copy) NSString *contentsFormat;
</span><span class="cx"> #endif
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-14 Daniel Bates <dabates@apple.com>
+
+ Fix compiler errors when building iOS WebKit using the iOS 10 beta SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160725
+
+ Reviewed by Sam Weinig.
+
+ OSAtomicCompareAndSwap32() has been deprecated as of the iOS 10 beta SDK. For now,
+ silence the complier warning.
+
+ * WebView/WebView.mm:
+ (-[WebView _dispatchTileDidDraw:]):
+
</ins><span class="cx"> 2016-08-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove always true JSC::Debugger::needPauseHandling virtual method
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1625,8 +1625,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</ins><span class="cx"> if (!OSAtomicCompareAndSwap32(0, 1, &_private->didDrawTiles))
</span><span class="cx"> return;
</span><ins>+#pragma clang diagnostic pop
</ins><span class="cx">
</span><span class="cx"> WebThreadLock();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-14 Daniel Bates <dabates@apple.com>
+
+ Fix compiler errors when building iOS WebKit using the iOS 10 beta SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160725
+
+ Reviewed by Sam Weinig.
+
+ * Platform/spi/ios/UIKitSPI.h: Add SPI for UITextInputSuggestionDelegate.
+ * UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm: Remove unnecessary include of PKPaymentMerchantSession.h.
+
</ins><span class="cx"> 2016-08-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Remove deprecated _WKVisitedLinkProvider declarations that aren’t needed
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -371,6 +371,14 @@
</span><span class="cx"> - (void)willStartScrollingOverflow;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+@class UITextSuggestion;
+
+@protocol UITextInputSuggestionDelegate <UITextInputDelegate>
+- (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
+@end
+#endif
+
</ins><span class="cx"> @interface UIViewController ()
</span><span class="cx"> + (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
</span><span class="cx"> + (UIViewController *)viewControllerForView:(UIView *)view;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePayiosWebPaymentCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm (204455 => 204456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm 2016-08-14 22:38:54 UTC (rev 204455)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm 2016-08-14 22:42:21 UTC (rev 204456)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebPaymentCoordinatorProxyCocoa.h"
</span><span class="cx"> #import <PassKit/PassKit.h>
</span><del>-#import <PassKitCore/PKPaymentMerchantSession.h>
</del><span class="cx"> #import <UIKit/UIViewController.h>
</span><span class="cx"> #import <WebCore/PaymentAuthorizationStatus.h>
</span><span class="cx"> #import <WebCore/SoftLinking.h>
</span></span></pre>
</div>
</div>
</body>
</html>