Changeset 220980 in webkit

Timestamp:

Aug 21, 2017 1:53:16 PM (7 years ago)

Author:

aestes@apple.com

Message:

[Payment Request] Use ExistingExceptionError to propagate JS exceptions thrown during JSON stringification
​https://bugs.webkit.org/show_bug.cgi?id=175776

Reviewed by Darin Adler.

• Modules/paymentrequest/PaymentRequest.cpp:

(WebCore::PaymentRequest::create):

• Modules/paymentrequest/PaymentRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/paymentrequest/PaymentRequest.cpp (modified) (3 diffs)
• Modules/paymentrequest/PaymentRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-21  Andy Estes  <aestes@apple.com>
+
+        [Payment Request] Use ExistingExceptionError to propagate JS exceptions thrown during JSON stringification
+        https://bugs.webkit.org/show_bug.cgi?id=175776
+
+        Reviewed by Darin Adler.
+
+        * Modules/paymentrequest/PaymentRequest.cpp:
+        (WebCore::PaymentRequest::create):
+        * Modules/paymentrequest/PaymentRequest.h:
+
 2017-08-21  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
 

trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp

@@ -160 +160 @@
 // Implements the PaymentRequest Constructor
 // https://www.w3.org/TR/payment-request/#constructor
-ExceptionOr<RefPtr<PaymentRequest>> PaymentRequest::create(Document& document, Vector<PaymentMethodData>&& methodData, PaymentDetailsInit&& details, PaymentOptions&& options)
+ExceptionOr<Ref<PaymentRequest>> PaymentRequest::create(Document& document, Vector<PaymentMethodData>&& methodData, PaymentDetailsInit&& details, PaymentOptions&& options)
 {
     // FIXME: Check if this document is allowed to access the PaymentRequest API based on the allowpaymentrequest attribute.
@@ -180 +180 @@
             serializedData = JSONStringify(document.execState(), paymentMethod.data.get(), 0);
             if (scope.exception())
-                return nullptr;
+                return Exception { ExistingExceptionError };
         }
         serializedMethodData.add(paymentMethod.supportedMethods, WTFMove(serializedData));
@@ -233 +233 @@
             serializedData = JSONStringify(document.execState(), modifier.data.get(), 0);
             if (scope.exception())
-                return nullptr;
+                return Exception { ExistingExceptionError };
         }
         serializedModifierData.uncheckedAppend(WTFMove(serializedData));
     }
 
-    return adoptRef(new PaymentRequest(document, WTFMove(options), WTFMove(details), WTFMove(serializedModifierData), WTFMove(serializedMethodData), WTFMove(selectedShippingOption)));
+    return adoptRef(*new PaymentRequest(document, WTFMove(options), WTFMove(details), WTFMove(serializedModifierData), WTFMove(serializedMethodData), WTFMove(selectedShippingOption)));
 }
 

trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.h

@@ -45 +45 @@
 class PaymentRequest final : public RefCounted<PaymentRequest>, public ActiveDOMObject, public EventTargetWithInlineData {
 public:
-    static ExceptionOr<RefPtr<PaymentRequest>> create(Document&, Vector<PaymentMethodData>&&, PaymentDetailsInit&&, PaymentOptions&&);
+    static ExceptionOr<Ref<PaymentRequest>> create(Document&, Vector<PaymentMethodData>&&, PaymentDetailsInit&&, PaymentOptions&&);
     ~PaymentRequest();