[webkit-changes] [204456] trunk/Source

Sun, 14 Aug 2016 15:43:03 -0700

Title: [204456] trunk/Source
Revision
204456
Author
[email protected]
Date
2016-08-14 15:42:21 -0700 (Sun, 14 Aug 2016)

Log Message

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 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.

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:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (204455 => 204456)


--- 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)
@@ -1,3 +1,15 @@
+2016-08-14  Daniel Bates  <[email protected]>
+
+        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:
+
 2016-08-13  Dan Bernstein  <[email protected]>
 
         Build fix follow-up to r204433.

Modified: trunk/Source/WTF/wtf/Platform.h (204455 => 204456)


--- 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)
@@ -1175,7 +1175,8 @@
 #define HAVE_COREANIMATION_FENCES 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+/* 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))
 #define USE_OS_LOG 1
 #if USE(APPLE_INTERNAL_SDK)
 #define USE_OS_STATE 1

Modified: trunk/Source/WebCore/ChangeLog (204455 => 204456)


--- 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)
@@ -1,3 +1,20 @@
+2016-08-14  Daniel Bates  <[email protected]>
+
+        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.
+
 2016-08-14  Jonathan Bedard  <[email protected]>
 
         Dereferenced NULL pointer in StyleResolver

Modified: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm (204455 => 204456)


--- 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)
@@ -27,10 +27,7 @@
 #import "ThemeCocoa.h"
 
 #import "GraphicsContext.h"
-
-#if USE(APPLE_INTERNAL_SDK)
 #import <dlfcn.h>
-#endif
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (204455 => 204456)


--- 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)
@@ -111,6 +111,16 @@
 extern const CFStringRef kCTUIFontTextStyleCaption2;
 
 extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
+
+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;
 #endif
 
 #if PLATFORM(IOS)

Modified: trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (204455 => 204456)


--- 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)
@@ -27,14 +27,17 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#import <PassKit/PKPaymentAuthorizationViewController.h>
+#import <PassKit/PassKit.h>
 #import <PassKit/PKPaymentAuthorizationViewController_Private.h>
-#import <PassKit/PassKit.h>
 
 #else
 
-#if PLATFORM(MAC)
+#if PLATFORM(IOS)
 
+#import <PassKit/PassKit.h>
+
+#elif PLATFORM(MAC)
+
 #import <Contacts/Contacts.h>
 #import <Foundation/Foundation.h>

Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (204455 => 204456)


--- 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)
@@ -88,7 +88,7 @@
 @property BOOL hitTestsAsOpaque;
 @property BOOL needsLayoutOnGeometryChange;
 @property BOOL shadowPathIsBounds;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
 @property (copy) NSString *contentsFormat;
 #endif
 @end

Modified: trunk/Source/WebKit/mac/ChangeLog (204455 => 204456)


--- 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)
@@ -1,3 +1,16 @@
+2016-08-14  Daniel Bates  <[email protected]>
+
+        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:]):
+
 2016-08-12  Joseph Pecoraro  <[email protected]>
 
         Remove always true JSC::Debugger::needPauseHandling virtual method

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (204455 => 204456)


--- 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)
@@ -1625,8 +1625,11 @@
         return;
     }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (!OSAtomicCompareAndSwap32(0, 1, &_private->didDrawTiles))
         return;
+#pragma clang diagnostic pop
 
     WebThreadLock();

Modified: trunk/Source/WebKit2/ChangeLog (204455 => 204456)


--- 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)
@@ -1,3 +1,13 @@
+2016-08-14  Daniel Bates  <[email protected]>
+
+        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.
+
 2016-08-14  Dan Bernstein  <[email protected]>
 
         [Cocoa] Remove deprecated _WKVisitedLinkProvider declarations that aren’t needed

Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (204455 => 204456)


--- 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)
@@ -371,6 +371,14 @@
 - (void)willStartScrollingOverflow;
 @end
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+@class UITextSuggestion;
+
+@protocol UITextInputSuggestionDelegate <UITextInputDelegate>
+- (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
+@end
+#endif
+
 @interface UIViewController ()
 + (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
 + (UIViewController *)viewControllerForView:(UIView *)view;

Modified: trunk/Source/WebKit2/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm (204455 => 204456)


--- 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)
@@ -32,7 +32,6 @@
 #import "WebPageProxy.h"
 #import "WebPaymentCoordinatorProxyCocoa.h"
 #import <PassKit/PassKit.h>
-#import <PassKitCore/PKPaymentMerchantSession.h>
 #import <UIKit/UIViewController.h>
 #import <WebCore/PaymentAuthorizationStatus.h>
 #import <WebCore/SoftLinking.h>

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to