| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/payments/PaymentRequest.h" | 5 #include "modules/payments/PaymentRequest.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ExceptionState.h" | 7 #include "bindings/core/v8/ExceptionState.h" |
| 8 #include "bindings/core/v8/JSONValuesForV8.h" | 8 #include "bindings/core/v8/JSONValuesForV8.h" |
| 9 #include "bindings/core/v8/ScriptPromiseResolver.h" | 9 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 10 #include "bindings/core/v8/ScriptState.h" | 10 #include "bindings/core/v8/ScriptState.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include <utility> | 29 #include <utility> |
| 30 | 30 |
| 31 namespace mojo { | 31 namespace mojo { |
| 32 | 32 |
| 33 using blink::mojom::blink::PaymentCurrencyAmount; | 33 using blink::mojom::blink::PaymentCurrencyAmount; |
| 34 using blink::mojom::blink::PaymentCurrencyAmountPtr; | 34 using blink::mojom::blink::PaymentCurrencyAmountPtr; |
| 35 using blink::mojom::blink::PaymentDetails; | 35 using blink::mojom::blink::PaymentDetails; |
| 36 using blink::mojom::blink::PaymentDetailsModifier; | 36 using blink::mojom::blink::PaymentDetailsModifier; |
| 37 using blink::mojom::blink::PaymentDetailsModifierPtr; | 37 using blink::mojom::blink::PaymentDetailsModifierPtr; |
| 38 using blink::mojom::blink::PaymentDetailsPtr; | 38 using blink::mojom::blink::PaymentDetailsPtr; |
| 39 using blink::mojom::blink::PaymentErrorReason; |
| 39 using blink::mojom::blink::PaymentItem; | 40 using blink::mojom::blink::PaymentItem; |
| 40 using blink::mojom::blink::PaymentItemPtr; | 41 using blink::mojom::blink::PaymentItemPtr; |
| 41 using blink::mojom::blink::PaymentMethodData; | 42 using blink::mojom::blink::PaymentMethodData; |
| 42 using blink::mojom::blink::PaymentMethodDataPtr; | 43 using blink::mojom::blink::PaymentMethodDataPtr; |
| 43 using blink::mojom::blink::PaymentOptions; | 44 using blink::mojom::blink::PaymentOptions; |
| 44 using blink::mojom::blink::PaymentOptionsPtr; | 45 using blink::mojom::blink::PaymentOptionsPtr; |
| 45 using blink::mojom::blink::PaymentShippingOption; | 46 using blink::mojom::blink::PaymentShippingOption; |
| 46 using blink::mojom::blink::PaymentShippingOptionPtr; | 47 using blink::mojom::blink::PaymentShippingOptionPtr; |
| 47 | 48 |
| 48 template <> | 49 template <> |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 ScriptPromise PaymentRequest::show(ScriptState* scriptState) | 366 ScriptPromise PaymentRequest::show(ScriptState* scriptState) |
| 366 { | 367 { |
| 367 if (m_showResolver) | 368 if (m_showResolver) |
| 368 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "Already called show() once")); | 369 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "Already called show() once")); |
| 369 | 370 |
| 370 if (!scriptState->domWindow() || !scriptState->domWindow()->frame()) | 371 if (!scriptState->domWindow() || !scriptState->domWindow()->frame()) |
| 371 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "Cannot show the payment request")); | 372 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(InvalidStateError, "Cannot show the payment request")); |
| 372 | 373 |
| 373 DCHECK(!m_paymentProvider.is_bound()); | 374 DCHECK(!m_paymentProvider.is_bound()); |
| 374 scriptState->domWindow()->frame()->serviceRegistry()->connectToRemoteService
(mojo::GetProxy(&m_paymentProvider)); | 375 scriptState->domWindow()->frame()->serviceRegistry()->connectToRemoteService
(mojo::GetProxy(&m_paymentProvider)); |
| 375 m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bi
nd(&PaymentRequest::OnError, wrapWeakPersistent(this)))); | 376 m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bi
nd(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErro
rReason::UNKNOWN))); |
| 376 m_paymentProvider->SetClient(m_clientBinding.CreateInterfacePtrAndBind()); | 377 m_paymentProvider->SetClient(m_clientBinding.CreateInterfacePtrAndBind()); |
| 377 m_paymentProvider->Show(mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::
From(m_methodData), mojom::blink::PaymentDetails::From(m_details), mojom::blink:
:PaymentOptions::From(m_options)); | 378 m_paymentProvider->Show(mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::
From(m_methodData), mojom::blink::PaymentDetails::From(m_details), mojom::blink:
:PaymentOptions::From(m_options)); |
| 378 | 379 |
| 379 m_showResolver = ScriptPromiseResolver::create(scriptState); | 380 m_showResolver = ScriptPromiseResolver::create(scriptState); |
| 380 return m_showResolver->promise(); | 381 return m_showResolver->promise(); |
| 381 } | 382 } |
| 382 | 383 |
| 383 ScriptPromise PaymentRequest::abort(ScriptState* scriptState) | 384 ScriptPromise PaymentRequest::abort(ScriptState* scriptState) |
| 384 { | 385 { |
| 385 if (m_abortResolver) | 386 if (m_abortResolver) |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 579 } | 580 } |
| 580 | 581 |
| 581 m_showResolver->resolve(new PaymentResponse(std::move(response), this)); | 582 m_showResolver->resolve(new PaymentResponse(std::move(response), this)); |
| 582 | 583 |
| 583 // Do not close the mojo connection here. The merchant website should call | 584 // Do not close the mojo connection here. The merchant website should call |
| 584 // PaymentResponse::complete(boolean), which will be forwarded over the mojo | 585 // PaymentResponse::complete(boolean), which will be forwarded over the mojo |
| 585 // connection to display a success or failure message to the user. | 586 // connection to display a success or failure message to the user. |
| 586 m_showResolver.clear(); | 587 m_showResolver.clear(); |
| 587 } | 588 } |
| 588 | 589 |
| 589 void PaymentRequest::OnError() | 590 void PaymentRequest::OnError(mojo::PaymentErrorReason error) |
| 590 { | 591 { |
| 591 if (m_completeResolver) | 592 bool isError = false; |
| 592 m_completeResolver->reject(DOMException::create(SyntaxError, "Request ca
ncelled")); | 593 ExceptionCode ec = UnknownError; |
| 593 if (m_showResolver) | 594 String message; |
| 594 m_showResolver->reject(DOMException::create(SyntaxError, "Request cancel
led")); | 595 |
| 595 if (m_abortResolver) | 596 switch (error) { |
| 596 m_abortResolver->reject(DOMException::create(SyntaxError, "Request cance
lled")); | 597 case mojom::blink::PaymentErrorReason::USER_CANCEL: |
| 598 message = "Request cancelled"; |
| 599 break; |
| 600 case mojom::blink::PaymentErrorReason::NOT_SUPPORTED: |
| 601 isError = true; |
| 602 ec = NotSupportedError; |
| 603 message = "The payment method is not supported"; |
| 604 break; |
| 605 case mojom::blink::PaymentErrorReason::UNKNOWN: |
| 606 isError = true; |
| 607 ec = UnknownError; |
| 608 message = "Request failed"; |
| 609 break; |
| 610 } |
| 611 |
| 612 DCHECK(!message.isEmpty()); |
| 613 |
| 614 if (isError) { |
| 615 if (m_completeResolver) |
| 616 m_completeResolver->reject(DOMException::create(ec, message)); |
| 617 |
| 618 if (m_showResolver) |
| 619 m_showResolver->reject(DOMException::create(ec, message)); |
| 620 |
| 621 if (m_abortResolver) |
| 622 m_abortResolver->reject(DOMException::create(ec, message)); |
| 623 } else { |
| 624 if (m_completeResolver) |
| 625 m_completeResolver->reject(message); |
| 626 |
| 627 if (m_showResolver) |
| 628 m_showResolver->reject(message); |
| 629 |
| 630 if (m_abortResolver) |
| 631 m_abortResolver->reject(message); |
| 632 } |
| 633 |
| 597 clearResolversAndCloseMojoConnection(); | 634 clearResolversAndCloseMojoConnection(); |
| 598 } | 635 } |
| 599 | 636 |
| 600 void PaymentRequest::OnComplete() | 637 void PaymentRequest::OnComplete() |
| 601 { | 638 { |
| 602 DCHECK(m_completeResolver); | 639 DCHECK(m_completeResolver); |
| 603 m_completeResolver->resolve(); | 640 m_completeResolver->resolve(); |
| 604 clearResolversAndCloseMojoConnection(); | 641 clearResolversAndCloseMojoConnection(); |
| 605 } | 642 } |
| 606 | 643 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 624 { | 661 { |
| 625 m_completeResolver.clear(); | 662 m_completeResolver.clear(); |
| 626 m_showResolver.clear(); | 663 m_showResolver.clear(); |
| 627 m_abortResolver.clear(); | 664 m_abortResolver.clear(); |
| 628 if (m_clientBinding.is_bound()) | 665 if (m_clientBinding.is_bound()) |
| 629 m_clientBinding.Close(); | 666 m_clientBinding.Close(); |
| 630 m_paymentProvider.reset(); | 667 m_paymentProvider.reset(); |
| 631 } | 668 } |
| 632 | 669 |
| 633 } // namespace blink | 670 } // namespace blink |
| OLD | NEW |