V8AbstractEventListener should hold a ScriptState

Source/bindings/v8/V8EventListenerList.h

 /*
  * Copyright (C) 2009 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 28 matching lines @@
 class LocalFrame;
 
 enum ListenerLookupType {
     ListenerFindOnly,
     ListenerFindOrCreate,
 };
 
 // This is a container for V8EventListener objects that uses hidden properties of v8::Object to speed up lookups.
 class V8EventListenerList {
 public:
-    static PassRefPtr<V8EventListener> findWrapper(v8::Local<v8::Value> value, v8::Isolate* isolate)
+    static PassRefPtr<V8EventListener> findWrapper(v8::Local<v8::Value> value, ScriptState* scriptState)
     {
-        ASSERT(isolate->InContext());
+        ASSERT(scriptState->isolate()->InContext());
         if (!value->IsObject())
             return nullptr;
 
-        v8::Handle<v8::String> wrapperProperty = getHiddenProperty(false, isolate);
-        return doFindWrapper(v8::Local<v8::Object>::Cast(value), wrapperProperty, isolate);
+        v8::Handle<v8::String> wrapperProperty = getHiddenProperty(false, scriptState->isolate());
+        return doFindWrapper(v8::Local<v8::Object>::Cast(value), wrapperProperty, scriptState);
     }
 
     template<typename WrapperType>
-    static PassRefPtr<V8EventListener> findOrCreateWrapper(v8::Local<v8::Value>, bool isAttribute, v8::Isolate*);
+    static PassRefPtr<V8EventListener> findOrCreateWrapper(v8::Local<v8::Value>, bool isAttribute, ScriptState*);
 
     static void clearWrapper(v8::Handle<v8::Object> listenerObject, bool isAttribute, v8::Isolate* isolate)
     {
         v8::Handle<v8::String> wrapperProperty = getHiddenProperty(isAttribute, isolate);
         listenerObject->DeleteHiddenValue(wrapperProperty);
     }
 
     static PassRefPtr<EventListener> getEventListener(ScriptState*, v8::Local<v8::Value>, bool isAttribute, ListenerLookupType);
 
 private:
-    static V8EventListener* doFindWrapper(v8::Local<v8::Object> object, v8::Handle<v8::String> wrapperProperty, v8::Isolate* isolate)
+    static V8EventListener* doFindWrapper(v8::Local<v8::Object> object, v8::Handle<v8::String> wrapperProperty, ScriptState* scriptState)
     {
-        ASSERT(isolate->InContext());
-        v8::HandleScope scope(isolate);
+        v8::HandleScope scope(scriptState->isolate());
+        ASSERT(scriptState->isolate()->InContext());
         v8::Local<v8::Value> listener = object->GetHiddenValue(wrapperProperty);
         if (listener.IsEmpty())
             return 0;
         return static_cast<V8EventListener*>(v8::External::Cast(*listener)->Value());
     }
 
     static inline v8::Handle<v8::String> getHiddenProperty(bool isAttribute, v8::Isolate* isolate)
     {
         return isAttribute ? v8AtomicString(isolate, "attributeListener") : v8AtomicString(isolate, "listener");
     }
 };
 
 template<typename WrapperType>
-PassRefPtr<V8EventListener> V8EventListenerList::findOrCreateWrapper(v8::Local<v8::Value> value, bool isAttribute, v8::Isolate* isolate)
+PassRefPtr<V8EventListener> V8EventListenerList::findOrCreateWrapper(v8::Local<v8::Value> value, bool isAttribute, ScriptState* scriptState)
 {
+    v8::Isolate* isolate = scriptState->isolate();
     ASSERT(isolate->InContext());
     if (!value->IsObject()
         // Non-callable attribute setter input is treated as null (no wrapper)
         || (isAttribute && !value->IsFunction()))
         return nullptr;
 
     v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
     v8::Handle<v8::String> wrapperProperty = getHiddenProperty(isAttribute, isolate);
 
-    V8EventListener* wrapper = doFindWrapper(object, wrapperProperty, isolate);
+    V8EventListener* wrapper = doFindWrapper(object, wrapperProperty, scriptState);
     if (wrapper)
         return wrapper;
 
-    RefPtr<V8EventListener> wrapperPtr = WrapperType::create(object, isAttribute, isolate);
+    RefPtr<V8EventListener> wrapperPtr = WrapperType::create(object, isAttribute, scriptState);
     if (wrapperPtr)
         object->SetHiddenValue(wrapperProperty, v8::External::New(isolate, wrapperPtr.get()));
 
     return wrapperPtr;
 }
 
 } // namespace WebCore
 
 #endif // V8EventListenerList_h