Separate PaymentRequest initialization and display.

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 361 matching lines @@
 {
     return new PaymentRequest(scriptState, methodData, details, options, exceptionState);
 }
 
 PaymentRequest::~PaymentRequest()
 {
 }
 
 ScriptPromise PaymentRequest::show(ScriptState* scriptState)
 {
-    if (m_showResolver)
+    if (!m_paymentProvider.is_bound() || m_showResolver)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called show() once"));
 
     if (!scriptState->domWindow() || !scriptState->domWindow()->frame())
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Cannot show the payment request"));
 
-    DCHECK(!m_paymentProvider.is_bound());
-    scriptState->domWindow()->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_paymentProvider));
-    m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));
-    m_paymentProvider->SetClient(m_clientBinding.CreateInterfacePtrAndBind());
-    m_paymentProvider->Show(mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(m_methodData), mojom::blink::PaymentDetails::From(m_details), mojom::blink::PaymentOptions::From(m_options));
+    m_paymentProvider->Show();
 
     m_showResolver = ScriptPromiseResolver::create(scriptState);
     return m_showResolver->promise();
 }
 
 ScriptPromise PaymentRequest::abort(ScriptState* scriptState)
 {
     if (m_abortResolver)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Cannot abort() again until the previous abort() has resolved or rejected"));
 
@@ skipping 67 matching lines @@
 {
     if (m_showResolver)
         m_showResolver->reject(DOMException::create(AbortError, error));
     if (m_completeResolver)
         m_completeResolver->reject(DOMException::create(AbortError, error));
     clearResolversAndCloseMojoConnection();
 }
 
 DEFINE_TRACE(PaymentRequest)
 {
-    visitor->trace(m_details);
     visitor->trace(m_options);
     visitor->trace(m_shippingAddress);
     visitor->trace(m_showResolver);
     visitor->trace(m_completeResolver);
     visitor->trace(m_abortResolver);
     EventTargetWithInlineData::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
 }
 
 void PaymentRequest::onCompleteTimeoutForTesting()
 {
     m_completeTimer.stop();
     onCompleteTimeout(0);
 }
 
 PaymentRequest::PaymentRequest(ScriptState* scriptState, const HeapVector<PaymentMethodData>& methodData, const PaymentDetails& details, const PaymentOptions& options, ExceptionState& exceptionState)
     : ContextLifecycleObserver(scriptState->getExecutionContext())
     , ActiveScriptWrappable(this)
     , m_options(options)
     , m_clientBinding(this)
     , m_completeTimer(this, &PaymentRequest::onCompleteTimeout)
 {
-    validateAndConvertPaymentMethodData(methodData, &m_methodData, exceptionState);
+    Vector<MethodData> validatedMethodData;
+    validateAndConvertPaymentMethodData(methodData, &validatedMethodData, exceptionState);
     if (exceptionState.hadException())
         return;
 
     if (!scriptState->getExecutionContext()->isSecureContext()) {
         exceptionState.throwSecurityError("Must be in a secure context");
         return;
     }
 
     if (!scriptState->domWindow()->frame() || !scriptState->domWindow()->frame()->isMainFrame()) {
         exceptionState.throwSecurityError("Must be in a top-level browsing context");
         return;
     }
 
     validatePaymentDetails(details, exceptionState);
     if (exceptionState.hadException())
         return;
-    m_details = details;
 
     if (m_options.requestShipping())
         m_shippingOption = getSelectedShippingOption(details);
+
+    scriptState->domWindow()->frame()->interfaceProvider()->getInterface(mojo::GetProxy(&m_paymentProvider));
+    m_paymentProvider.set_connection_error_handler(convertToBaseCallback(WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this), mojom::blink::PaymentErrorReason::UNKNOWN)));
+    m_paymentProvider->Init(m_clientBinding.CreateInterfacePtrAndBind(), mojo::WTFArray<mojom::blink::PaymentMethodDataPtr>::From(validatedMethodData), mojom::blink::PaymentDetails::From(details), mojom::blink::PaymentOptions::From(m_options));
 }
 
 void PaymentRequest::contextDestroyed()
 {
     clearResolversAndCloseMojoConnection();
 }
 
 bool PaymentRequest::hasPendingActivity() const
 {
     return m_showResolver || m_completeResolver;
@@ skipping 163 matching lines @@
     m_completeTimer.stop();
     m_completeResolver.clear();
     m_showResolver.clear();
     m_abortResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink