Attachment 348799 Details for Bug 189253 – Patch

[patch] Patch

bug-189253-20180903181813.patch (text/plain), 30.22 KB, created by Andy Estes on 2018-09-03 18:18:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-09-03 18:18:16 PDT

Size: 30.22 KB

patch

obsolete

>Subversion Revision: 235601
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 52544211ce30a096636aa4bf5f737b6efc01acb4..fe54740a081fcff7a4217e58dc50aeb29d34a737 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,31 @@
>+2018-09-03  Andy Estes  <aestes@apple.com>
>+
>+        [Payment Request] Add a stub for PaymentResponse.retry
>+        https://bugs.webkit.org/show_bug.cgi?id=189253
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Implemented the AddressErrors, PayerErrorFields, and PaymentValidationErrors dictionaries as
>+        defined in the Payment Request API W3C Editor's Draft of 30 August 2018.
>+
>+        Also added a stub implementation of PaymentResponse.retry. This method will be implemented
>+        with tests in a follow-up patch.
>+
>+        * CMakeLists.txt:
>+        * DerivedSources.make:
>+        * Modules/paymentrequest/AddressErrors.h: Added.
>+        * Modules/paymentrequest/AddressErrors.idl: Added.
>+        * Modules/paymentrequest/PayerErrorFields.h: Added.
>+        * Modules/paymentrequest/PayerErrorFields.idl: Added.
>+        * Modules/paymentrequest/PaymentResponse.cpp:
>+        (WebCore::PaymentResponse::retry):
>+        * Modules/paymentrequest/PaymentResponse.h:
>+        * Modules/paymentrequest/PaymentResponse.idl:
>+        * Modules/paymentrequest/PaymentValidationErrors.h: Added.
>+        * Modules/paymentrequest/PaymentValidationErrors.idl: Added.
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2018-09-03  Andy Estes  <aestes@apple.com>
> 
>         [Payment Request] Implement the MerchantValidationEvent constructor
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index b4b85de7b38cc42f3ee51d4e0c88d11acea455a0..d17ba57de20b4beaca54533dad47ac46a5e0fb8b 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -333,8 +333,10 @@ set(WebCore_NON_SVG_IDL_FILES
>     Modules/notifications/NotificationPermission.idl
>     Modules/notifications/NotificationPermissionCallback.idl
> 
>+    Modules/paymentrequest/AddressErrors.idl
>     Modules/paymentrequest/MerchantValidationEvent.idl
>     Modules/paymentrequest/MerchantValidationEventInit.idl
>+    Modules/paymentrequest/PayerErrorFields.idl
>     Modules/paymentrequest/PaymentAddress.idl
>     Modules/paymentrequest/PaymentComplete.idl
>     Modules/paymentrequest/PaymentCurrencyAmount.idl
>@@ -353,6 +355,7 @@ set(WebCore_NON_SVG_IDL_FILES
>     Modules/paymentrequest/PaymentResponse.idl
>     Modules/paymentrequest/PaymentShippingOption.idl
>     Modules/paymentrequest/PaymentShippingType.idl
>+    Modules/paymentrequest/PaymentValidationErrors.idl
> 
>     Modules/speech/DOMWindowSpeechSynthesis.idl
>     Modules/speech/SpeechSynthesis.idl
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index eb8a804c65b254de178f62ba5fa65aa422699d07..5b753d8fdeb773bd5ec0bfcf5b79653dfa6f70a7 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -253,8 +253,10 @@ JS_BINDING_IDLS = \
>     $(WebCore)/Modules/notifications/Notification.idl \
>     $(WebCore)/Modules/notifications/NotificationPermission.idl \
>     $(WebCore)/Modules/notifications/NotificationPermissionCallback.idl \
>+    $(WebCore)/Modules/paymentrequest/AddressErrors.idl \
>     $(WebCore)/Modules/paymentrequest/MerchantValidationEvent.idl \
>     $(WebCore)/Modules/paymentrequest/MerchantValidationEventInit.idl \
>+    $(WebCore)/Modules/paymentrequest/PayerErrorFields.idl \
>     $(WebCore)/Modules/paymentrequest/PaymentAddress.idl \
>     $(WebCore)/Modules/paymentrequest/PaymentComplete.idl \
>     $(WebCore)/Modules/paymentrequest/PaymentCurrencyAmount.idl \
>@@ -273,6 +275,7 @@ JS_BINDING_IDLS = \
>     $(WebCore)/Modules/paymentrequest/PaymentResponse.idl \
>     $(WebCore)/Modules/paymentrequest/PaymentShippingOption.idl \
>     $(WebCore)/Modules/paymentrequest/PaymentShippingType.idl \
>+    $(WebCore)/Modules/paymentrequest/PaymentValidationErrors.idl \
>     $(WebCore)/Modules/plugins/QuickTimePluginReplacement.idl \
>     $(WebCore)/Modules/quota/DOMWindowQuota.idl \
>     $(WebCore)/Modules/quota/NavigatorStorageQuota.idl \
>diff --git a/Source/WebCore/Modules/paymentrequest/AddressErrors.h b/Source/WebCore/Modules/paymentrequest/AddressErrors.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..fc37acbc2d7c208584e382d3b8f19d61c5c1dc95
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/AddressErrors.h
>@@ -0,0 +1,51 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(PAYMENT_REQUEST)
>+
>+#include <wtf/text/WTFString.h>
>+
>+namespace WebCore {
>+
>+struct AddressErrors {
>+    String addressLine;
>+    String city;
>+    String country;
>+    String dependentLocality;
>+    String languageCode;
>+    String organization;
>+    String phone;
>+    String postalCode;
>+    String recipient;
>+    String region;
>+    String regionCode;
>+    String sortingCode;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ENABLE(PAYMENT_REQUEST)
>diff --git a/Source/WebCore/Modules/paymentrequest/AddressErrors.idl b/Source/WebCore/Modules/paymentrequest/AddressErrors.idl
>new file mode 100644
>index 0000000000000000000000000000000000000000..cce9717f7ede4a4f37d6d9e0b1557399a3a69699
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/AddressErrors.idl
>@@ -0,0 +1,41 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+[
>+    Conditional=PAYMENT_REQUEST,
>+] dictionary AddressErrors {
>+    DOMString addressLine;
>+    DOMString city;
>+    DOMString country;
>+    DOMString dependentLocality;
>+    DOMString languageCode;
>+    DOMString organization;
>+    DOMString phone;
>+    DOMString postalCode;
>+    DOMString recipient;
>+    DOMString region;
>+    DOMString regionCode;
>+    DOMString sortingCode;
>+};
>diff --git a/Source/WebCore/Modules/paymentrequest/PayerErrorFields.h b/Source/WebCore/Modules/paymentrequest/PayerErrorFields.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..054953709cafa71b3f66aba392fd0d98af35c8c2
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/PayerErrorFields.h
>@@ -0,0 +1,42 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(PAYMENT_REQUEST)
>+
>+#include <wtf/text/WTFString.h>
>+
>+namespace WebCore {
>+
>+struct PayerErrorFields {
>+    String email;
>+    String name;
>+    String phone;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ENABLE(PAYMENT_REQUEST)
>diff --git a/Source/WebCore/Modules/paymentrequest/PayerErrorFields.idl b/Source/WebCore/Modules/paymentrequest/PayerErrorFields.idl
>new file mode 100644
>index 0000000000000000000000000000000000000000..4f2f1607f107f09407cf49663c669abb06e1b61d
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/PayerErrorFields.idl
>@@ -0,0 +1,32 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+[
>+    Conditional=PAYMENT_REQUEST,
>+] dictionary PayerErrorFields {
>+    DOMString email;
>+    DOMString name;
>+    DOMString phone;
>+};
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp b/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp
>index 2aeaedf0b588b63866d1f19d9551057165742037..63cf29d658890bd8e1f068d244777cee9aecd405 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp
>@@ -28,6 +28,7 @@
> 
> #if ENABLE(PAYMENT_REQUEST)
> 
>+#include "NotImplemented.h"
> #include "PaymentRequest.h"
> #include <wtf/RunLoop.h>
> 
>@@ -52,6 +53,12 @@ void PaymentResponse::complete(std::optional<PaymentComplete>&& result, DOMPromi
>     promise.resolve();
> }
> 
>+void PaymentResponse::retry(PaymentValidationErrors&&, DOMPromiseDeferred<void>&& promise)
>+{
>+    notImplemented();
>+    promise.reject(Exception { NotSupportedError });
>+}
>+
> } // namespace WebCore
> 
> #endif // ENABLE(PAYMENT_REQUEST)
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentResponse.h b/Source/WebCore/Modules/paymentrequest/PaymentResponse.h
>index 810626b5a36704dd5d28370460ebe3d0ea91fd83..e265ebc34fe584c548c0463dd0c06713f3942a1a 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentResponse.h
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentResponse.h
>@@ -32,9 +32,10 @@
> #include "PaymentComplete.h"
> 
> namespace WebCore {
>-    
>+
> class Document;
> class PaymentRequest;
>+struct PaymentValidationErrors;
> 
> class PaymentResponse final : public RefCounted<PaymentResponse> {
> public:
>@@ -70,6 +71,7 @@ public:
>     void setPayerPhone(const String& payerPhone) { m_payerPhone = payerPhone; }
> 
>     void complete(std::optional<PaymentComplete>&&, DOMPromiseDeferred<void>&&);
>+    void retry(PaymentValidationErrors&&, DOMPromiseDeferred<void>&&);
> 
> private:
>     explicit PaymentResponse(PaymentRequest&);
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentResponse.idl b/Source/WebCore/Modules/paymentrequest/PaymentResponse.idl
>index 113d22d26ff76e906a07d9dffba6bccfb256b6a4..ae24519a781ec519c4fe2f2e6ca1e8d349973f52 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentResponse.idl
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentResponse.idl
>@@ -40,5 +40,6 @@
>     readonly attribute DOMString? payerEmail;
>     readonly attribute DOMString? payerPhone;
> 
>-    Promise<void> complete(optional PaymentComplete result = "unknown");
>+    [NewObject] Promise<void> complete(optional PaymentComplete result = "unknown");
>+    [NewObject] Promise<void> retry(PaymentValidationErrors errorFields);
> };
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.h b/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..c7a5bdb9ed1e2b1a62b1c74560a043790539b51f
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.h
>@@ -0,0 +1,45 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(PAYMENT_REQUEST)
>+
>+#include "AddressErrors.h"
>+#include "PayerErrorFields.h"
>+#include <JavaScriptCore/Strong.h>
>+
>+namespace WebCore {
>+
>+struct PaymentValidationErrors {
>+    PayerErrorFields payer;
>+    AddressErrors shippingAddress;
>+    String error;
>+    JSC::Strong<JSC::JSObject> paymentMethod;
>+};
>+
>+} // namespace WebCore
>+
>+#endif // ENABLE(PAYMENT_REQUEST)
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.idl b/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.idl
>new file mode 100644
>index 0000000000000000000000000000000000000000..c9f715376b4ef519f7d666df57bc142928523f08
>--- /dev/null
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentValidationErrors.idl
>@@ -0,0 +1,33 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+[
>+    Conditional=PAYMENT_REQUEST,
>+] dictionary PaymentValidationErrors {
>+    PayerErrorFields payer;
>+    AddressErrors shippingAddress;
>+    DOMString error;
>+    object paymentMethod;
>+};
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 56bf39bc2bfd4523eb8670c9f32c29b01e81f59f..26fbe219d91d7d8706cc8bb5126eceb0afbbc84b 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -2397,6 +2397,7 @@ JSAbortController.cpp
> JSAbortSignal.cpp
> JSAbstractWorker.cpp
> JSAccessibleSetValueEvent.cpp
>+JSAddressErrors.cpp
> JSAesCbcCfbParams.cpp
> JSAesCtrParams.cpp
> JSAesGcmParams.cpp
>@@ -2811,6 +2812,7 @@ JSPageTransitionEvent.cpp
> JSPannerNode.cpp
> JSParentNode.cpp
> JSPath2D.cpp
>+JSPayerErrorFields.cpp
> JSPaymentAddress.cpp
> JSPaymentComplete.cpp
> JSPaymentCurrencyAmount.cpp
>@@ -2829,6 +2831,7 @@ JSPaymentRequestUpdateEventInit.cpp
> JSPaymentResponse.cpp
> JSPaymentShippingOption.cpp
> JSPaymentShippingType.cpp
>+JSPaymentValidationErrors.cpp
> JSPbkdf2Params.cpp
> JSPerformance.cpp
> JSPerformanceEntry.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index fd5fbfa3f4c545bdc294cfc079a5f777047260d7..5fc769034437b27d7bd54ee630615cfd801d3c3d 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -2925,6 +2925,12 @@
> 		A164A2562134C1CC00509156 /* JSPaymentMethodChangeEventInit.h in Headers */ = {isa = PBXBuildFile; fileRef = A164A2522134C1CB00509156 /* JSPaymentMethodChangeEventInit.h */; };
> 		A1677DE9213CDFAA00A08C34 /* MerchantValidationEventInit.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677DE6213CDFAA00A08C34 /* MerchantValidationEventInit.h */; };
> 		A1677DF0213CE0B100A08C34 /* JSMerchantValidationEventInit.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677DEE213CE0B000A08C34 /* JSMerchantValidationEventInit.h */; };
>+		A1677DFD213E006600A08C34 /* PaymentValidationErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677DFA213E006600A08C34 /* PaymentValidationErrors.h */; };
>+		A1677E03213E01C700A08C34 /* JSPaymentValidationErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677E01213E01C500A08C34 /* JSPaymentValidationErrors.h */; };
>+		A1677E08213E024C00A08C34 /* PayerErrorFields.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677E05213E024C00A08C34 /* PayerErrorFields.h */; };
>+		A1677E0E213E02A000A08C34 /* AddressErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677E0B213E02A000A08C34 /* AddressErrors.h */; };
>+		A1677E13213E03C600A08C34 /* JSAddressErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677E11213E03C500A08C34 /* JSAddressErrors.h */; };
>+		A1677E17213E03F100A08C34 /* JSPayerErrorFields.h in Headers */ = {isa = PBXBuildFile; fileRef = A1677E15213E03F000A08C34 /* JSPayerErrorFields.h */; };
> 		A1763F3F1E205234001D58DE /* WebArchiveDumpSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = A1763F3D1E205234001D58DE /* WebArchiveDumpSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A1763F411E20586E001D58DE /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1763F401E20586E001D58DE /* CFNetwork.framework */; };
> 		A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
>@@ -10940,6 +10946,18 @@
> 		A1677DE8213CDFAA00A08C34 /* MerchantValidationEventInit.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MerchantValidationEventInit.idl; sourceTree = "<group>"; };
> 		A1677DED213CE0AF00A08C34 /* JSMerchantValidationEventInit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMerchantValidationEventInit.cpp; sourceTree = "<group>"; };
> 		A1677DEE213CE0B000A08C34 /* JSMerchantValidationEventInit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMerchantValidationEventInit.h; sourceTree = "<group>"; };
>+		A1677DFA213E006600A08C34 /* PaymentValidationErrors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentValidationErrors.h; sourceTree = "<group>"; };
>+		A1677DFC213E006600A08C34 /* PaymentValidationErrors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = PaymentValidationErrors.idl; sourceTree = "<group>"; };
>+		A1677E01213E01C500A08C34 /* JSPaymentValidationErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPaymentValidationErrors.h; sourceTree = "<group>"; };
>+		A1677E02213E01C600A08C34 /* JSPaymentValidationErrors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPaymentValidationErrors.cpp; sourceTree = "<group>"; };
>+		A1677E05213E024C00A08C34 /* PayerErrorFields.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PayerErrorFields.h; sourceTree = "<group>"; };
>+		A1677E07213E024C00A08C34 /* PayerErrorFields.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = PayerErrorFields.idl; sourceTree = "<group>"; };
>+		A1677E0B213E02A000A08C34 /* AddressErrors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AddressErrors.h; sourceTree = "<group>"; };
>+		A1677E0D213E02A000A08C34 /* AddressErrors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = AddressErrors.idl; sourceTree = "<group>"; };
>+		A1677E11213E03C500A08C34 /* JSAddressErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAddressErrors.h; sourceTree = "<group>"; };
>+		A1677E12213E03C600A08C34 /* JSAddressErrors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAddressErrors.cpp; sourceTree = "<group>"; };
>+		A1677E15213E03F000A08C34 /* JSPayerErrorFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPayerErrorFields.h; sourceTree = "<group>"; };
>+		A1677E16213E03F000A08C34 /* JSPayerErrorFields.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPayerErrorFields.cpp; sourceTree = "<group>"; };
> 		A1763F3C1E205234001D58DE /* WebArchiveDumpSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebArchiveDumpSupport.mm; sourceTree = "<group>"; };
> 		A1763F3D1E205234001D58DE /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebArchiveDumpSupport.h; sourceTree = "<group>"; };
> 		A1763F401E20586E001D58DE /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
>@@ -21240,10 +21258,14 @@
> 		A1CC564A1F4613BB00A4555B /* PaymentRequest */ = {
> 			isa = PBXGroup;
> 			children = (
>+				A1677E12213E03C600A08C34 /* JSAddressErrors.cpp */,
>+				A1677E11213E03C500A08C34 /* JSAddressErrors.h */,
> 				A11AE0D01FFD61DE0047348B /* JSMerchantValidationEvent.cpp */,
> 				A11AE0D11FFD61DF0047348B /* JSMerchantValidationEvent.h */,
> 				A1677DED213CE0AF00A08C34 /* JSMerchantValidationEventInit.cpp */,
> 				A1677DEE213CE0B000A08C34 /* JSMerchantValidationEventInit.h */,
>+				A1677E16213E03F000A08C34 /* JSPayerErrorFields.cpp */,
>+				A1677E15213E03F000A08C34 /* JSPayerErrorFields.h */,
> 				A1CC565F1F46146100A4555B /* JSPaymentAddress.cpp */,
> 				A1CC56651F46146800A4555B /* JSPaymentAddress.h */,
> 				A1CC56601F46146200A4555B /* JSPaymentComplete.cpp */,
>@@ -21280,6 +21302,8 @@
> 				A1CC56591F46145C00A4555B /* JSPaymentShippingOption.h */,
> 				A1CC565E1F46146100A4555B /* JSPaymentShippingType.cpp */,
> 				A1CC56501F46145300A4555B /* JSPaymentShippingType.h */,
>+				A1677E02213E01C600A08C34 /* JSPaymentValidationErrors.cpp */,
>+				A1677E01213E01C500A08C34 /* JSPaymentValidationErrors.h */,
> 			);
> 			name = PaymentRequest;
> 			sourceTree = "<group>";
>@@ -21300,11 +21324,15 @@
> 		A1F76B0E1F44C0CF0014C318 /* paymentrequest */ = {
> 			isa = PBXGroup;
> 			children = (
>+				A1677E0B213E02A000A08C34 /* AddressErrors.h */,
>+				A1677E0D213E02A000A08C34 /* AddressErrors.idl */,
> 				A11AE0CA1FFD60530047348B /* MerchantValidationEvent.cpp */,
> 				A11AE0C91FFD60530047348B /* MerchantValidationEvent.h */,
> 				A11AE0CB1FFD60530047348B /* MerchantValidationEvent.idl */,
> 				A1677DE6213CDFAA00A08C34 /* MerchantValidationEventInit.h */,
> 				A1677DE8213CDFAA00A08C34 /* MerchantValidationEventInit.idl */,
>+				A1677E05213E024C00A08C34 /* PayerErrorFields.h */,
>+				A1677E07213E024C00A08C34 /* PayerErrorFields.idl */,
> 				A1CFE0311F9E71290065C345 /* PaymentAddress.cpp */,
> 				A1F76B401F44CF7F0014C318 /* PaymentAddress.h */,
> 				A1F76B421F44CF7F0014C318 /* PaymentAddress.idl */,
>@@ -21349,6 +21377,8 @@
> 				A1F76B541F44D2C70014C318 /* PaymentShippingOption.idl */,
> 				A1F76B461F44D07A0014C318 /* PaymentShippingType.h */,
> 				A1F76B481F44D07A0014C318 /* PaymentShippingType.idl */,
>+				A1677DFA213E006600A08C34 /* PaymentValidationErrors.h */,
>+				A1677DFC213E006600A08C34 /* PaymentValidationErrors.idl */,
> 			);
> 			path = paymentrequest;
> 			sourceTree = "<group>";
>@@ -26996,6 +27026,7 @@
> 				E1C4DE690EA75C1E0023CCD6 /* ActiveDOMObject.h in Headers */,
> 				724EE5501DC80D7F00A91FFB /* ActivityState.h in Headers */,
> 				724EE5511DC80D8400A91FFB /* ActivityStateChangeObserver.h in Headers */,
>+				A1677E0E213E02A000A08C34 /* AddressErrors.h in Headers */,
> 				BCF7E491137CD7C7001DDAE7 /* AdjustViewSizeOrNot.h in Headers */,
> 				84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */,
> 				83BB5C881D5D6F45005A71F4 /* AllDescendantsCollection.h in Headers */,
>@@ -28342,6 +28373,7 @@
> 				7C30D9841F815AEC00268356 /* JSAbortController.h in Headers */,
> 				7C30D9861F815AEC00268356 /* JSAbortSignal.h in Headers */,
> 				418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
>+				A1677E13213E03C600A08C34 /* JSAddressErrors.h in Headers */,
> 				5704405A1E53936200356601 /* JSAesCbcCfbParams.h in Headers */,
> 				57E1E5AD1E8DD09B00EE37C9 /* JSAesCtrParams.h in Headers */,
> 				57B5F8101E5E2A4E00F34F90 /* JSAesGcmParams.h in Headers */,
>@@ -28800,6 +28832,7 @@
> 				E1284BB110449FFA00EAEB52 /* JSPageTransitionEvent.h in Headers */,
> 				FDA15EB212B03EE1003A583A /* JSPannerNode.h in Headers */,
> 				7C193C031F5E11050088F3E6 /* JSPath2D.h in Headers */,
>+				A1677E17213E03F100A08C34 /* JSPayerErrorFields.h in Headers */,
> 				A1CC56671F46147A00A4555B /* JSPaymentAddress.h in Headers */,
> 				A1CC56691F46148000A4555B /* JSPaymentComplete.h in Headers */,
> 				A1CC566B1F46148500A4555B /* JSPaymentCurrencyAmount.h in Headers */,
>@@ -28818,6 +28851,7 @@
> 				A1CC567B1F4614AD00A4555B /* JSPaymentResponse.h in Headers */,
> 				A1CC567D1F4614B200A4555B /* JSPaymentShippingOption.h in Headers */,
> 				A1CC567F1F4614B700A4555B /* JSPaymentShippingType.h in Headers */,
>+				A1677E03213E01C700A08C34 /* JSPaymentValidationErrors.h in Headers */,
> 				57E657F01E71665400F941CA /* JSPbkdf2Params.h in Headers */,
> 				8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */,
> 				CB38FD521CCF939400592A3F /* JSPerformanceEntry.h in Headers */,
>@@ -29573,6 +29607,7 @@
> 				2D5002FC1B56D7990020AAF7 /* PathUtilities.h in Headers */,
> 				A8FA6E5D0E4CFDED00D5CF49 /* Pattern.h in Headers */,
> 				B22279710D00BF220071B782 /* PatternAttributes.h in Headers */,
>+				A1677E08213E024C00A08C34 /* PayerErrorFields.h in Headers */,
> 				1A8A643A1D19FC5300D0E00F /* Payment.h in Headers */,
> 				A1F76B431F44CF7F0014C318 /* PaymentAddress.h in Headers */,
> 				1AE96A881D1A0CEB00B86768 /* PaymentAuthorizationStatus.h in Headers */,
>@@ -29603,6 +29638,7 @@
> 				A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */,
> 				A1F76B551F44D2C70014C318 /* PaymentShippingOption.h in Headers */,
> 				A1F76B491F44D07A0014C318 /* PaymentShippingType.h in Headers */,
>+				A1677DFD213E006600A08C34 /* PaymentValidationErrors.h in Headers */,
> 				B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,
> 				5E2C43511BCEE2F60001E2BC /* PeerConnectionBackend.h in Headers */,
> 				5EBB89391C77C39900C65D41 /* PeerMediaDescription.h in Headers */,

Actions: View | Formatted Diff | Diff

Attachments on bug 189253: 348799