bindings: Store ScriptState in generated callback functions

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

Index: third_party/WebKit/Source/bindings/tests/results/core/VoidCallbackFunction.cpp
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/VoidCallbackFunction.cpp b/third_party/WebKit/Source/bindings/tests/results/core/VoidCallbackFunction.cpp
index 66179d94d639f8523ec007e18c14ccf394c49990..cad79b3fb3af37226f78176083a5152ec4246353 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/VoidCallbackFunction.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/VoidCallbackFunction.cpp
@@ -17,8 +17,9 @@
 
 namespace blink {
 
-VoidCallbackFunction::VoidCallbackFunction(v8::Isolate* isolate, v8::Local<v8::Function> callback)
-    : m_callback(isolate, callback)
+VoidCallbackFunction::VoidCallbackFunction(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(VoidCallbackFunction)
     visitor->traceWrappers(&m_callback.cast<v8::Object>());
 }
 
-bool VoidCallbackFunction::call(ScriptState* scriptState, ScriptWrappable* scriptWrappable)
+bool VoidCallbackFunction::call(ScriptWrappable* scriptWrappable)
 {
-    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,17 +50,17 @@ bool VoidCallbackFunction::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> 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 = nullptr;
 
     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, 0, argv, scriptState->isolate()).ToLocal(&v8ReturnValue))
+    if (V8ScriptRunner::callFunction(m_callback.newLocal(m_scriptState->isolate()), m_scriptState->getExecutionContext(), thisValue, 0, argv, m_scriptState->isolate()).ToLocal(&v8ReturnValue))
     {
         return true;
     }