bindings: Store ScriptState in generated callback functions

third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp

Index: third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp b/third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp
index 9271cde176cb2a728b9abf336d71ee45e14ee08a..c5534fcfa015b5c2c09b2a262d85084b159e794e 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/LongCallbackFunction.cpp
@@ -17,8 +17,9 @@
 
 namespace blink {
 
-LongCallbackFunction::LongCallbackFunction(v8::Isolate* isolate, v8::Local<v8::Function> callback)
-    : m_callback(isolate, callback)
+LongCallbackFunction::LongCallbackFunction(ScriptState* scriptState, v8::Local<v8::Function> callback)
+    : m_scriptState(scriptState),
+    m_callback(scriptState->isolate(), callback)
 {
     DCHECK(!m_callback.isEmpty());
     m_callback.setPhantom();
@@ -33,12 +34,12 @@ DEFINE_TRACE_WRAPPERS(LongCallbackFunction)
     visitor->traceWrappers(&m_callback.cast<v8::Object>());
 }
 
-bool LongCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable, int num1, int num2, int& returnValue)
+bool LongCallbackFunction::call(ScriptWrappable* scriptWrappable, int num1, int num2, int& returnValue)
 {
-    if (!scriptState->contextIsValid())
+    if (!m_scriptState->contextIsValid())
         return false;
 
-    ExecutionContext* context = scriptState->getExecutionContext();
+    ExecutionContext* context = m_scriptState->getExecutionContext();
     DCHECK(context);
     if (context->activeDOMObjectsAreSuspended() || context->activeDOMObjectsAreStopped())
         return false;
@@ -49,22 +50,22 @@ bool LongCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scrip
     // TODO(bashi): Make sure that using TrackExceptionState is OK.
     // crbug.com/653769
     TrackExceptionState exceptionState;
-    ScriptState::Scope scope(scriptState);
+    ScriptState::Scope scope(m_scriptState.get());
 
-    v8::Local<v8::Value> num1Argument = v8::Integer::New(scriptState->isolate(), num1);
-    v8::Local<v8::Value> num2Argument = v8::Integer::New(scriptState->isolate(), num2);
+    v8::Local<v8::Value> num1Argument = v8::Integer::New(m_scriptState->isolate(), num1);
+    v8::Local<v8::Value> num2Argument = v8::Integer::New(m_scriptState->isolate(), num2);
 
-    v8::Local<v8::Value> thisValue = toV8(scriptWrappable, scriptState->context()->Global(), scriptState->isolate());
+    v8::Local<v8::Value> thisValue = toV8(scriptWrappable, m_scriptState->context()->Global(), m_scriptState->isolate());
 
     v8::Local<v8::Value> argv[] = { num1Argument, num2Argument };
 
     v8::Local<v8::Value> v8ReturnValue;
-    v8::TryCatch exceptionCatcher(scriptState->isolate());
+    v8::TryCatch exceptionCatcher(m_scriptState->isolate());
     exceptionCatcher.SetVerbose(true);
 
-    if (V8ScriptRunner::callFunction(m_callback.newLocal(scriptState->isolate()), scriptState->getExecutionContext(), thisValue, 2, argv, scriptState->isolate()).ToLocal(&v8ReturnValue))
+    if (V8ScriptRunner::callFunction(m_callback.newLocal(m_scriptState->isolate()), m_scriptState->getExecutionContext(), thisValue, 2, argv, m_scriptState->isolate()).ToLocal(&v8ReturnValue))
     {
-        int cppValue = toInt32(scriptState->isolate(), v8ReturnValue, NormalConversion, exceptionState);
+        int cppValue = toInt32(m_scriptState->isolate(), v8ReturnValue, NormalConversion, exceptionState);
         if (exceptionState.hadException())
             return false;
         returnValue = cppValue;