Changeset 221569 in webkit

Timestamp:

Sep 3, 2017 9:08:46 PM (7 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Tidy up PassKitSPI.h
​https://bugs.webkit.org/show_bug.cgi?id=176323

Reviewed by Darin Adler.

• pal/spi/cocoa/PassKitSPI.h: Moved the declarations of requiredShippingContactFields and requiredBillingContactFields to where other PKPaymentRequest properties are declared, and changed the guard to relate to the SDK version. Replaced use of has_include with checking for the version of the Apple internal SDK in which the typedefs first appeared.

Location:

trunk/Source/WebCore/PAL

Files:

• ChangeLog (modified) (1 diff)
• pal/spi/cocoa/PassKitSPI.h (modified) (4 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2017-09-03  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Tidy up PassKitSPI.h
+        https://bugs.webkit.org/show_bug.cgi?id=176323
+
+        Reviewed by Darin Adler.
+
+        * pal/spi/cocoa/PassKitSPI.h: Moved the declarations of requiredShippingContactFields and
+          requiredBillingContactFields to where other PKPaymentRequest properties are declared, and
+          changed the guard to relate to the SDK version. Replaced use of __has_include with checking for
+          the version of the Apple internal SDK in which the typedefs first appeared.
+
 2017-09-03  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h

@@ -52 +52 @@
 @class PKPaymentRequestShippingContactUpdate;
 
+typedef NSString *PKContactField;
+
 extern NSString * const PKPaymentErrorDomain;
 typedef NS_ERROR_ENUM(PKPaymentErrorDomain, PKPaymentErrorCode) {
@@ -187 +189 @@
 @property (nonatomic, assign) PKShippingType shippingType;
 @property (nonatomic, copy, nullable) NSData *applicationData;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
 @property (nonatomic, copy, nullable) NSSet<NSString *> *supportedCountries;
+@property (nonatomic, strong) NSSet<PKContactField> *requiredShippingContactFields;
+@property (nonatomic, strong) NSSet<PKContactField> *requiredBillingContactFields;
 #endif
 @end
@@ -246 +250 @@
 #endif
 
-#if PLATFORM(MAC) && (!USE(APPLE_INTERNAL_SDK) || !__has_include(<PassKitCore/PKApplePayButton.h>))
+#if PLATFORM(MAC) && (!USE(APPLE_INTERNAL_SDK) || __MAC_OS_X_VERSION_MAX_ALLOWED < 101204)
 typedef NS_ENUM(NSInteger, PKPaymentButtonStyle) {
     PKPaymentButtonStyleWhite = 0,
@@ -299 +303 @@
 @property (nonatomic, strong) NSString *sourceApplicationSecondaryIdentifier;
 @property (nonatomic, strong) NSString *CTDataConnectionServiceType;
-
-#if (PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
-- (void)setRequiredShippingContactFields:(nonnull NSSet *)contactInformation;
-- (void)setRequiredBillingContactFields:(nonnull NSSet *)contactInformation;
-#endif
-
 @end