PaymentHandler: PaymentRequestEvent.total should be |object| type.

third_party/WebKit/Source/modules/payments/PaymentRequestEvent.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/PaymentRequestEvent.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLocation.h"
 #include "modules/serviceworkers/RespondWithObserver.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
+#include "platform/bindings/ScriptState.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/text/AtomicString.h"
 
 namespace blink {
+namespace {
+
+ScriptValue toScriptValue(ScriptState* script_state, const PaymentItem& item) {
+  if (!script_state->ContextIsValid())
+    return ScriptValue();
+
+  ScriptState::Scope scope(script_state);
+
+  return ScriptValue::From(script_state, item);
+}
+
+}  // namespace
 
 PaymentRequestEvent* PaymentRequestEvent::Create(
+    ScriptState* script_state,
     const AtomicString& type,
     const PaymentRequestEventInit& initializer) {
-  return new PaymentRequestEvent(type, initializer, nullptr, nullptr);
+  return new PaymentRequestEvent(script_state, type, initializer, nullptr,
+                                 nullptr);
 }
 
 PaymentRequestEvent* PaymentRequestEvent::Create(
+    ScriptState* script_state,
     const AtomicString& type,
     const PaymentRequestEventInit& initializer,
     RespondWithObserver* respond_with_observer,
     WaitUntilObserver* wait_until_observer) {
-  return new PaymentRequestEvent(type, initializer, respond_with_observer,
-                                 wait_until_observer);
+  return new PaymentRequestEvent(script_state, type, initializer,
+                                 respond_with_observer, wait_until_observer);
 }
 
 PaymentRequestEvent::~PaymentRequestEvent() {}
 
 const AtomicString& PaymentRequestEvent::InterfaceName() const {
   return EventNames::PaymentRequestEvent;
 }
 
 const String& PaymentRequestEvent::topLevelOrigin() const {
   return top_level_origin_;
 }
 
 const String& PaymentRequestEvent::paymentRequestOrigin() const {
   return payment_request_origin_;
 }
 
 const String& PaymentRequestEvent::paymentRequestId() const {
   return payment_request_id_;
 }
 
 const HeapVector<PaymentMethodData>& PaymentRequestEvent::methodData() const {
   return method_data_;
 }
 
-void PaymentRequestEvent::total(PaymentItem& value) const {
-  value = total_;
+const ScriptValue& PaymentRequestEvent::total() const {
+  return total_;
 }
 
 const HeapVector<PaymentDetailsModifier>& PaymentRequestEvent::modifiers()
     const {
   return modifiers_;
 }
 
 const String& PaymentRequestEvent::instrumentKey() const {
   return instrument_key_;
 }
@@ skipping 49 matching lines @@
 }
 
 DEFINE_TRACE(PaymentRequestEvent) {
   visitor->Trace(method_data_);
   visitor->Trace(modifiers_);
   visitor->Trace(observer_);
   ExtendableEvent::Trace(visitor);
 }
 
 PaymentRequestEvent::PaymentRequestEvent(
+    ScriptState* script_state,
     const AtomicString& type,
     const PaymentRequestEventInit& initializer,
     RespondWithObserver* respond_with_observer,
     WaitUntilObserver* wait_until_observer)
     : ExtendableEvent(type, initializer, wait_until_observer),
       top_level_origin_(initializer.topLevelOrigin()),
       payment_request_origin_(initializer.paymentRequestOrigin()),
       payment_request_id_(initializer.paymentRequestId()),
       method_data_(std::move(initializer.methodData())),
-      total_(initializer.total()),
+      total_(toScriptValue(script_state, initializer.total())),
       modifiers_(initializer.modifiers()),
       instrument_key_(initializer.instrumentKey()),
       observer_(respond_with_observer) {}
 
 }  // namespace blink