Title: [250265] branches/safari-608-branch/Source/WebCore
- Revision
- 250265
- Author
- alanc...@apple.com
- Date
- 2019-09-23 16:49:58 -0700 (Mon, 23 Sep 2019)
Log Message
Cherry-pick r250026. rdar://problem/55608017
[Cocoa] Add a WKA extension point
https://bugs.webkit.org/show_bug.cgi?id=201801
<rdar://problem/55372507>
Reviewed by Alexey Proskuryakov.
* Modules/applepay/ApplePayRequestBase.cpp:
(WebCore::requiresSupportedNetworks):
(WebCore::convertAndValidate):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (250264 => 250265)
--- branches/safari-608-branch/Source/WebCore/ChangeLog 2019-09-23 23:33:36 UTC (rev 250264)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-09-23 23:49:58 UTC (rev 250265)
@@ -1,3 +1,31 @@
+2019-09-23 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r250026. rdar://problem/55608017
+
+ [Cocoa] Add a WKA extension point
+ https://bugs.webkit.org/show_bug.cgi?id=201801
+ <rdar://problem/55372507>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Modules/applepay/ApplePayRequestBase.cpp:
+ (WebCore::requiresSupportedNetworks):
+ (WebCore::convertAndValidate):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-09-18 Andy Estes <aes...@apple.com>
+
+ [Cocoa] Add a WKA extension point
+ https://bugs.webkit.org/show_bug.cgi?id=201801
+ <rdar://problem/55372507>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Modules/applepay/ApplePayRequestBase.cpp:
+ (WebCore::requiresSupportedNetworks):
+ (WebCore::convertAndValidate):
+
2019-09-17 Alan Coon <alanc...@apple.com>
Cherry-pick r249954. rdar://problem/55461404
Modified: branches/safari-608-branch/Source/WebCore/Modules/applepay/ApplePayRequestBase.cpp (250264 => 250265)
--- branches/safari-608-branch/Source/WebCore/Modules/applepay/ApplePayRequestBase.cpp 2019-09-23 23:33:36 UTC (rev 250264)
+++ branches/safari-608-branch/Source/WebCore/Modules/applepay/ApplePayRequestBase.cpp 2019-09-23 23:49:58 UTC (rev 250265)
@@ -36,6 +36,7 @@
#else
namespace WebCore {
static void finishConverting(ApplePaySessionPaymentRequest&, ApplePayRequestBase&) { }
+static bool requiresSupportedNetworks(unsigned, const ApplePayRequestBase&) { return true; }
}
#endif
@@ -43,9 +44,6 @@
static ExceptionOr<Vector<String>> convertAndValidate(Document& document, unsigned version, const Vector<String>& supportedNetworks, const PaymentCoordinator& paymentCoordinator)
{
- if (supportedNetworks.isEmpty())
- return Exception { TypeError, "At least one supported network must be provided." };
-
Vector<String> result;
result.reserveInitialCapacity(supportedNetworks.size());
for (auto& supportedNetwork : supportedNetworks) {
@@ -72,6 +70,9 @@
return merchantCapabilities.releaseException();
result.setMerchantCapabilities(merchantCapabilities.releaseReturnValue());
+ if (requiresSupportedNetworks(version, request) && request.supportedNetworks.isEmpty())
+ return Exception { TypeError, "At least one supported network must be provided." };
+
auto supportedNetworks = convertAndValidate(document, version, request.supportedNetworks, paymentCoordinator);
if (supportedNetworks.hasException())
return supportedNetworks.releaseException();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
