Title: [218336] trunk/Source/WebCore
- Revision
- 218336
- Author
- [email protected]
- Date
- 2017-06-15 09:57:17 -0700 (Thu, 15 Jun 2017)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (218335 => 218336)
--- trunk/Source/WebCore/ChangeLog 2017-06-15 16:24:20 UTC (rev 218335)
+++ trunk/Source/WebCore/ChangeLog 2017-06-15 16:57:17 UTC (rev 218336)
@@ -1,3 +1,17 @@
+2017-06-15 Jonathan Bedard <[email protected]>
+
+ 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 <[email protected]>
RTCPeerConnection returns RTCSessionDescription where RTCSessionDescriptionInit would be appropriate
Modified: trunk/Source/WebCore/crypto/CommonCryptoUtilities.h (218335 => 218336)
--- trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2017-06-15 16:24:20 UTC (rev 218335)
+++ trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2017-06-15 16:57:17 UTC (rev 218336)
@@ -59,7 +59,8 @@
enum {
ccPKCS1Padding = 1001,
- ccOAEPPadding = 1002
+ ccOAEPPadding = 1002,
+ ccRSAPSSPadding = 1005
};
typedef uint32_t CCAsymmetricPadding;
Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (218335 => 218336)
--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-06-15 16:24:20 UTC (rev 218335)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2017-06-15 16:57:17 UTC (rev 218336)
@@ -218,6 +218,13 @@
@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 @@
@property BOOL canShowMediaSelectionButton;
@end
+@interface AVTouchBarMediaSelectionOption : NSObject
+- (instancetype)initWithTitle:(nonnull NSString *)title type:(AVTouchBarMediaSelectionOptionType)type;
+@end
+
@class AVThumbnail;
#endif
Modified: trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (218335 => 218336)
--- trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2017-06-15 16:24:20 UTC (rev 218335)
+++ trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2017-06-15 16:57:17 UTC (rev 218336)
@@ -44,10 +44,21 @@
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 @@
@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 @@
};
#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 @@
@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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
