V8AbstractEventListener should hold a ScriptState

Source/bindings/v8/V8AbstractEventListener.h

 /*
  * Copyright (C) 2006, 2007, 2008, 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 91 matching lines @@
         {
             return !m_listener.isEmpty();
         }
 
         void clearListenerObject()
         {
             m_listener.clear();
         }
 
         virtual bool belongsToTheCurrentWorld() const OVERRIDE FINAL;
-        DOMWrapperWorld& world() const { return *m_world; }
         v8::Isolate* isolate() const { return m_isolate; }
+        virtual DOMWrapperWorld& world() const { return scriptState()->world(); }
+        ScriptState* scriptState() const
+        {
+            ASSERT(m_scriptState);
+            return m_scriptState.get();
+        }
+        void setScriptState(ScriptState* scriptState) { m_scriptState = scriptState; }
 
     protected:
-        V8AbstractEventListener(bool isAttribute, DOMWrapperWorld&, v8::Isolate*);
+        V8AbstractEventListener(bool isAttribute, ScriptState*);
+        V8AbstractEventListener(bool isAttribute, v8::Isolate*);
 
         virtual void prepareListenerObject(ExecutionContext*) { }
 
         void setListenerObject(v8::Handle<v8::Object> listener);
 
-        void invokeEventHandler(ExecutionContext*, Event*, v8::Local<v8::Value> jsEvent);
+        void invokeEventHandler(Event*, v8::Local<v8::Value> jsEvent);
 
         // Get the receiver object to use for event listener call.
-        v8::Local<v8::Object> getReceiverObject(ExecutionContext*, Event*);
+        v8::Local<v8::Object> getReceiverObject(Event*);
 
     private:
         // Implementation of EventListener function.
         virtual bool virtualisAttribute() const OVERRIDE { return m_isAttribute; }
 
         virtual v8::Local<v8::Value> callListenerFunction(ExecutionContext*, v8::Handle<v8::Value> jsevent, Event*) = 0;
 
         virtual bool shouldPreventDefault(v8::Local<v8::Value> returnValue);
 
         static void setWeakCallback(const v8::WeakCallbackData<v8::Object, V8AbstractEventListener>&);
 
         ScopedPersistent<v8::Object> m_listener;
 
         // Indicates if this is an HTML type listener.
         bool m_isAttribute;
 
-        RefPtr<DOMWrapperWorld> m_world;
+        // For V8LazyEventListener, m_scriptState can be 0 until V8LazyEventListener is actually used.
+        // m_scriptState is set lazily because V8LazyEventListener doesn't know the associated frame
+        // until the listener is actually used.
+        RefPtr<ScriptState> m_scriptState;
         v8::Isolate* m_isolate;
     };
 
 } // namespace WebCore
 
 #endif // V8AbstractEventListener_h