Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp |
index 66ff5e9878de7af7e6908e3d3e8172891bd9e37a..d85871a60d8ebbc5d4f97418f06bc53ac7e397fb 100644 |
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp |
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp |
@@ -201,18 +201,7 @@ const AtomicString& PaymentRequest::interfaceName() const |
ExecutionContext* PaymentRequest::getExecutionContext() const |
{ |
- return m_scriptState->getExecutionContext(); |
-} |
- |
-ScriptPromise PaymentRequest::complete(ScriptState* scriptState, bool success) |
-{ |
- if (m_completeResolver) |
- return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called complete() once")); |
- |
- m_completeResolver = ScriptPromiseResolver::create(scriptState); |
- m_paymentProvider->Complete(success); |
- |
- return m_completeResolver->promise(); |
+ return ContextLifecycleObserver::getExecutionContext(); |
} |
DEFINE_TRACE(PaymentRequest) |
@@ -223,10 +212,11 @@ DEFINE_TRACE(PaymentRequest) |
visitor->trace(m_showResolver); |
visitor->trace(m_completeResolver); |
EventTargetWithInlineData::trace(visitor); |
+ ContextLifecycleObserver::trace(visitor); |
} |
PaymentRequest::PaymentRequest(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, const PaymentOptions& options, const ScriptValue& data, ExceptionState& exceptionState) |
- : m_scriptState(scriptState) |
+ : ContextLifecycleObserver(scriptState->getExecutionContext()) |
, m_supportedMethods(supportedMethods) |
, m_details(details) |
, m_options(options) |
@@ -297,6 +287,22 @@ PaymentRequest::PaymentRequest(ScriptState* scriptState, const Vector<String>& s |
m_shippingOption = details.shippingOptions().begin()->id(); |
} |
+ScriptPromise PaymentRequest::complete(ScriptState* scriptState, bool success) |
please use gerrit instead
2016/04/13 22:56:46
Let's keep the order of methods in PaymentRequest.
rwlbuis
2016/04/14 00:28:33
Done.
|
+{ |
+ if (m_completeResolver) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called complete() once")); |
+ |
+ m_completeResolver = ScriptPromiseResolver::create(scriptState); |
+ m_paymentProvider->Complete(success); |
+ |
+ return m_completeResolver->promise(); |
+} |
+ |
+void PaymentRequest::contextDestroyed() |
+{ |
+ cleanUp(); |
+} |
+ |
void PaymentRequest::OnShippingAddressChange(mojom::wtf::ShippingAddressPtr address) |
{ |
DCHECK(m_showResolver); |