Web payment shipping address/option timeout.

third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEvent.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/PaymentRequestUpdateEvent.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/DOMException.h"
@@ skipping 105 matching lines @@
 
   if (wait_for_update_) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "Cannot update details twice");
     return;
   }
 
   stopPropagation();
   stopImmediatePropagation();
   wait_for_update_ = true;
-  abort_timer_.Stop();
 
   promise.Then(
-      UpdatePaymentDetailsFunction::CreateFunction(script_state, updater_),
-      UpdatePaymentDetailsErrorFunction::CreateFunction(script_state,
-                                                        updater_));
+      UpdatePaymentDetailsFunction::CreateFunction(script_state, this),
+      UpdatePaymentDetailsErrorFunction::CreateFunction(script_state, this));
+}
+
+void PaymentRequestUpdateEvent::OnUpdatePaymentDetails(
+    const ScriptValue& details_script_value) {
+  if (!updater_)
+    return;
+  abort_timer_.Stop();
+  updater_->OnUpdatePaymentDetails(details_script_value);
+  updater_ = nullptr;
+}
+
+void PaymentRequestUpdateEvent::OnUpdatePaymentDetailsFailure(
+    const String& error) {
+  if (!updater_)
+    return;
+  abort_timer_.Stop();
+  updater_->OnUpdatePaymentDetailsFailure(error);
+  updater_ = nullptr;
 }
 
 DEFINE_TRACE(PaymentRequestUpdateEvent) {
   visitor->Trace(updater_);
   Event::Trace(visitor);
 }
 
 void PaymentRequestUpdateEvent::OnUpdateEventTimeoutForTesting() {
-  OnUpdateEventTimeout(0);
-}
-
-void PaymentRequestUpdateEvent::OnUpdateEventTimeout(TimerBase*) {
-  if (!updater_)
-    return;
-
-  updater_->OnUpdatePaymentDetailsFailure(
-      "Timed out as the page didn't resolve the promise from change event");
+  OnUpdateEventTimeout(nullptr);
 }
 
 PaymentRequestUpdateEvent::PaymentRequestUpdateEvent(
     ExecutionContext* execution_context,
     const AtomicString& type,
     const PaymentRequestUpdateEventInit& init)
     : Event(type, init),
       wait_for_update_(false),
       abort_timer_(
           TaskRunnerHelper::Get(TaskType::kUserInteraction, execution_context),
           this,
           &PaymentRequestUpdateEvent::OnUpdateEventTimeout) {}
 
+void PaymentRequestUpdateEvent::OnUpdateEventTimeout(TimerBase*) {
+  OnUpdatePaymentDetailsFailure("Timed out waiting for a response to a '" +
+                                type() + "' event");
+}
+
 }  // namespace blink