Diff
Modified: trunk/Source/WebCore/ChangeLog (215529 => 215530)
--- trunk/Source/WebCore/ChangeLog 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebCore/ChangeLog 2017-04-19 21:30:05 UTC (rev 215530)
@@ -1,3 +1,19 @@
+2017-04-19 Anders Carlsson <[email protected]>
+
+ Rename cancelPayment to cancelPaymentSession
+ https://bugs.webkit.org/show_bug.cgi?id=171007
+
+ Reviewed by Tim Horton.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::didCancelPaymentSession):
+ (WebCore::ApplePaySession::didCancelPayment): Deleted.
+ * Modules/applepay/ApplePaySession.h:
+ * Modules/applepay/PaymentCoordinator.cpp:
+ (WebCore::PaymentCoordinator::didCancelPaymentSession):
+ (WebCore::PaymentCoordinator::didCancelPayment): Deleted.
+ * Modules/applepay/PaymentCoordinator.h:
+
2017-04-19 Joseph Pecoraro <[email protected]>
ASAN Crash running LayoutTests/inspector/worker tests
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (215529 => 215530)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-04-19 21:30:05 UTC (rev 215530)
@@ -949,7 +949,7 @@
dispatchEvent(event.get());
}
-void ApplePaySession::didCancelPayment()
+void ApplePaySession::didCancelPaymentSession()
{
ASSERT(canCancel());
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (215529 => 215530)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2017-04-19 21:30:05 UTC (rev 215530)
@@ -97,7 +97,7 @@
void didSelectShippingMethod(const PaymentRequest::ShippingMethod&);
void didSelectShippingContact(const PaymentContact&);
void didSelectPaymentMethod(const PaymentMethod&);
- void didCancelPayment();
+ void didCancelPaymentSession();
using RefCounted<ApplePaySession>::ref;
using RefCounted<ApplePaySession>::deref;
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp (215529 => 215530)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2017-04-19 21:30:05 UTC (rev 215530)
@@ -176,7 +176,7 @@
m_activeSession->didSelectShippingContact(shippingContact);
}
-void PaymentCoordinator::didCancelPayment()
+void PaymentCoordinator::didCancelPaymentSession()
{
if (!m_activeSession) {
// It's possible that the payment has been aborted already.
@@ -183,7 +183,7 @@
return;
}
- m_activeSession->didCancelPayment();
+ m_activeSession->didCancelPaymentSession();
m_activeSession = nullptr;
}
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h (215529 => 215530)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2017-04-19 21:30:05 UTC (rev 215530)
@@ -70,7 +70,7 @@
WEBCORE_EXPORT void didSelectPaymentMethod(const PaymentMethod&);
WEBCORE_EXPORT void didSelectShippingMethod(const PaymentRequest::ShippingMethod&);
WEBCORE_EXPORT void didSelectShippingContact(const PaymentContact&);
- WEBCORE_EXPORT void didCancelPayment();
+ WEBCORE_EXPORT void didCancelPaymentSession();
private:
PaymentCoordinatorClient& m_client;
Modified: trunk/Source/WebKit2/ChangeLog (215529 => 215530)
--- trunk/Source/WebKit2/ChangeLog 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-19 21:30:05 UTC (rev 215530)
@@ -1,3 +1,23 @@
+2017-04-19 Anders Carlsson <[email protected]>
+
+ Rename cancelPayment to cancelPaymentSession
+ https://bugs.webkit.org/show_bug.cgi?id=171007
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
+ (WebKit::WebPaymentCoordinatorProxy::showPaymentUI):
+ (WebKit::WebPaymentCoordinatorProxy::didCancelPaymentSession):
+ (WebKit::WebPaymentCoordinatorProxy::didCancelPayment): Deleted.
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewControllerDidFinish:]):
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::didCancelPaymentSession):
+ (WebKit::WebPaymentCoordinator::didCancelPayment): Deleted.
+ * WebProcess/ApplePay/WebPaymentCoordinator.h:
+ * WebProcess/ApplePay/WebPaymentCoordinator.messages.in:
+
2017-04-19 David Kilzer <[email protected]>
Stop using strcpy() in WebKit::EnvironmentUtilities::stripValuesEndingWithString()
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp (215529 => 215530)
--- trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2017-04-19 21:30:05 UTC (rev 215530)
@@ -94,7 +94,7 @@
if (activePaymentCoordinatorProxy) {
activePaymentCoordinatorProxy->hidePaymentUI();
- activePaymentCoordinatorProxy->didCancelPayment();
+ activePaymentCoordinatorProxy->didCancelPaymentSession();
}
activePaymentCoordinatorProxy = this;
@@ -110,7 +110,7 @@
platformShowPaymentUI(originatingURL, linkIconURLs, paymentRequest, [this](bool result) {
ASSERT(m_state == State::Activating);
if (!result) {
- didCancelPayment();
+ didCancelPaymentSession();
return;
}
@@ -200,11 +200,11 @@
didReachFinalState();
}
-void WebPaymentCoordinatorProxy::didCancelPayment()
+void WebPaymentCoordinatorProxy::didCancelPaymentSession()
{
ASSERT(canCancel());
- m_webPageProxy.send(Messages::WebPaymentCoordinator::DidCancelPayment());
+ m_webPageProxy.send(Messages::WebPaymentCoordinator::DidCancelPaymentSession());
didReachFinalState();
}
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h (215529 => 215530)
--- trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2017-04-19 21:30:05 UTC (rev 215530)
@@ -60,7 +60,7 @@
explicit WebPaymentCoordinatorProxy(WebPageProxy&);
~WebPaymentCoordinatorProxy();
- void didCancelPayment();
+ void didCancelPaymentSession();
void validateMerchant(const WebCore::URL&);
void didAuthorizePayment(const WebCore::Payment&);
void didSelectShippingMethod(const WebCore::PaymentRequest::ShippingMethod&);
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (215529 => 215530)
--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-04-19 21:30:05 UTC (rev 215530)
@@ -266,7 +266,7 @@
return;
if (!_didReachFinalState)
- _webPaymentCoordinatorProxy->didCancelPayment();
+ _webPaymentCoordinatorProxy->didCancelPaymentSession();
_webPaymentCoordinatorProxy->hidePaymentUI();
}
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (215529 => 215530)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2017-04-19 21:30:05 UTC (rev 215530)
@@ -172,9 +172,9 @@
paymentCoordinator().didSelectPaymentMethod(paymentMethod);
}
-void WebPaymentCoordinator::didCancelPayment()
+void WebPaymentCoordinator::didCancelPaymentSession()
{
- paymentCoordinator().didCancelPayment();
+ paymentCoordinator().didCancelPaymentSession();
}
void WebPaymentCoordinator::canMakePaymentsWithActiveCardReply(uint64_t requestID, bool canMakePayments)
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h (215529 => 215530)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2017-04-19 21:30:05 UTC (rev 215530)
@@ -77,7 +77,7 @@
void didSelectShippingMethod(const WebCore::PaymentRequest::ShippingMethod&);
void didSelectShippingContact(const WebCore::PaymentContact&);
void didSelectPaymentMethod(const WebCore::PaymentMethod&);
- void didCancelPayment();
+ void didCancelPaymentSession();
void canMakePaymentsWithActiveCardReply(uint64_t requestID, bool canMakePayments);
void openPaymentSetupReply(uint64_t requestID, bool result);
Modified: trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in (215529 => 215530)
--- trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in 2017-04-19 21:00:47 UTC (rev 215529)
+++ trunk/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in 2017-04-19 21:30:05 UTC (rev 215530)
@@ -31,7 +31,7 @@
DidSelectShippingMethod(WebCore::PaymentRequest::ShippingMethod shippingMethod)
DidSelectShippingContact(WebCore::PaymentContact shippingContact)
DidSelectPaymentMethod(WebCore::PaymentMethod paymentMethod)
- DidCancelPayment()
+ DidCancelPaymentSession()
CanMakePaymentsWithActiveCardReply(uint64_t requestID, bool canMakePayments)
OpenPaymentSetupReply(uint64_t requestID, bool result)
}
