Title: [272252] branches/safari-611-branch/Source/WebCore
- Revision
- 272252
- Author
- [email protected]
- Date
- 2021-02-02 17:39:32 -0800 (Tue, 02 Feb 2021)
Log Message
Cherry-pick r271704. rdar://problem/73890824
[Payment Request] increment the current version
https://bugs.webkit.org/show_bug.cgi?id=220807
<rdar://problem/68622300>
Reviewed by Andy Estes.
* Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm:
(WebCore::PaymentAPIVersion::current):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271704 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (272251 => 272252)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-03 01:39:29 UTC (rev 272251)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-02-03 01:39:32 UTC (rev 272252)
@@ -1,5 +1,32 @@
2021-02-02 Alan Coon <[email protected]>
+ Cherry-pick r271704. rdar://problem/73890824
+
+ [Payment Request] increment the current version
+ https://bugs.webkit.org/show_bug.cgi?id=220807
+ <rdar://problem/68622300>
+
+ Reviewed by Andy Estes.
+
+ * Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm:
+ (WebCore::PaymentAPIVersion::current):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271704 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-01-21 Devin Rousso <[email protected]>
+
+ [Payment Request] increment the current version
+ https://bugs.webkit.org/show_bug.cgi?id=220807
+ <rdar://problem/68622300>
+
+ Reviewed by Andy Estes.
+
+ * Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm:
+ (WebCore::PaymentAPIVersion::current):
+
+2021-02-02 Alan Coon <[email protected]>
+
Cherry-pick r271644. rdar://problem/73890311
[css-multicol] OOM with 1px height columns
Modified: branches/safari-611-branch/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm (272251 => 272252)
--- branches/safari-611-branch/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm 2021-02-03 01:39:29 UTC (rev 272251)
+++ branches/safari-611-branch/Source/WebCore/Modules/applepay/cocoa/PaymentAPIVersionCocoa.mm 2021-02-03 01:39:32 UTC (rev 272252)
@@ -35,7 +35,9 @@
unsigned PaymentAPIVersion::current()
{
static unsigned current = [] {
-#if HAVE(PASSKIT_NEW_BUTTON_TYPES)
+#if ENABLE(APPLE_PAY_SESSION_V11)
+ return 11;
+#elif HAVE(PASSKIT_NEW_BUTTON_TYPES)
return 10;
#elif HAVE(PASSKIT_INSTALLMENTS)
if (PAL::getPKPaymentInstallmentConfigurationClass()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
