Revert of PaymentRequest: Introduce PaymentDetailsInit and PaymentDetailsUpdate.

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 <stddef.h>
 #include <utility>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8StringResource.h"
 #include "bindings/modules/v8/V8AndroidPayMethodData.h"
 #include "bindings/modules/v8/V8BasicCardRequest.h"
-#include "bindings/modules/v8/V8PaymentDetailsUpdate.h"
+#include "bindings/modules/v8/V8PaymentDetails.h"
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/Event.h"
 #include "core/events/EventQueue.h"
 #include "core/frame/FrameOwner.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ConsoleTypes.h"
 #include "modules/EventTargetModulesNames.h"
 #include "modules/payments/AndroidPayMethodData.h"
 #include "modules/payments/AndroidPayTokenization.h"
 #include "modules/payments/BasicCardRequest.h"
 #include "modules/payments/HTMLIFrameElementPayments.h"
 #include "modules/payments/PaymentAddress.h"
-#include "modules/payments/PaymentDetailsInit.h"
-#include "modules/payments/PaymentDetailsUpdate.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
@@ skipping 422 matching lines @@
 String getSelectedShippingOption(
     const Vector<PaymentShippingOptionPtr>& shippingOptions) {
   String result;
   for (const PaymentShippingOptionPtr& shippingOption : shippingOptions) {
     if (shippingOption->selected)
       result = shippingOption->id;
   }
   return result;
 }
 
-void validateAndConvertPaymentDetailsBase(const PaymentDetailsBase& input,
-                                          bool requestShipping,
-                                          PaymentDetailsPtr& output,
-                                          String& shippingOptionOutput,
-                                          ExecutionContext& executionContext,
-                                          ExceptionState& exceptionState) {
+void validateAndConvertPaymentDetails(const PaymentDetails& input,
+                                      bool requestShipping,
+                                      PaymentDetailsPtr& output,
+                                      String& shippingOptionOutput,
+                                      ExecutionContext& executionContext,
+                                      ExceptionState& exceptionState) {
+  if (!input.hasTotal()) {
+    exceptionState.throwTypeError("Must specify total");
+    return;
+  }
+
+  validateAndConvertTotal(input.total(), output->total, exceptionState);
+  if (exceptionState.hadException())
+    return;
+
   if (input.hasDisplayItems()) {
     validateAndConvertDisplayItems(input.displayItems(), output->display_items,
                                    exceptionState);
     if (exceptionState.hadException())
       return;
   }
 
   if (input.hasShippingOptions() && requestShipping) {
     validateAndConvertShippingOptions(input.shippingOptions(),
                                       output->shipping_options, exceptionState);
     if (exceptionState.hadException())
       return;
   }
 
   shippingOptionOutput = getSelectedShippingOption(output->shipping_options);
 
   if (input.hasModifiers()) {
     validateAndConvertPaymentDetailsModifiers(
         input.modifiers(), output->modifiers, executionContext, exceptionState);
     if (exceptionState.hadException())
       return;
   }
-}
-
-void validateAndConvertPaymentDetailsInit(const PaymentDetailsInit& input,
-                                          bool requestShipping,
-                                          PaymentDetailsPtr& output,
-                                          String& shippingOptionOutput,
-                                          ExecutionContext& executionContext,
-                                          ExceptionState& exceptionState) {
-  validateAndConvertPaymentDetailsBase(input, requestShipping, output,
-                                       shippingOptionOutput, executionContext,
-                                       exceptionState);
-  if (exceptionState.hadException())
-    return;
-
-  if (!input.hasTotal()) {
-    exceptionState.throwTypeError("Must specify total");
-    return;
-  }
-
-  validateAndConvertTotal(input.total(), output->total, exceptionState);
-}
-
-void validateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate& input,
-                                            bool requestShipping,
-                                            PaymentDetailsPtr& output,
-                                            String& shippingOptionOutput,
-                                            ExecutionContext& executionContext,
-                                            ExceptionState& exceptionState) {
-  validateAndConvertPaymentDetailsBase(input, requestShipping, output,
-                                       shippingOptionOutput, executionContext,
-                                       exceptionState);
-  if (exceptionState.hadException())
-    return;
-
-  if (input.hasTotal()) {
-    validateAndConvertTotal(input.total(), output->total, exceptionState);
-    if (exceptionState.hadException())
-      return;
-  }
 
   if (input.hasError() && !input.error().isNull()) {
     String errorMessage;
     if (!PaymentsValidators::isValidErrorMsgFormat(input.error(),
                                                    &errorMessage)) {
       exceptionState.throwTypeError(errorMessage);
       return;
     }
     output->error = input.error();
   } else {
@@ skipping 99 matching lines @@
   // Otherwise, paymentrequest is not allowed. (If we reach here and this is
   // the main frame, then paymentrequest must have been disabled by FP.)
   return false;
 }
 
 }  // namespace
 
 PaymentRequest* PaymentRequest::create(
     ExecutionContext* executionContext,
     const HeapVector<PaymentMethodData>& methodData,
-    const PaymentDetailsInit& details,
+    const PaymentDetails& details,
     ExceptionState& exceptionState) {
   return new PaymentRequest(executionContext, methodData, details,
                             PaymentOptions(), exceptionState);
 }
 
 PaymentRequest* PaymentRequest::create(
     ExecutionContext* executionContext,
     const HeapVector<PaymentMethodData>& methodData,
-    const PaymentDetailsInit& details,
+    const PaymentDetails& details,
     const PaymentOptions& options,
     ExceptionState& exceptionState) {
   return new PaymentRequest(executionContext, methodData, details, options,
                             exceptionState);
 }
 
 PaymentRequest::~PaymentRequest() {}
 
 ScriptPromise PaymentRequest::show(ScriptState* scriptState) {
   if (!m_paymentProvider.is_bound() || m_showResolver) {
@@ skipping 103 matching lines @@
 
   m_completeResolver = ScriptPromiseResolver::create(scriptState);
   return m_completeResolver->promise();
 }
 
 void PaymentRequest::onUpdatePaymentDetails(
     const ScriptValue& detailsScriptValue) {
   if (!m_showResolver || !m_paymentProvider)
     return;
 
-  PaymentDetailsUpdate details;
+  PaymentDetails details;
   ExceptionState exceptionState(v8::Isolate::GetCurrent(),
                                 ExceptionState::ConstructionContext,
-                                "PaymentDetailsUpdate");
-  V8PaymentDetailsUpdate::toImpl(detailsScriptValue.isolate(),
-                                 detailsScriptValue.v8Value(), details,
-                                 exceptionState);
+                                "PaymentDetails");
+  V8PaymentDetails::toImpl(detailsScriptValue.isolate(),
+                           detailsScriptValue.v8Value(), details,
+                           exceptionState);
   if (exceptionState.hadException()) {
     m_showResolver->reject(
         DOMException::create(SyntaxError, exceptionState.message()));
     clearResolversAndCloseMojoConnection();
     return;
   }
 
   PaymentDetailsPtr validatedDetails =
       payments::mojom::blink::PaymentDetails::New();
-  validateAndConvertPaymentDetailsUpdate(
-      details, m_options.requestShipping(), validatedDetails, m_shippingOption,
-      *getExecutionContext(), exceptionState);
+  validateAndConvertPaymentDetails(details, m_options.requestShipping(),
+                                   validatedDetails, m_shippingOption,
+                                   *getExecutionContext(), exceptionState);
   if (exceptionState.hadException()) {
     m_showResolver->reject(
         DOMException::create(SyntaxError, exceptionState.message()));
     clearResolversAndCloseMojoConnection();
     return;
   }
 
   m_paymentProvider->UpdateWith(std::move(validatedDetails));
 }
 
@@ skipping 16 matching lines @@
   ContextLifecycleObserver::trace(visitor);
 }
 
 void PaymentRequest::onCompleteTimeoutForTesting() {
   m_completeTimer.stop();
   onCompleteTimeout(0);
 }
 
 PaymentRequest::PaymentRequest(ExecutionContext* executionContext,
                                const HeapVector<PaymentMethodData>& methodData,
-                               const PaymentDetailsInit& details,
+                               const PaymentDetails& details,
                                const PaymentOptions& options,
                                ExceptionState& exceptionState)
     : ContextLifecycleObserver(executionContext),
       m_options(options),
       m_clientBinding(this),
       m_completeTimer(TaskRunnerHelper::get(TaskType::MiscPlatformAPI, frame()),
                       this,
                       &PaymentRequest::onCompleteTimeout) {
   Vector<payments::mojom::blink::PaymentMethodDataPtr> validatedMethodData;
   validateAndConvertPaymentMethodData(methodData, validatedMethodData,
                                       *getExecutionContext(), exceptionState);
   if (exceptionState.hadException())
     return;
 
   if (!getExecutionContext()->isSecureContext()) {
     exceptionState.throwSecurityError("Must be in a secure context");
     return;
   }
 
   if (!allowedToUsePaymentRequest(frame())) {
     exceptionState.throwSecurityError(
         "Must be in a top-level browsing context or an iframe needs to specify "
         "'allowpaymentrequest' explicitly");
     return;
   }
 
   PaymentDetailsPtr validatedDetails =
       payments::mojom::blink::PaymentDetails::New();
-  validateAndConvertPaymentDetailsInit(details, m_options.requestShipping(),
-                                       validatedDetails, m_shippingOption,
-                                       *getExecutionContext(), exceptionState);
+  validateAndConvertPaymentDetails(details, m_options.requestShipping(),
+                                   validatedDetails, m_shippingOption,
+                                   *getExecutionContext(), exceptionState);
   if (exceptionState.hadException())
     return;
 
+  if (details.hasError()) {
+    exceptionState.throwTypeError("Error message not allowed in constructor");
+    return;
+  }
+
   if (m_options.requestShipping())
     m_shippingType = getValidShippingType(m_options.shippingType());
 
   frame()->interfaceProvider()->getInterface(
       mojo::MakeRequest(&m_paymentProvider));
   m_paymentProvider.set_connection_error_handler(convertToBaseCallback(
       WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this),
                 PaymentErrorReason::UNKNOWN)));
   m_paymentProvider->Init(
       m_clientBinding.CreateInterfacePtrAndBind(),
@@ skipping 176 matching lines @@
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   m_canMakePaymentResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink