Build WebKit with High Sierra (Seed 1)
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jun 2017 16:57:17 +0000 (16:57 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Jun 2017 16:57:17 +0000 (16:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173371

Reviewed by Andy Estes.

* crypto/CommonCryptoUtilities.h: Added ccRSAPSSPadding to CCAsymmetricPading enum.
* platform/spi/cocoa/AVKitSPI.h: Declare AVKit SPI used by WebKit in High Sierra.
(-[AVTouchBarPlaybackControlsControlling NS_ENUM]): Added AVTouchBarMediaSelectionOptionType
SPI used in WebPlaybackControlManager in High Sierra.
* platform/spi/cocoa/PassKitSPI.h: Declare PassKit SPI used by WebKit in High Sierra.
(NS_ERROR_ENUM): Added PKPaymentErrorCode used in WebPayment in High Sierra.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/crypto/CommonCryptoUtilities.h
Source/WebCore/platform/spi/cocoa/AVKitSPI.h
Source/WebCore/platform/spi/cocoa/PassKitSPI.h

index 040da3b..83dcad0 100644 (file)
@@ -1,3 +1,17 @@
+2017-06-15  Jonathan Bedard  <jbedard@apple.com>
+
+        Build WebKit with High Sierra (Seed 1)
+        https://bugs.webkit.org/show_bug.cgi?id=173371
+
+        Reviewed by Andy Estes.
+
+        * crypto/CommonCryptoUtilities.h: Added ccRSAPSSPadding to CCAsymmetricPading enum.
+        * platform/spi/cocoa/AVKitSPI.h: Declare AVKit SPI used by WebKit in High Sierra.
+        (-[AVTouchBarPlaybackControlsControlling NS_ENUM]): Added AVTouchBarMediaSelectionOptionType
+        SPI used in WebPlaybackControlManager in High Sierra.
+        * platform/spi/cocoa/PassKitSPI.h: Declare PassKit SPI used by WebKit in High Sierra.
+        (NS_ERROR_ENUM): Added PKPaymentErrorCode used in WebPayment in High Sierra.
+
 2017-06-15  Youenn Fablet  <youenn@apple.com>
 
         RTCPeerConnection returns RTCSessionDescription where RTCSessionDescriptionInit would be appropriate
index 8ad4d5c..e614960 100644 (file)
@@ -59,7 +59,8 @@ typedef uint32_t CCRSAKeyType;
 
 enum {
     ccPKCS1Padding = 1001,
-    ccOAEPPadding = 1002
+    ccOAEPPadding = 1002,
+    ccRSAPSSPadding = 1005
 };
 typedef uint32_t CCAsymmetricPadding;
 
index e1be2b4..ad3aac2 100644 (file)
@@ -218,6 +218,13 @@ __attribute__((availability(macosx,obsoleted=10.13))) @interface AVFunctionBarSc
 @property (readonly, getter=isPictureInPictureActive) BOOL pictureInPictureActive;
 @property (readonly) BOOL canTogglePictureInPicture;
 - (void)togglePictureInPicture;
+
+typedef NS_ENUM(NSInteger, AVTouchBarMediaSelectionOptionType) {
+    AVTouchBarMediaSelectionOptionTypeRegular,
+    AVTouchBarMediaSelectionOptionTypeLegibleOff,
+    AVTouchBarMediaSelectionOptionTypeLegibleAuto,
+};
+
 @end
 
 @interface AVTouchBarPlaybackControlsProvider : NSResponder
@@ -230,6 +237,10 @@ __attribute__((availability(macosx,obsoleted=10.13))) @interface AVFunctionBarSc
 @property BOOL canShowMediaSelectionButton;
 @end
 
+@interface AVTouchBarMediaSelectionOption : NSObject
+- (instancetype)initWithTitle:(nonnull NSString *)title type:(AVTouchBarMediaSelectionOptionType)type;
+@end
+
 @class AVThumbnail;
 
 #endif
index 57bd040..8b5b923 100644 (file)
 NS_ASSUME_NONNULL_BEGIN
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+
 @class PKPaymentAuthorizationResult;
+@class PKPaymentRequestUpdate;
 @class PKPaymentRequestPaymentMethodUpdate;
 @class PKPaymentRequestShippingMethodUpdate;
 @class PKPaymentRequestShippingContactUpdate;
+
+extern NSString * const PKPaymentErrorDomain;
+typedef NS_ERROR_ENUM(PKPaymentErrorDomain, PKPaymentErrorCode) {
+    PKPaymentUnknownError = -1,
+    PKPaymentShippingContactInvalidError = 1,
+    PKPaymentBillingContactInvalidError,
+    PKPaymentShippingAddressUnserviceableError,
+};
+
 #endif
 
 typedef NS_OPTIONS(NSUInteger, PKAddressField) {
@@ -188,7 +199,13 @@ typedef NSString * PKPaymentNetwork NS_EXTENSIBLE_STRING_ENUM;
 
 @protocol PKPaymentAuthorizationViewControllerDelegate <NSObject>
 @required
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment handler:(void (^)(PKPaymentAuthorizationResult *result))completion;
+#else
 - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment completion:(void (^)(PKPaymentAuthorizationStatus status))completion;
+#endif
+
 - (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller;
 
 @optional
@@ -243,6 +260,31 @@ typedef NS_ENUM(NSInteger, PKPaymentButtonType) {
 };
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PKPaymentAuthorizationResult : NSObject
+- (instancetype)initWithStatus:(PKPaymentAuthorizationStatus)status errors:(nullable NSArray<NSError *> *)errors;
+@property (nonatomic, assign) PKPaymentAuthorizationStatus status;
+@end
+
+@interface PKPaymentRequestPaymentMethodUpdate : NSObject
+- (instancetype)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)paymentSummaryItems;
+@end
+
+@interface PKPaymentRequestUpdate : NSObject
+@end
+
+@interface PKPaymentRequestShippingContactUpdate : PKPaymentRequestUpdate
+- (instancetype)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;
+- (instancetype)initWithErrors:(nullable NSArray<NSError *> *)errors paymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+
 extern "C"
 void PKDrawApplePayButton(_Nonnull CGContextRef, CGRect drawRect, CGFloat scale, PKPaymentButtonType, PKPaymentButtonStyle, NSString * _Nullable languageCode);
 
@@ -256,6 +298,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSString *sourceApplicationBundleIdentifier;
 @property (nonatomic, strong) NSString *sourceApplicationSecondaryIdentifier;
 @property (nonatomic, strong) NSString *CTDataConnectionServiceType;
+
+- (void)setRequiredShippingContactFields:(nonnull NSSet *)contactInformation;
+- (void)setRequiredBillingContactFields:(nonnull NSSet *)contactInformation;
 @end
 
 NS_ASSUME_NONNULL_END