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

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

Issue 238723009: Implement V8ValueTraits<T>::toV8Value conversion functions (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 39791f4fcd2623b827df7a692afb3af2603b64ed..9125164432f74f3d6ebda2ea022e9c5c8beab0b3 100644
--- a/Source/bindings/v8/ScriptPromiseResolverWithContext.h
+++ b/Source/bindings/v8/ScriptPromiseResolverWithContext.h
@@ -38,26 +38,30 @@ public:
return resolver.release();
}
+ // Anything that can be passed to ToV8Value::toV8Value can be passed to
+ // this function.
template <typename T>
- void resolve(T value)
+ void resolve(const 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(), toV8(value));
+ m_value.set(m_scriptState->isolate(), toV8Value(value));
if (!executionContext()->activeDOMObjectsAreSuspended())
resolveOrRejectImmediately(&m_timer);
}
+ // Anything that can be passed to ToV8Value::toV8Value can be passed to
+ // this function.
template <typename T>
- void reject(T value)
+ void reject(const 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(), toV8(value));
+ m_value.set(m_scriptState->isolate(), toV8Value(value));
if (!executionContext()->activeDOMObjectsAreSuspended())
resolveOrRejectImmediately(&m_timer);
}
@@ -85,30 +89,27 @@ private:
};
explicit ScriptPromiseResolverWithContext(NewScriptState*);
+ void resolveOrRejectImmediately(Timer<ScriptPromiseResolverWithContext>*);
+ void clear();
template <typename T>
- v8::Handle<v8::Value> toV8(T* value)
- {
- ASSERT(m_scriptState);
- ASSERT(!m_scriptState->contextIsEmpty());
- return toV8NoInline(value, m_scriptState->context()->Global(), m_scriptState->isolate());
- }
- template <typename T> v8::Handle<v8::Value> toV8(PassRefPtr<T> value) { return toV8(value.get()); }
- template <typename T> v8::Handle<v8::Value> toV8(RawPtr<T> value) { return toV8(value.get()); }
- template <typename T, size_t inlineCapacity>
- v8::Handle<v8::Value> toV8(const Vector<T, inlineCapacity>& value)
- {
- ASSERT(m_scriptState);
- return v8ArrayNoInline(value, m_scriptState->isolate());
- }
- v8::Handle<v8::Value> toV8(ScriptValue value)
+ struct ToV8ValueHelper {
+ static v8::Handle<v8::Value> toV8Value(const T& value, NewScriptState* scriptState, v8::Isolate* isolate)
+ {
+ return V8ValueTraits<T>::toV8Value(value, scriptState->context()->Global(), isolate);
+ }
+ static v8::Handle<v8::Value> toV8Value(const T& value, v8::Isolate* isolate)
+ {
+ return V8ValueTraits<T>::toV8Value(value, isolate);
+ }
+ };
+
+ template <typename T>
+ v8::Handle<v8::Value> toV8Value(const T& value)
{
- return value.v8Value();
+ return WebCore::ToV8ValueHelper<NewScriptState*, ToV8ValueHelper<T> >::toV8Value(value, m_scriptState.get(), m_scriptState->isolate());
}
- void resolveOrRejectImmediately(Timer<ScriptPromiseResolverWithContext>*);
- void clear();
-
ResolutionState m_state;
RefPtr<NewScriptState> m_scriptState;
Timer<ScriptPromiseResolverWithContext> m_timer;

Powered by Google App Engine
This is Rietveld 408576698