Track the script state a listener was created in

third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp

Index: third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp b/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
index 5bc9946ce7ad5ba19063b692752a5a06630d4c02..e0b3f97c7d37dedabe2f7d665fd380b2214f9b56 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8ErrorHandler.cpp
@@ -67,7 +67,7 @@ v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptState* scriptSta
     v8::Local<v8::Object> eventObject;
     if (!jsEvent->ToObject(scriptState->context()).ToLocal(&eventObject))
         return v8::Null(isolate());
-    v8::Local<v8::Value> error = V8HiddenValue::getHiddenValue(isolate(), eventObject, V8HiddenValue::error(isolate()));
+    v8::Local<v8::Value> error = V8HiddenValue::getHiddenValue(scriptState, eventObject, V8HiddenValue::error(isolate()));
     if (error.IsEmpty())
         error = v8::Null(isolate());
 
@@ -88,12 +88,12 @@ v8::Local<v8::Value> V8ErrorHandler::callListenerFunction(ScriptState* scriptSta
 }
 
 // static
-void V8ErrorHandler::storeExceptionOnErrorEventWrapper(v8::Isolate* isolate, ErrorEvent* event, v8::Local<v8::Value> data, v8::Local<v8::Object> creationContext)
+void V8ErrorHandler::storeExceptionOnErrorEventWrapper(ScriptState* scriptState, ErrorEvent* event, v8::Local<v8::Value> data, v8::Local<v8::Object> creationContext)
 {
-    v8::Local<v8::Value> wrappedEvent = toV8(event, creationContext, isolate);
+    v8::Local<v8::Value> wrappedEvent = toV8(event, creationContext, scriptState->isolate());
     if (!wrappedEvent.IsEmpty()) {
         ASSERT(wrappedEvent->IsObject());
-        V8HiddenValue::setHiddenValue(isolate, v8::Local<v8::Object>::Cast(wrappedEvent), V8HiddenValue::error(isolate), data);
+        V8HiddenValue::setHiddenValue(scriptState, v8::Local<v8::Object>::Cast(wrappedEvent), V8HiddenValue::error(scriptState->isolate()), data);
     }
 }