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/PaymentRequestEvent.h" | 5 #include "modules/payments/PaymentRequestEvent.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
8 #include "core/dom/DOMException.h" | 8 #include "core/dom/DOMException.h" |
9 #include "core/workers/WorkerGlobalScope.h" | 9 #include "core/workers/WorkerGlobalScope.h" |
10 #include "core/workers/WorkerLocation.h" | 10 #include "core/workers/WorkerLocation.h" |
11 #include "modules/serviceworkers/RespondWithObserver.h" | 11 #include "modules/serviceworkers/RespondWithObserver.h" |
12 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 12 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
13 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" | 13 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" |
| 14 #include "platform/bindings/ScriptState.h" |
14 #include "platform/wtf/PtrUtil.h" | 15 #include "platform/wtf/PtrUtil.h" |
15 #include "platform/wtf/text/AtomicString.h" | 16 #include "platform/wtf/text/AtomicString.h" |
16 | 17 |
17 namespace blink { | 18 namespace blink { |
| 19 namespace { |
| 20 |
| 21 ScriptValue toScriptValue(ScriptState* script_state, const PaymentItem& item) { |
| 22 if (!script_state->ContextIsValid()) |
| 23 return ScriptValue(); |
| 24 |
| 25 ScriptState::Scope scope(script_state); |
| 26 |
| 27 return ScriptValue::From(script_state, item); |
| 28 } |
| 29 |
| 30 } // namespace |
18 | 31 |
19 PaymentRequestEvent* PaymentRequestEvent::Create( | 32 PaymentRequestEvent* PaymentRequestEvent::Create( |
| 33 ScriptState* script_state, |
20 const AtomicString& type, | 34 const AtomicString& type, |
21 const PaymentRequestEventInit& initializer) { | 35 const PaymentRequestEventInit& initializer) { |
22 return new PaymentRequestEvent(type, initializer, nullptr, nullptr); | 36 return new PaymentRequestEvent(script_state, type, initializer, nullptr, |
| 37 nullptr); |
23 } | 38 } |
24 | 39 |
25 PaymentRequestEvent* PaymentRequestEvent::Create( | 40 PaymentRequestEvent* PaymentRequestEvent::Create( |
| 41 ScriptState* script_state, |
26 const AtomicString& type, | 42 const AtomicString& type, |
27 const PaymentRequestEventInit& initializer, | 43 const PaymentRequestEventInit& initializer, |
28 RespondWithObserver* respond_with_observer, | 44 RespondWithObserver* respond_with_observer, |
29 WaitUntilObserver* wait_until_observer) { | 45 WaitUntilObserver* wait_until_observer) { |
30 return new PaymentRequestEvent(type, initializer, respond_with_observer, | 46 return new PaymentRequestEvent(script_state, type, initializer, |
31 wait_until_observer); | 47 respond_with_observer, wait_until_observer); |
32 } | 48 } |
33 | 49 |
34 PaymentRequestEvent::~PaymentRequestEvent() {} | 50 PaymentRequestEvent::~PaymentRequestEvent() {} |
35 | 51 |
36 const AtomicString& PaymentRequestEvent::InterfaceName() const { | 52 const AtomicString& PaymentRequestEvent::InterfaceName() const { |
37 return EventNames::PaymentRequestEvent; | 53 return EventNames::PaymentRequestEvent; |
38 } | 54 } |
39 | 55 |
40 const String& PaymentRequestEvent::topLevelOrigin() const { | 56 const String& PaymentRequestEvent::topLevelOrigin() const { |
41 return top_level_origin_; | 57 return top_level_origin_; |
42 } | 58 } |
43 | 59 |
44 const String& PaymentRequestEvent::paymentRequestOrigin() const { | 60 const String& PaymentRequestEvent::paymentRequestOrigin() const { |
45 return payment_request_origin_; | 61 return payment_request_origin_; |
46 } | 62 } |
47 | 63 |
48 const String& PaymentRequestEvent::paymentRequestId() const { | 64 const String& PaymentRequestEvent::paymentRequestId() const { |
49 return payment_request_id_; | 65 return payment_request_id_; |
50 } | 66 } |
51 | 67 |
52 const HeapVector<PaymentMethodData>& PaymentRequestEvent::methodData() const { | 68 const HeapVector<PaymentMethodData>& PaymentRequestEvent::methodData() const { |
53 return method_data_; | 69 return method_data_; |
54 } | 70 } |
55 | 71 |
56 void PaymentRequestEvent::total(PaymentItem& value) const { | 72 const ScriptValue& PaymentRequestEvent::total() const { |
57 value = total_; | 73 return total_; |
58 } | 74 } |
59 | 75 |
60 const HeapVector<PaymentDetailsModifier>& PaymentRequestEvent::modifiers() | 76 const HeapVector<PaymentDetailsModifier>& PaymentRequestEvent::modifiers() |
61 const { | 77 const { |
62 return modifiers_; | 78 return modifiers_; |
63 } | 79 } |
64 | 80 |
65 const String& PaymentRequestEvent::instrumentKey() const { | 81 const String& PaymentRequestEvent::instrumentKey() const { |
66 return instrument_key_; | 82 return instrument_key_; |
67 } | 83 } |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 } | 133 } |
118 | 134 |
119 DEFINE_TRACE(PaymentRequestEvent) { | 135 DEFINE_TRACE(PaymentRequestEvent) { |
120 visitor->Trace(method_data_); | 136 visitor->Trace(method_data_); |
121 visitor->Trace(modifiers_); | 137 visitor->Trace(modifiers_); |
122 visitor->Trace(observer_); | 138 visitor->Trace(observer_); |
123 ExtendableEvent::Trace(visitor); | 139 ExtendableEvent::Trace(visitor); |
124 } | 140 } |
125 | 141 |
126 PaymentRequestEvent::PaymentRequestEvent( | 142 PaymentRequestEvent::PaymentRequestEvent( |
| 143 ScriptState* script_state, |
127 const AtomicString& type, | 144 const AtomicString& type, |
128 const PaymentRequestEventInit& initializer, | 145 const PaymentRequestEventInit& initializer, |
129 RespondWithObserver* respond_with_observer, | 146 RespondWithObserver* respond_with_observer, |
130 WaitUntilObserver* wait_until_observer) | 147 WaitUntilObserver* wait_until_observer) |
131 : ExtendableEvent(type, initializer, wait_until_observer), | 148 : ExtendableEvent(type, initializer, wait_until_observer), |
132 top_level_origin_(initializer.topLevelOrigin()), | 149 top_level_origin_(initializer.topLevelOrigin()), |
133 payment_request_origin_(initializer.paymentRequestOrigin()), | 150 payment_request_origin_(initializer.paymentRequestOrigin()), |
134 payment_request_id_(initializer.paymentRequestId()), | 151 payment_request_id_(initializer.paymentRequestId()), |
135 method_data_(std::move(initializer.methodData())), | 152 method_data_(std::move(initializer.methodData())), |
136 total_(initializer.total()), | 153 total_(toScriptValue(script_state, initializer.total())), |
137 modifiers_(initializer.modifiers()), | 154 modifiers_(initializer.modifiers()), |
138 instrument_key_(initializer.instrumentKey()), | 155 instrument_key_(initializer.instrumentKey()), |
139 observer_(respond_with_observer) {} | 156 observer_(respond_with_observer) {} |
140 | 157 |
141 } // namespace blink | 158 } // namespace blink |
OLD | NEW |