Bug 173371 – Build WebKit with High Sierra (Seed 1)

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Jonathan Bedard]

WebKit should build with High Sierra.

[Radar WebKit Bug Importer]

<rdar://problem/32770710>

[Jonathan Bedard]

Created attachment 312910 [details]
Patch

[Build Bot]

Attachment 312910 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:54:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:62:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:63:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 3 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Andy Estes]

Comment on attachment 312910 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=312910&action=review

> Source/WebKit2/ChangeLog:12
> +        (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didAuthorizePayment:completion:]):
> +        The current paymentAuthorizationViewController: didAuthorizePayment:handler uses a handler which accepts a
> +        PKPaymentAuthorizationResult instead of a PKPaymentAuthorizationStatus, which is required by
> +        PKPaymentAuthorizationViewControllerDelegate.

This isn't right. The required method in PKPaymentAuthorizationViewControllerDelegate is the one that takes a PKPaymentAuthorizationResult. The one that takes a PKPaymentAuthorizationStatus is deprecated in High Sierra.

[Jonathan Bedard]

Created attachment 312917 [details]
Patch

[Andy Estes]

Comment on attachment 312910 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=312910&action=review

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:259
> +- (_Nonnull id)initWithStatus:(PKPaymentAuthorizationStatus)status errors:(nullable NSArray<NSError *> *)errors;

The return type should be instancetype.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:264
> +- (_Nonnull id)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)paymentSummaryItems;

Ditto.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:268
> +- (_Nonnull id)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;

Ditto.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:269
> +- (_Nonnull id)initWithErrors:(nullable NSArray<NSError *> *)errors paymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;

Ditto.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:289
> +- (void) setRequiredShippingContactFields:(nonnull NSSet*) contactInformation;
> +- (void) setRequiredBillingContactFields:(nonnull NSSet*) contactInformation;

No space after the return type.

[Build Bot]

Attachment 312917 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:54:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:62:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:63:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 3 in 6 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Jiewen Tan]

Comment on attachment 312917 [details]
Patch

Good for WebCrypto part.

[Jonathan Bedard]

Created attachment 312924 [details]
Patch

[Jonathan Bedard]

Attachment 312924 [details] should address Andy's comments in comment 4 and comment 5.

[Build Bot]

Attachment 312924 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:54:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:62:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:63:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 3 in 4 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Andy Estes]

Comment on attachment 312924 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=312924&action=review

> Source/WebCore/platform/spi/cocoa/AVKitSPI.h:241
> +- (id)initWithTitle:(nonnull NSString *)title type:(AVTouchBarMediaSelectionOptionType)type;

instancetype, not id

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:265
> +- (_Nonnull instancetype)initWithStatus:(PKPaymentAuthorizationStatus)status errors:(nullable NSArray<NSError *> *)errors;

I don't think the _Nonnull is right. In general, Objective-C initializers can return nil, and I don't see this annotation in the system header.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:270
> +- (_Nonnull instancetype)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)paymentSummaryItems;

Ditto.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:273
> +@interface PKPaymentRequestShippingContactUpdate

PKPaymentRequestShippingContactUpdate inherits from PKPaymentRequestUpdate.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:275
> +- (_Nonnull instancetype)initWithPaymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;
> +- (_Nonnull instancetype)initWithErrors:(nullable NSArray<NSError *> *)errors paymentSummaryItems:(nonnull NSArray<PKPaymentSummaryItem *> *)summaryItems shippingMethods:(nonnull NSArray<PKShippingMethod *> *)shippingMethods;

Ditto about _Nonnull.

> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:295
> +- (void)setRequiredShippingContactFields:(nonnull NSSet*) contactInformation;
> +- (void)setRequiredBillingContactFields:(nonnull NSSet*) contactInformation;

No space between the argument type and name.

[Andy Estes]

Comment on attachment 312924 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=312924&action=review

>> Source/WebCore/platform/spi/cocoa/PassKitSPI.h:295
>> +- (void)setRequiredBillingContactFields:(nonnull NSSet*) contactInformation;
> 
> No space between the argument type and name.

Also, yes space between NSSet and *.

[Jonathan Bedard]

Created attachment 312985 [details]
Patch

[Build Bot]

Attachment 312985 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/spi/cocoa/PassKitSPI.h:55:  Place brace on its own line for function definitions.  [whitespace/braces] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:62:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
ERROR: Source/WebCore/crypto/CommonCryptoUtilities.h:63:  enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums.  [readability/enum_casing] [4]
Total errors found: 3 in 4 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Commit Bot]

Comment on attachment 312985 [details]
Patch

Clearing flags on attachment: 312985

Committed r218336: <http://trac.webkit.org/changeset/218336>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Jonathan Bedard]

Follow-up fix in <https://trac.webkit.org/changeset/218352/webkit>.