ScriptPromise should understand the ScriptState from which the ScriptPromise is generated

Source/bindings/v8/ScriptPromise.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 #include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8DOMWrapper.h"
 #include "bindings/v8/custom/V8PromiseCustom.h"
 
 #include <v8.h>
 
 namespace WebCore {
 
-ScriptPromise::ScriptPromise(v8::Handle<v8::Value> value, v8::Isolate* isolate)
+ScriptPromise::ScriptPromise(ScriptState* scriptState, v8::Handle<v8::Value> value)
+    : m_scriptState(scriptState)
 {
     if (value.IsEmpty())
         return;
 
-    if (!V8PromiseCustom::isPromise(value, isolate) && !value->IsPromise()) {
-        m_promise = ScriptValue(v8::Handle<v8::Value>(), isolate);
-        V8ThrowException::throwTypeError("the given value is not a Promise", isolate);
+    if (!V8PromiseCustom::isPromise(value, scriptState->isolate()) && !value->IsPromise()) {
+        m_promise = ScriptValue(scriptState, v8::Handle<v8::Value>());
+        V8ThrowException::throwTypeError("the given value is not a Promise", scriptState->isolate());
         return;
     }
-    m_promise = ScriptValue(value, isolate);
+    m_promise = ScriptValue(scriptState, value);
 }
 
 ScriptPromise ScriptPromise::then(PassOwnPtr<ScriptFunction> onFulfilled, PassOwnPtr<ScriptFunction> onRejected)
 {
     if (m_promise.isEmpty())
         return ScriptPromise();
 
     v8::Local<v8::Object> promise = m_promise.v8Value().As<v8::Object>();
     v8::Local<v8::Function> v8OnFulfilled = ScriptFunction::adoptByGarbageCollector(onFulfilled);
     v8::Local<v8::Function> v8OnRejected = ScriptFunction::adoptByGarbageCollector(onRejected);
 
-    if (V8PromiseCustom::isPromise(promise, isolate()))
-        return ScriptPromise(V8PromiseCustom::then(promise, v8OnFulfilled, v8OnRejected, isolate()), isolate());
+    if (V8PromiseCustom::isPromise(promise, m_scriptState->isolate()))
+        return ScriptPromise(m_scriptState.get(), V8PromiseCustom::then(promise, v8OnFulfilled, v8OnRejected, m_scriptState->isolate()));
 
     ASSERT(promise->IsPromise());
     // Return this Promise if no handlers are given.
     // In fact it is not the exact bahavior of Promise.prototype.then
     // but that is not a problem in this case.
     v8::Local<v8::Promise> resultPromise = promise.As<v8::Promise>();
     // FIXME: Use Then once it is introduced.
     if (!v8OnFulfilled.IsEmpty()) {
         resultPromise = resultPromise->Chain(v8OnFulfilled);
         if (resultPromise.IsEmpty()) {
             // v8::Promise::Chain may return an empty value, for example when
             // the stack is exhausted.
             return ScriptPromise();
         }
     }
     if (!v8OnRejected.IsEmpty())
         resultPromise = resultPromise->Catch(v8OnRejected);
 
-    return ScriptPromise(resultPromise, isolate());
+    return ScriptPromise(m_scriptState.get(), resultPromise);
 }
 
 ScriptPromise ScriptPromise::cast(const ScriptValue& value)
 {
     if (value.isEmpty())
         return ScriptPromise();
     v8::Local<v8::Value> v8Value(value.v8Value());
     v8::Isolate* isolate = value.isolate();
     if (V8PromiseCustom::isPromise(v8Value, isolate) || v8Value->IsPromise()) {
-        return ScriptPromise(v8Value, isolate);
+        return ScriptPromise(value.scriptState(), v8Value);
     }
     if (RuntimeEnabledFeatures::scriptPromiseOnV8PromiseEnabled()) {
         v8::Local<v8::Promise::Resolver> resolver = v8::Promise::Resolver::New(isolate);
         if (resolver.IsEmpty()) {
             // The Promise constructor may return an empty value, for example
             // when the stack is exhausted.
             return ScriptPromise();
         }
         resolver->Resolve(v8Value);
-        return ScriptPromise(resolver->GetPromise(), isolate);
+        return ScriptPromise(value.scriptState(), resolver->GetPromise());
     }
-    return ScriptPromise(V8PromiseCustom::toPromise(v8Value, isolate), isolate);
+    return ScriptPromise(value.scriptState(), V8PromiseCustom::toPromise(v8Value, isolate));
 }
 
 } // namespace WebCore