Bug 212000 – http/tests/ssl/applepay/ApplePayInstallmentConfiguration.https.html fails in public SDK builds

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Andy Estes]

https://build.webkit.org/results/Apple-Catalina-Release-WK2-Tests/r261793%20(5612)/results.html

>CONSOLE MESSAGE: InvalidAccessError: "8" is not a supported version.

This is because HAVE(PASSKIT_INSTALLMENTS) is 0 in public SDK builds.

[Andy Estes]

Skipped test in r261795: <https://trac.webkit.org/changeset/261795>

[Radar WebKit Bug Importer]

<rdar://problem/63323082>

[Andy Estes]

Created attachment 399612 [details]
Patch

[Andy Estes]

Created attachment 399613 [details]
Patch

[Andy Estes]

Created attachment 399616 [details]
Patch

[Andy Estes]

Created attachment 399617 [details]
Patch

[youenn fablet]

Comment on attachment 399617 [details]
Patch

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

> Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:-67
> -

There is probably still one instance of ENABLE_APPLE_PAY_SESSION_V9 in Features.xcconfig.
Is that expected?

> Source/WTF/wtf/PlatformEnableCocoa.h:58
> +#endif

So ENABLE(APPLE_PAY_SESSION_V9) is no longer defined which means PaymentCoordinatorClient::supportsVersion will always return version 8.
Should we have a case with ENABLE_APPLE_PAY_SESSION_V9 equal to 1?

> Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h:362
> +#if HAVE(PASSKIT_INSTALLMENTS)

This one is not needed given the previous HAVE(PASSKIT_INSTALLMENTS).

> Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h:368
> +#if HAVE(PASSKIT_INSTALLMENTS)

Ditto.

> Source/WebKit/Shared/WebCoreArgumentCoders.h:883
> +#endif

We usually try to have these defined in the class header itself.
Looking at PaymentInstallmentConfigurationWebCore.h, it is using HAVE(PASSKIT_INSTALLMENTS).
I guess it could be transitioned to ENABLE(APPLE_PAY_INSTALLMENTS) as well.

[Andy Estes]

Comment on attachment 399617 [details]
Patch

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

>> Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:-67
>> -
> 
> There is probably still one instance of ENABLE_APPLE_PAY_SESSION_V9 in Features.xcconfig.
> Is that expected?

I’ll also remove $(ENABLE_APPLE_PAY_SESSION_V9) from all the FEATURE_DEFINES variables. I don’t see any other hits for ENABLE_APPLE_PAY_SESSION_V9 in .xcconfig files.

>> Source/WTF/wtf/PlatformEnableCocoa.h:58
>> +#endif
> 
> So ENABLE(APPLE_PAY_SESSION_V9) is no longer defined which means PaymentCoordinatorClient::supportsVersion will always return version 8.
> Should we have a case with ENABLE_APPLE_PAY_SESSION_V9 equal to 1?

For now, ENABLE_APPLE_PAY_SESSION_V9 is being defined in AdditionalFeatureDefines.h.

[Andy Estes]

Created attachment 399657 [details]
Patch for landing

[Andy Estes]

Created attachment 399663 [details]
Patch for landing

[EWS]

Committed r261845: <https://trac.webkit.org/changeset/261845>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 399663 [details].

[Peng Liu]

Reopening to attach new patch.

[Peng Liu]

Created attachment 399712 [details]
Patch for landing

[EWS]

ChangeLog entry in LayoutTests/ChangeLog is not at the top of the file.

[Peng Liu]

Comment on attachment 399712 [details]
Patch for landing

This is a wrong patch.

[Peng Liu]

Revert the changes made by a wrong "webkit-patch" command.