<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206977] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206977">206977</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-10-09 19:14:05 -0700 (Sun, 09 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ApplePaySession from legacy to new DOM exceptions
https://bugs.webkit.org/show_bug.cgi?id=163191
Reviewed by Sam Weinig.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::ApplePaySession::create): Use ExceptionOr.
(WebCore::ApplePaySession::ApplePaySession): Moved initialization
of two of the data members to class definition.
(WebCore::ApplePaySession::supportsVersion): Use ExceptionOr.
(WebCore::ApplePaySession::canMakePayments): Ditto.
(WebCore::ApplePaySession::canMakePaymentsWithActiveCard): Ditto.
(WebCore::ApplePaySession::openPaymentSetup): Ditto.
(WebCore::ApplePaySession::begin): Ditto.
(WebCore::ApplePaySession::abort): Ditto.
(WebCore::ApplePaySession::completeMerchantValidation): Ditto.
(WebCore::ApplePaySession::completeShippingMethodSelection): Ditto.
(WebCore::ApplePaySession::completeShippingContactSelection): Ditto.
(WebCore::ApplePaySession::completePaymentMethodSelection): Ditto.
(WebCore::ApplePaySession::completePayment): Ditto.
(WebCore::ApplePaySession::validateMerchant): Use auto and get instead of
using a RefPtr type and * for event dispatching.
(WebCore::ApplePaySession::didAuthorizePayment): Ditto.
(WebCore::ApplePaySession::didSelectShippingMethod): Ditto.
(WebCore::ApplePaySession::didSelectShippingContact): Ditto.
(WebCore::ApplePaySession::didSelectPaymentMethod): Ditto.
(WebCore::ApplePaySession::didCancelPayment): Ditto.
(WebCore::ApplePaySession::paymentCoordinator): Moved dereferencing
inside the downcast.
* Modules/applepay/ApplePaySession.h: Updated for changes above.
* Modules/applepay/ApplePaySession.idl: Use MayThrowException.
* bindings/js/JSApplePaySessionCustom.cpp:
(WebCore::JSApplePaySession::completeShippingMethodSelection):
Use propagateException.
(WebCore::JSApplePaySession::completeShippingContactSelection): Ditto.
(WebCore::JSApplePaySession::completePaymentMethodSelection): Ditto.
* bindings/js/JSDOMBinding.h: Added implementation of toJSBoolean.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateConstructorDefinition): Generate the different arguments for
toJSNewlyCreated when ConstructorMayThrowException is specified that
activate the version of that function that handles exceptions.
* bindings/scripts/IDLAttributes.txt: Added ConstructorMayThrowException.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionh">trunk/Source/WebCore/Modules/applepay/ApplePaySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionidl">trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSApplePaySessionCustomcpp">trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsIDLAttributestxt">trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/ChangeLog 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -1,5 +1,56 @@
</span><span class="cx"> 2016-10-09 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Move ApplePaySession from legacy to new DOM exceptions
+ https://bugs.webkit.org/show_bug.cgi?id=163191
+
+ Reviewed by Sam Weinig.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::create): Use ExceptionOr.
+ (WebCore::ApplePaySession::ApplePaySession): Moved initialization
+ of two of the data members to class definition.
+ (WebCore::ApplePaySession::supportsVersion): Use ExceptionOr.
+ (WebCore::ApplePaySession::canMakePayments): Ditto.
+ (WebCore::ApplePaySession::canMakePaymentsWithActiveCard): Ditto.
+ (WebCore::ApplePaySession::openPaymentSetup): Ditto.
+ (WebCore::ApplePaySession::begin): Ditto.
+ (WebCore::ApplePaySession::abort): Ditto.
+ (WebCore::ApplePaySession::completeMerchantValidation): Ditto.
+ (WebCore::ApplePaySession::completeShippingMethodSelection): Ditto.
+ (WebCore::ApplePaySession::completeShippingContactSelection): Ditto.
+ (WebCore::ApplePaySession::completePaymentMethodSelection): Ditto.
+ (WebCore::ApplePaySession::completePayment): Ditto.
+ (WebCore::ApplePaySession::validateMerchant): Use auto and get instead of
+ using a RefPtr type and * for event dispatching.
+ (WebCore::ApplePaySession::didAuthorizePayment): Ditto.
+ (WebCore::ApplePaySession::didSelectShippingMethod): Ditto.
+ (WebCore::ApplePaySession::didSelectShippingContact): Ditto.
+ (WebCore::ApplePaySession::didSelectPaymentMethod): Ditto.
+ (WebCore::ApplePaySession::didCancelPayment): Ditto.
+ (WebCore::ApplePaySession::paymentCoordinator): Moved dereferencing
+ inside the downcast.
+
+ * Modules/applepay/ApplePaySession.h: Updated for changes above.
+
+ * Modules/applepay/ApplePaySession.idl: Use MayThrowException.
+
+ * bindings/js/JSApplePaySessionCustom.cpp:
+ (WebCore::JSApplePaySession::completeShippingMethodSelection):
+ Use propagateException.
+ (WebCore::JSApplePaySession::completeShippingContactSelection): Ditto.
+ (WebCore::JSApplePaySession::completePaymentMethodSelection): Ditto.
+
+ * bindings/js/JSDOMBinding.h: Added implementation of toJSBoolean.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateConstructorDefinition): Generate the different arguments for
+ toJSNewlyCreated when ConstructorMayThrowException is specified that
+ activate the version of that function that handles exceptions.
+
+ * bindings/scripts/IDLAttributes.txt: Added ConstructorMayThrowException.
+
+2016-10-09 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Replace all uses of ExceptionCodeWithMessage with WebCore::Exception
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163178
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<ApplePaySession> ApplePaySession::create(Document& document, unsigned version, const Dictionary& dictionary, ExceptionCode& ec)
</del><ins>+ExceptionOr<Ref<ApplePaySession>> ApplePaySession::create(Document& document, unsigned version, const Dictionary& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="cx">
</span><span class="lines">@@ -642,14 +642,12 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallApplePaySessionAPIs(document, errorMessage)) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return nullptr;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ScriptController::processingUserGesture()) {
</span><span class="cx"> window.printErrorMessage("Must create a new ApplePaySession from a user gesture handler.");
</span><del>- ec = INVALID_ACCESS_ERR;
- return nullptr;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
</span><span class="lines">@@ -656,28 +654,21 @@
</span><span class="cx">
</span><span class="cx"> if (!version || !paymentCoordinator.supportsVersion(version)) {
</span><span class="cx"> window.printErrorMessage(makeString("\"" + String::number(version), "\" is not a supported version."));
</span><del>- ec = INVALID_ACCESS_ERR;
- return nullptr;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto paymentRequest = createPaymentRequest(version, window, dictionary);
</span><del>- if (!paymentRequest) {
- ec = TYPE_MISMATCH_ERR;
- return nullptr;
- }
</del><ins>+ if (!paymentRequest)
+ return Exception { TYPE_MISMATCH_ERR };
</ins><span class="cx">
</span><del>- if (!PaymentRequestValidator(window).validate(*paymentRequest)) {
- ec = INVALID_ACCESS_ERR;
- return nullptr;
- }
</del><ins>+ if (!PaymentRequestValidator(window).validate(*paymentRequest))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- return adoptRef(new ApplePaySession(document, WTFMove(*paymentRequest)));
</del><ins>+ return adoptRef(*new ApplePaySession(document, WTFMove(*paymentRequest)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ApplePaySession::ApplePaySession(Document& document, PaymentRequest&& paymentRequest)
</span><span class="cx"> : ActiveDOMObject(&document)
</span><del>- , m_state(State::Idle)
- , m_merchantValidationState(MerchantValidationState::Idle)
</del><span class="cx"> , m_paymentRequest(WTFMove(paymentRequest))
</span><span class="cx"> {
</span><span class="cx"> suspendIfNeeded();
</span><span class="lines">@@ -687,12 +678,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplePaySession::supportsVersion(ScriptExecutionContext& scriptExecutionContext, unsigned version, ExceptionCode& ec)
</del><ins>+ExceptionOr<bool> ApplePaySession::supportsVersion(ScriptExecutionContext& scriptExecutionContext, unsigned version)
</ins><span class="cx"> {
</span><del>- if (!version) {
- ec = INVALID_ACCESS_ERR;
- return false;
- }
</del><ins>+ if (!version)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto& document = downcast<Document>(scriptExecutionContext);
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="lines">@@ -700,12 +689,10 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallApplePaySessionAPIs(document, errorMessage)) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return false;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
- return paymentCoordinator.supportsVersion(version);
</del><ins>+ return document.frame()->mainFrame().paymentCoordinator().supportsVersion(version);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldDiscloseApplePayCapability(Document& document)
</span><span class="lines">@@ -717,7 +704,7 @@
</span><span class="cx"> return document.frame()->settings().applePayCapabilityDisclosureAllowed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplePaySession::canMakePayments(ScriptExecutionContext& scriptExecutionContext, ExceptionCode& ec)
</del><ins>+ExceptionOr<bool> ApplePaySession::canMakePayments(ScriptExecutionContext& scriptExecutionContext)
</ins><span class="cx"> {
</span><span class="cx"> auto& document = downcast<Document>(scriptExecutionContext);
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="lines">@@ -725,15 +712,13 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallApplePaySessionAPIs(document, errorMessage)) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return false;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
- return paymentCoordinator.canMakePayments();
</del><ins>+ return document.frame()->mainFrame().paymentCoordinator().canMakePayments();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::canMakePaymentsWithActiveCard(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, Ref<DeferredPromise>&& passedPromise, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::canMakePaymentsWithActiveCard(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, Ref<DeferredPromise>&& passedPromise)
</ins><span class="cx"> {
</span><span class="cx"> auto& document = downcast<Document>(scriptExecutionContext);
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="lines">@@ -741,8 +726,7 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallApplePaySessionAPIs(document, errorMessage)) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DeferredPromise> promise(WTFMove(passedPromise));
</span><span class="lines">@@ -753,7 +737,7 @@
</span><span class="cx"> RunLoop::main().dispatch([promise, canMakePayments]() mutable {
</span><span class="cx"> promise->resolve(canMakePayments);
</span><span class="cx"> });
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
</span><span class="lines">@@ -761,9 +745,10 @@
</span><span class="cx"> paymentCoordinator.canMakePaymentsWithActiveCard(merchantIdentifier, document.domain(), [promise](bool canMakePayments) mutable {
</span><span class="cx"> promise->resolve(canMakePayments);
</span><span class="cx"> });
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::openPaymentSetup(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, Ref<DeferredPromise>&& passedPromise, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::openPaymentSetup(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, Ref<DeferredPromise>&& passedPromise)
</ins><span class="cx"> {
</span><span class="cx"> auto& document = downcast<Document>(scriptExecutionContext);
</span><span class="cx"> DOMWindow& window = *document.domWindow();
</span><span class="lines">@@ -771,14 +756,12 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallApplePaySessionAPIs(document, errorMessage)) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ScriptController::processingUserGesture()) {
</span><span class="cx"> window.printErrorMessage("Must call ApplePaySession.openPaymentSetup from a user gesture handler.");
</span><del>- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DeferredPromise> promise(WTFMove(passedPromise));
</span><span class="lines">@@ -787,9 +770,11 @@
</span><span class="cx"> paymentCoordinator.openPaymentSetup(merchantIdentifier, document.domain(), [promise](bool result) mutable {
</span><span class="cx"> promise->resolve(result);
</span><span class="cx"> });
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::begin(ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::begin()
</ins><span class="cx"> {
</span><span class="cx"> auto& document = *downcast<Document>(scriptExecutionContext());
</span><span class="cx"> auto& window = *document.domWindow();
</span><span class="lines">@@ -796,15 +781,12 @@
</span><span class="cx">
</span><span class="cx"> if (!canBegin()) {
</span><span class="cx"> window.printErrorMessage("Payment session is already active.");
</span><del>- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (paymentCoordinator().hasActiveSession()) {
</span><span class="cx"> window.printErrorMessage("Page already has an active payment session.");
</span><del>-
- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<URL> linkIconURLs;
</span><span class="lines">@@ -813,40 +795,36 @@
</span><span class="cx">
</span><span class="cx"> if (!paymentCoordinator().beginPaymentSession(*this, document.url(), linkIconURLs, m_paymentRequest)) {
</span><span class="cx"> window.printErrorMessage("There is already has an active payment session.");
</span><del>-
- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_state = State::Active;
</span><span class="cx">
</span><span class="cx"> setPendingActivity(this);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::abort(ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::abort()
</ins><span class="cx"> {
</span><del>- if (!canAbort()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canAbort())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> m_state = State::Aborted;
</span><span class="cx"> paymentCoordinator().abortPaymentSession();
</span><span class="cx">
</span><span class="cx"> didReachFinalState();
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::completeMerchantValidation(const Dictionary& merchantSessionDictionary, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::completeMerchantValidation(const Dictionary& merchantSessionDictionary)
</ins><span class="cx"> {
</span><del>- if (!canCompleteMerchantValidation()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canCompleteMerchantValidation())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- if (!merchantSessionDictionary.initializerObject()) {
- ec = TypeError;
- return;
- }
</del><ins>+ if (!merchantSessionDictionary.initializerObject())
+ return Exception { TypeError };
</ins><span class="cx">
</span><span class="cx"> auto& document = *downcast<Document>(scriptExecutionContext());
</span><span class="cx"> auto& window = *document.domWindow();
</span><span class="lines">@@ -855,15 +833,15 @@
</span><span class="cx"> auto merchantSession = PaymentMerchantSession::fromJS(*merchantSessionDictionary.execState(), merchantSessionDictionary.initializerObject(), errorMessage);
</span><span class="cx"> if (!merchantSession) {
</span><span class="cx"> window.printErrorMessage(errorMessage);
</span><del>- ec = INVALID_ACCESS_ERR;
- return;
</del><ins>+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_merchantValidationState = MerchantValidationState::ValidationComplete;
</span><span class="cx"> paymentCoordinator().completeMerchantValidation(*merchantSession);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> static Optional<PaymentAuthorizationStatus> toPaymentAuthorizationStatus(unsigned short status)
</span><span class="cx"> {
</span><span class="cx"> switch (status) {
</span><span class="lines">@@ -896,36 +874,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::completeShippingMethodSelection(unsigned short status, const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::completeShippingMethodSelection(unsigned short status, const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray)
</ins><span class="cx"> {
</span><del>- if (!canCompleteShippingMethodSelection()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canCompleteShippingMethodSelection())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto authorizationStatus = toPaymentAuthorizationStatus(status);
</span><del>- if (!authorizationStatus) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto& window = *downcast<Document>(scriptExecutionContext())->domWindow();
</span><span class="cx"> auto newTotal = createLineItem(window, newTotalDictionary);
</span><del>- if (!newTotal) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newTotal)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- if (!PaymentRequestValidator(window).validateTotal(*newTotal)) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!PaymentRequestValidator(window).validateTotal(*newTotal))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto newLineItems = createLineItems(window, newLineItemsArray);
</span><del>- if (!newLineItems) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newLineItems)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> m_state = State::Active;
</span><span class="cx"> PaymentRequest::TotalAndLineItems totalAndLineItems;
</span><span class="lines">@@ -932,45 +900,35 @@
</span><span class="cx"> totalAndLineItems.total = *newTotal;
</span><span class="cx"> totalAndLineItems.lineItems = *newLineItems;
</span><span class="cx"> paymentCoordinator().completeShippingMethodSelection(*authorizationStatus, totalAndLineItems);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::completeShippingContactSelection(unsigned short status, const ArrayValue& newShippingMethodsArray, const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::completeShippingContactSelection(unsigned short status, const ArrayValue& newShippingMethodsArray, const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray)
</ins><span class="cx"> {
</span><del>- if (!canCompleteShippingContactSelection()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canCompleteShippingContactSelection())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto authorizationStatus = toPaymentAuthorizationStatus(status);
</span><del>- if (!authorizationStatus) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto& window = *downcast<Document>(scriptExecutionContext())->domWindow();
</span><span class="cx">
</span><span class="cx"> auto newShippingMethods = createShippingMethods(window, newShippingMethodsArray);
</span><del>- if (!newShippingMethods) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newShippingMethods)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto newTotal = createLineItem(window, newTotalDictionary);
</span><del>- if (!newTotal) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newTotal)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- if (!PaymentRequestValidator(window).validateTotal(*newTotal)) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!PaymentRequestValidator(window).validateTotal(*newTotal))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto newLineItems = createLineItems(window, newLineItemsArray);
</span><del>- if (!newLineItems) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newLineItems)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> m_state = State::Active;
</span><span class="cx"> PaymentRequest::TotalAndLineItems totalAndLineItems;
</span><span class="lines">@@ -977,32 +935,26 @@
</span><span class="cx"> totalAndLineItems.total = *newTotal;
</span><span class="cx"> totalAndLineItems.lineItems = *newLineItems;
</span><span class="cx"> paymentCoordinator().completeShippingContactSelection(*authorizationStatus, *newShippingMethods, totalAndLineItems);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::completePaymentMethodSelection(const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::completePaymentMethodSelection(const Dictionary& newTotalDictionary, const ArrayValue& newLineItemsArray)
</ins><span class="cx"> {
</span><del>- if (!canCompletePaymentMethodSelection()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canCompletePaymentMethodSelection())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- auto& window = *downcast<Document>(scriptExecutionContext())->domWindow();
</del><ins>+ auto& window = *downcast<Document>(*scriptExecutionContext()).domWindow();
</ins><span class="cx"> auto newTotal = createLineItem(window, newTotalDictionary);
</span><del>- if (!newTotal) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newTotal)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><del>- if (!PaymentRequestValidator(window).validateTotal(*newTotal)) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!PaymentRequestValidator(window).validateTotal(*newTotal))
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto newLineItems = createLineItems(window, newLineItemsArray);
</span><del>- if (!newLineItems) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!newLineItems)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> m_state = State::Active;
</span><span class="cx"> PaymentRequest::TotalAndLineItems totalAndLineItems;
</span><span class="lines">@@ -1009,30 +961,29 @@
</span><span class="cx"> totalAndLineItems.total = *newTotal;
</span><span class="cx"> totalAndLineItems.lineItems = *newLineItems;
</span><span class="cx"> paymentCoordinator().completePaymentMethodSelection(totalAndLineItems);
</span><ins>+
+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplePaySession::completePayment(unsigned short status, ExceptionCode& ec)
</del><ins>+ExceptionOr<void> ApplePaySession::completePayment(unsigned short status)
</ins><span class="cx"> {
</span><del>- if (!canCompletePayment()) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!canCompletePayment())
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> auto authorizationStatus = toPaymentAuthorizationStatus(status);
</span><del>- if (!authorizationStatus) {
- ec = INVALID_ACCESS_ERR;
- return;
- }
</del><ins>+ if (!authorizationStatus)
+ return Exception { INVALID_ACCESS_ERR };
</ins><span class="cx">
</span><span class="cx"> paymentCoordinator().completePaymentSession(*authorizationStatus);
</span><span class="cx">
</span><span class="cx"> if (!isFinalStateStatus(*authorizationStatus)) {
</span><span class="cx"> m_state = State::Active;
</span><del>- return;
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_state = State::Completed;
</span><span class="cx"> unsetPendingActivity(this);
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::validateMerchant(const URL& validationURL)
</span><span class="lines">@@ -1053,8 +1004,8 @@
</span><span class="cx">
</span><span class="cx"> m_merchantValidationState = MerchantValidationState::ValidatingMerchant;
</span><span class="cx">
</span><del>- RefPtr<ApplePayValidateMerchantEvent> event = ApplePayValidateMerchantEvent::create(eventNames().validatemerchantEvent, validationURL);
- dispatchEvent(*event);
</del><ins>+ auto event = ApplePayValidateMerchantEvent::create(eventNames().validatemerchantEvent, validationURL);
+ dispatchEvent(event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::didAuthorizePayment(const Payment& payment)
</span><span class="lines">@@ -1063,8 +1014,8 @@
</span><span class="cx">
</span><span class="cx"> m_state = State::Authorized;
</span><span class="cx">
</span><del>- RefPtr<ApplePayPaymentAuthorizedEvent> event = ApplePayPaymentAuthorizedEvent::create(eventNames().paymentauthorizedEvent, payment);
- dispatchEvent(*event);
</del><ins>+ auto event = ApplePayPaymentAuthorizedEvent::create(eventNames().paymentauthorizedEvent, payment);
+ dispatchEvent(event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::didSelectShippingMethod(const PaymentRequest::ShippingMethod& shippingMethod)
</span><span class="lines">@@ -1077,8 +1028,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_state = State::ShippingMethodSelected;
</span><del>- RefPtr<ApplePayShippingMethodSelectedEvent> event = ApplePayShippingMethodSelectedEvent::create(eventNames().shippingmethodselectedEvent, shippingMethod);
- dispatchEvent(*event);
</del><ins>+ auto event = ApplePayShippingMethodSelectedEvent::create(eventNames().shippingmethodselectedEvent, shippingMethod);
+ dispatchEvent(event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::didSelectShippingContact(const PaymentContact& shippingContact)
</span><span class="lines">@@ -1091,8 +1042,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_state = State::ShippingContactSelected;
</span><del>- RefPtr<ApplePayShippingContactSelectedEvent> event = ApplePayShippingContactSelectedEvent::create(eventNames().shippingcontactselectedEvent, shippingContact);
- dispatchEvent(*event);
</del><ins>+ auto event = ApplePayShippingContactSelectedEvent::create(eventNames().shippingcontactselectedEvent, shippingContact);
+ dispatchEvent(event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::didSelectPaymentMethod(const PaymentMethod& paymentMethod)
</span><span class="lines">@@ -1105,8 +1056,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_state = State::PaymentMethodSelected;
</span><del>- RefPtr<ApplePayPaymentMethodSelectedEvent> event = ApplePayPaymentMethodSelectedEvent::create(eventNames().paymentmethodselectedEvent, paymentMethod);
- dispatchEvent(*event);
</del><ins>+ auto event = ApplePayPaymentMethodSelectedEvent::create(eventNames().paymentmethodselectedEvent, paymentMethod);
+ dispatchEvent(event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplePaySession::didCancelPayment()
</span><span class="lines">@@ -1115,8 +1066,8 @@
</span><span class="cx">
</span><span class="cx"> m_state = State::Canceled;
</span><span class="cx">
</span><del>- RefPtr<Event> event = Event::create(eventNames().cancelEvent, false, false);
- dispatchEvent(*event);
</del><ins>+ auto event = Event::create(eventNames().cancelEvent, false, false);
+ dispatchEvent(event.get());
</ins><span class="cx">
</span><span class="cx"> didReachFinalState();
</span><span class="cx"> }
</span><span class="lines">@@ -1157,7 +1108,7 @@
</span><span class="cx">
</span><span class="cx"> PaymentCoordinator& ApplePaySession::paymentCoordinator() const
</span><span class="cx"> {
</span><del>- return downcast<Document>(scriptExecutionContext())->frame()->mainFrame().paymentCoordinator();
</del><ins>+ return downcast<Document>(*scriptExecutionContext()).frame()->mainFrame().paymentCoordinator();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ApplePaySession::canBegin() const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "EventTarget.h"
</span><del>-#include "ExceptionCode.h"
</del><ins>+#include "ExceptionOr.h"
</ins><span class="cx"> #include "PaymentRequest.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class ApplePaySession final : public RefCounted<ApplePaySession>, public ActiveDOMObject, public EventTargetWithInlineData {
</span><span class="cx"> public:
</span><del>- static RefPtr<ApplePaySession> create(Document&, unsigned version, const Dictionary&, ExceptionCode&);
</del><ins>+ static ExceptionOr<Ref<ApplePaySession>> create(Document&, unsigned version, const Dictionary&);
</ins><span class="cx"> virtual ~ApplePaySession();
</span><span class="cx">
</span><span class="cx"> // DOM API.
</span><span class="lines">@@ -61,18 +61,18 @@
</span><span class="cx"> static const unsigned short STATUS_PIN_INCORRECT = 6;
</span><span class="cx"> static const unsigned short STATUS_PIN_LOCKOUT = 7;
</span><span class="cx">
</span><del>- static bool supportsVersion(ScriptExecutionContext&, unsigned version, ExceptionCode&);
- static bool canMakePayments(ScriptExecutionContext&, ExceptionCode&);
- static void canMakePaymentsWithActiveCard(ScriptExecutionContext&, const String& merchantIdentifier, Ref<DeferredPromise>&&, ExceptionCode&);
- static void openPaymentSetup(ScriptExecutionContext&, const String& merchantIdentifier, Ref<DeferredPromise>&&, ExceptionCode&);
</del><ins>+ static ExceptionOr<bool> supportsVersion(ScriptExecutionContext&, unsigned version);
+ static ExceptionOr<bool> canMakePayments(ScriptExecutionContext&);
+ static ExceptionOr<void> canMakePaymentsWithActiveCard(ScriptExecutionContext&, const String& merchantIdentifier, Ref<DeferredPromise>&&);
+ static ExceptionOr<void> openPaymentSetup(ScriptExecutionContext&, const String& merchantIdentifier, Ref<DeferredPromise>&&);
</ins><span class="cx">
</span><del>- void begin(ExceptionCode&);
- void abort(ExceptionCode&);
- void completeMerchantValidation(const Dictionary& merchantSessionDictionary, ExceptionCode&);
- void completeShippingMethodSelection(unsigned short status, const Dictionary& newTotal, const ArrayValue& newLineItems, ExceptionCode&);
- void completeShippingContactSelection(unsigned short status, const ArrayValue& newShippingMethods, const Dictionary& newTotal, const ArrayValue& newLineItems, ExceptionCode&);
- void completePaymentMethodSelection(const Dictionary& newTotal, const ArrayValue& newLineItems, ExceptionCode&);
- void completePayment(unsigned short status, ExceptionCode&);
</del><ins>+ ExceptionOr<void> begin();
+ ExceptionOr<void> abort();
+ ExceptionOr<void> completeMerchantValidation(const Dictionary& merchantSessionDictionary);
+ ExceptionOr<void> completeShippingMethodSelection(unsigned short status, const Dictionary& newTotal, const ArrayValue& newLineItems);
+ ExceptionOr<void> completeShippingContactSelection(unsigned short status, const ArrayValue& newShippingMethods, const Dictionary& newTotal, const ArrayValue& newLineItems);
+ ExceptionOr<void> completePaymentMethodSelection(const Dictionary& newTotal, const ArrayValue& newLineItems);
+ ExceptionOr<void> completePayment(unsigned short status);
</ins><span class="cx">
</span><span class="cx"> const PaymentRequest& paymentRequest() const { return m_paymentRequest; }
</span><span class="cx">
</span><span class="lines">@@ -126,13 +126,13 @@
</span><span class="cx">
</span><span class="cx"> Aborted,
</span><span class="cx"> Canceled,
</span><del>- } m_state;
</del><ins>+ } m_state { State::Idle };
</ins><span class="cx">
</span><span class="cx"> enum class MerchantValidationState {
</span><span class="cx"> Idle,
</span><span class="cx"> ValidatingMerchant,
</span><span class="cx"> ValidationComplete,
</span><del>- } m_merchantValidationState;
</del><ins>+ } m_merchantValidationState { MerchantValidationState::Idle };
</ins><span class="cx">
</span><span class="cx"> const PaymentRequest m_paymentRequest;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> Conditional=APPLE_PAY,
</span><span class="cx"> Constructor(unsigned long version, Dictionary paymentRequest),
</span><span class="cx"> ConstructorCallWith=Document,
</span><del>- ConstructorMayThrowLegacyException,
</del><ins>+ ConstructorMayThrowException,
</ins><span class="cx"> EnabledBySetting=ApplePay,
</span><span class="cx"> ] interface ApplePaySession : EventTarget {
</span><span class="cx"> const unsigned short STATUS_SUCCESS = 0;
</span><span class="lines">@@ -40,18 +40,18 @@
</span><span class="cx"> const unsigned short STATUS_PIN_INCORRECT = 6;
</span><span class="cx"> const unsigned short STATUS_PIN_LOCKOUT = 7;
</span><span class="cx">
</span><del>- [CallWith=ScriptExecutionContext, MayThrowLegacyException] static boolean supportsVersion(unsigned long version);
- [CallWith=ScriptExecutionContext, MayThrowLegacyException] static boolean canMakePayments();
- [CallWith=ScriptExecutionContext, MayThrowLegacyException] static Promise canMakePaymentsWithActiveCard(DOMString merchantIdentifier);
- [CallWith=ScriptExecutionContext, MayThrowLegacyException] static Promise openPaymentSetup(DOMString merchantIdentifier);
</del><ins>+ [CallWith=ScriptExecutionContext, MayThrowException] static boolean supportsVersion(unsigned long version);
+ [CallWith=ScriptExecutionContext, MayThrowException] static boolean canMakePayments();
+ [CallWith=ScriptExecutionContext, MayThrowException] static Promise canMakePaymentsWithActiveCard(DOMString merchantIdentifier);
+ [CallWith=ScriptExecutionContext, MayThrowException] static Promise openPaymentSetup(DOMString merchantIdentifier);
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] void begin();
- [MayThrowLegacyException] void abort();
- [MayThrowLegacyException] void completeMerchantValidation(Dictionary merchantSession);
- [Custom, MayThrowLegacyException] void completeShippingMethodSelection(unsigned short status, Dictionary newTotal, sequence<Dictionary> newLineItems);
- [Custom, MayThrowLegacyException] void completeShippingContactSelection(unsigned short status, sequence<Dictionary> newShippingMethods, Dictionary newTotal, sequence<Dictionary> newLineItems);
- [Custom, MayThrowLegacyException] void completePaymentMethodSelection(Dictionary newTotal, sequence<Dictionary> newLineItems);
- [MayThrowLegacyException] void completePayment(unsigned short status);
</del><ins>+ [MayThrowException] void begin();
+ [MayThrowException] void abort();
+ [MayThrowException] void completeMerchantValidation(Dictionary merchantSession);
+ [Custom, MayThrowException] void completeShippingMethodSelection(unsigned short status, Dictionary newTotal, sequence<Dictionary> newLineItems);
+ [Custom, MayThrowException] void completeShippingContactSelection(unsigned short status, sequence<Dictionary> newShippingMethods, Dictionary newTotal, sequence<Dictionary> newLineItems);
+ [Custom, MayThrowException] void completePaymentMethodSelection(Dictionary newTotal, sequence<Dictionary> newLineItems);
+ [MayThrowException] void completePayment(unsigned short status);
</ins><span class="cx">
</span><span class="cx"> attribute EventHandler onvalidatemerchant;
</span><span class="cx"> attribute EventHandler onpaymentmethodselected;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSApplePaySessionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> if (UNLIKELY(state.argumentCount() < 3))
</span><span class="cx"> return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
</del><span class="cx"> uint16_t status = convert<uint16_t>(state, state.argument(0), NormalConversion);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx">
</span><span class="lines">@@ -62,8 +61,7 @@
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(2) };
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><del>- impl.completeShippingMethodSelection(status, newTotal, newLineItems, ec);
- setDOMException(&state, ec);
</del><ins>+ propagateException(state, scope, impl.completeShippingMethodSelection(status, newTotal, newLineItems));
</ins><span class="cx">
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +81,6 @@
</span><span class="cx"> if (UNLIKELY(state.argumentCount() < 4))
</span><span class="cx"> return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
</del><span class="cx"> uint16_t status = convert<uint16_t>(state, state.argument(0), NormalConversion);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx">
</span><span class="lines">@@ -95,9 +92,9 @@
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(3) };
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><del>- impl.completeShippingContactSelection(status, newShippingMethods, newTotal, newLineItems, ec);
- setDOMException(&state, ec);
</del><span class="cx">
</span><ins>+ propagateException(state, scope, impl.completeShippingContactSelection(status, newShippingMethods, newTotal, newLineItems));
+
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,15 +113,14 @@
</span><span class="cx"> if (UNLIKELY(state.argumentCount() < 2))
</span><span class="cx"> return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
</span><span class="cx">
</span><del>- ExceptionCode ec = 0;
</del><span class="cx"> Dictionary newTotal = { &state, state.argument(0) };
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(1) };
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><del>- impl.completePaymentMethodSelection(newTotal, newLineItems, ec);
- setDOMException(&state, ec);
</del><span class="cx">
</span><ins>+ propagateException(state, scope, impl.completePaymentMethodSelection(newTotal, newLineItems));
+
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -916,6 +916,15 @@
</span><span class="cx"> return toJS(&state, &globalObject, value.releaseReturnValue());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline JSC::JSValue toJSBoolean(JSC::ExecState& state, JSC::ThrowScope& throwScope, ExceptionOr<bool>&& value)
+{
+ if (UNLIKELY(value.hasException())) {
+ propagateException(state, throwScope, value.releaseException());
+ return { };
+ }
+ return JSC::jsBoolean(value.releaseReturnValue());
+}
+
</ins><span class="cx"> template<typename T> inline JSC::JSValue toJSNewlyCreated(JSC::ExecState& state, JSDOMGlobalObject& globalObject, JSC::ThrowScope& throwScope, ExceptionOr<T>&& value)
</span><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(value.hasException())) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -5538,7 +5538,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, " RETURN_IF_EXCEPTION(throwScope, encodedJSValue());\n") if $codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{ConstructorCallWith}, "ScriptState");
</span><del>- push(@$outputArray, " return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));\n");
</del><ins>+ if ($interface->extendedAttributes->{ConstructorMayThrowException}) {
+ push(@$outputArray, " return JSValue::encode(toJSNewlyCreated(*state, *castedThis->globalObject(), throwScope, WTFMove(object)));\n");
+ } else {
+ push(@$outputArray, " return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));\n");
+ }
</ins><span class="cx"> push(@$outputArray, "}\n\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLAttributestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt (206976 => 206977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2016-10-10 02:13:28 UTC (rev 206976)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2016-10-10 02:14:05 UTC (rev 206977)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> Constructor
</span><span class="cx"> ConstructorCallWith=Document|ScriptExecutionContext|ScriptState
</span><span class="cx"> ConstructorConditional=*
</span><ins>+ConstructorMayThrowException
</ins><span class="cx"> ConstructorMayThrowLegacyException
</span><span class="cx"> ConstructorTemplate=Event|TypedArray
</span><span class="cx"> Custom
</span></span></pre>
</div>
</div>
</body>
</html>