Changeset 246863 in webkit

Timestamp:

Jun 26, 2019 5:39:29 PM (5 years ago)

Author:

aestes@apple.com

Message:

[Payment Request] Set state to Closed when show() is called during an active session
​https://bugs.webkit.org/show_bug.cgi?id=199239

Reviewed by Alex Christensen.

Source/WebCore:

According to step 7 of ​https://w3c.github.io/payment-request/#show-method (as of 26 June
2019), when another payment request is showing, calling show() should set the state?
internal slot to Closed in addition to rejecting the show promise with an AbortError. WebKit
was only doing the latter. Let's do both.

Test: http/tests/paymentrequest/payment-is-showing.https.html

• Modules/paymentrequest/PaymentRequest.cpp:

(WebCore::PaymentRequest::show):

LayoutTests:

Copied from web-platform-tests/payment-request/payment-is-showing.https.html and modified to
use UIHelper instead of test_driver.bless.

• http/tests/paymentrequest/payment-is-showing.https-expected.txt: Added.
• http/tests/paymentrequest/payment-is-showing.https.html: Added.
• http/tests/paymentrequest/resources/blank.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/paymentrequest/payment-is-showing.https-expected.txt (added)
• LayoutTests/http/tests/paymentrequest/payment-is-showing.https.html (added)
• LayoutTests/http/tests/paymentrequest/resources/blank.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-26  Andy Estes  <aestes@apple.com>
+
+        [Payment Request] Set state to Closed when show() is called during an active session
+        https://bugs.webkit.org/show_bug.cgi?id=199239
+
+        Reviewed by Alex Christensen.
+
+        Copied from web-platform-tests/payment-request/payment-is-showing.https.html and modified to
+        use UIHelper instead of test_driver.bless.
+
+        * http/tests/paymentrequest/payment-is-showing.https-expected.txt: Added.
+        * http/tests/paymentrequest/payment-is-showing.https.html: Added.
+        * http/tests/paymentrequest/resources/blank.html: Added.
+
 2019-06-26  Russell Epstein  <russell_e@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-26  Andy Estes  <aestes@apple.com>
+
+        [Payment Request] Set state to Closed when show() is called during an active session
+        https://bugs.webkit.org/show_bug.cgi?id=199239
+
+        Reviewed by Alex Christensen.
+
+        According to step 7 of https://w3c.github.io/payment-request/#show-method (as of 26 June
+        2019), when another payment request is showing, calling show() should set the [[state]]
+        internal slot to Closed in addition to rejecting the show promise with an AbortError. WebKit
+        was only doing the latter. Let's do both.
+
+        Test: http/tests/paymentrequest/payment-is-showing.https.html
+
+        * Modules/paymentrequest/PaymentRequest.cpp:
+        (WebCore::PaymentRequest::show):
+
 2019-06-26  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -405 +405 @@
     if (PaymentHandler::hasActiveSession(document)) {
         promise.reject(Exception { AbortError });
+        m_state = State::Closed;
         return;
     }