Changeset 206176 in webkit

Timestamp:

Sep 20, 2016 2:43:26 PM (8 years ago)

Author:

andersca@apple.com

Message:

Can't present a payment sheet if a sheet is already active in another window
​https://bugs.webkit.org/show_bug.cgi?id=162314
rdar://problem/27643511

Reviewed by Tim Horton.

Instead of keeping track of whether a sheet is active or not, keep track of its underlying payment coordinator proxy,
so we can hide it and send a cancel event to WebCore if another sheet is being presented.

• UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:

(WebKit::WebPaymentCoordinatorProxy::~WebPaymentCoordinatorProxy):
(WebKit::WebPaymentCoordinatorProxy::showPaymentUI):
(WebKit::WebPaymentCoordinatorProxy::didReachFinalState):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-20  Anders Carlsson  <andersca@apple.com>
+
+        Can't present a payment sheet if a sheet is already active in another window
+        https://bugs.webkit.org/show_bug.cgi?id=162314
+        rdar://problem/27643511
+
+        Reviewed by Tim Horton.
+
+        Instead of keeping track of whether a sheet is active or not, keep track of its underlying payment coordinator proxy,
+        so we can hide it and send a cancel event to WebCore if another sheet is being presented.
+
+        * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
+        (WebKit::WebPaymentCoordinatorProxy::~WebPaymentCoordinatorProxy):
+        (WebKit::WebPaymentCoordinatorProxy::showPaymentUI):
+        (WebKit::WebPaymentCoordinatorProxy::didReachFinalState):
+
 2016-09-20  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp

@@ -37 +37 @@
 namespace WebKit {
 
-static bool isShowingPaymentUI;
+static WebPaymentCoordinatorProxy* activePaymentCoordinatorProxy;
 
 WebPaymentCoordinatorProxy::WebPaymentCoordinatorProxy(WebPageProxy& webPageProxy)
@@ -50 +50 @@
 WebPaymentCoordinatorProxy::~WebPaymentCoordinatorProxy()
 {
+    if (activePaymentCoordinatorProxy == this)
+        activePaymentCoordinatorProxy = nullptr;
+
     if (m_state != State::Idle)
         hidePaymentUI();
@@ -78 +81 @@
     ASSERT(canBegin());
 
-    if (isShowingPaymentUI) {
-        result = false;
-        return;
-    }
-    isShowingPaymentUI = true;
+    if (activePaymentCoordinatorProxy) {
+        activePaymentCoordinatorProxy->hidePaymentUI();
+        activePaymentCoordinatorProxy->didCancelPayment();
+    }
+
+    activePaymentCoordinatorProxy = this;
 
     m_state = State::Activating;
@@ -332 +336 @@
     m_merchantValidationState = MerchantValidationState::Idle;
 
-    ASSERT(isShowingPaymentUI);
-    isShowingPaymentUI = false;
+    ASSERT(activePaymentCoordinatorProxy == this);
+    activePaymentCoordinatorProxy = nullptr;
 }