Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: Source/bindings/v8/ScriptPromiseResolverWithContext.h

Issue 243703007: Enable V8 Promises. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/bindings/v8/ScriptPromiseResolverWithContext.h
diff --git a/Source/bindings/v8/ScriptPromiseResolverWithContext.h b/Source/bindings/v8/ScriptPromiseResolverWithContext.h
index c55f73917b5721c23169c5349ec8cef9a581c951..e9e4f9c5d4e46fb1a10abccb42747f6a5eae9c16 100644
--- a/Source/bindings/v8/ScriptPromiseResolverWithContext.h
+++ b/Source/bindings/v8/ScriptPromiseResolverWithContext.h
@@ -42,26 +42,14 @@ public:
template <typename T>
void resolve(T value)
{
- if (m_state != Pending || !executionContext() || executionContext()->activeDOMObjectsAreStopped())
- return;
- m_state = Resolving;
- NewScriptState::Scope scope(m_scriptState.get());
- m_value.set(m_scriptState->isolate(), toV8Value(value));
- if (!executionContext()->activeDOMObjectsAreSuspended())
- resolveOrRejectImmediately(&m_timer);
+ resolveOrReject(value, Resolving);
}
// Anything that can be passed to toV8Value can be passed to this function.
template <typename T>
void reject(T value)
{
- if (m_state != Pending || !executionContext() || executionContext()->activeDOMObjectsAreStopped())
- return;
- m_state = Rejecting;
- NewScriptState::Scope scope(m_scriptState.get());
- m_value.set(m_scriptState->isolate(), toV8Value(value));
- if (!executionContext()->activeDOMObjectsAreSuspended())
- resolveOrRejectImmediately(&m_timer);
+ resolveOrReject(value, Rejecting);
}
NewScriptState* scriptState() { return m_scriptState.get(); }
@@ -102,7 +90,29 @@ private:
return ToV8Value<ScriptPromiseResolverWithContext, NewScriptState*>::toV8Value(value, m_scriptState.get(), m_scriptState->isolate());
}
- void resolveOrRejectImmediately(Timer<ScriptPromiseResolverWithContext>*);
+ template <typename T>
+ void resolveOrReject(T value, ResolutionState newState)
+ {
+ if (m_state != Pending || !executionContext() || executionContext()->activeDOMObjectsAreStopped())
+ return;
+ m_state = newState;
+ // Retain this object until it is actually resolved or rejected.
+ // |deref| will be called in |clear|.
+ ref();
+
+ NewScriptState::Scope scope(m_scriptState.get());
+ m_value.set(m_scriptState->isolate(), toV8Value(value));
+ if (!executionContext()->activeDOMObjectsAreSuspended()) {
+ resolveOrRejectImmediately();
+ // |this| can't be deleted here, so it is safe to call an instance
+ // method.
+ postRunMicrotasks();
+ }
+ }
+
+ void resolveOrRejectImmediately();
+ void postRunMicrotasks();
+ void onTimerFired(Timer<ScriptPromiseResolverWithContext>*);
void clear();
ResolutionState m_state;

Powered by Google App Engine
This is Rietveld 408576698