Changeset 140397 in webkit

Timestamp:

Jan 22, 2013, 1:06:22 AM (14 years ago)

Author:

haraken@chromium.org

Message:

[V8] Pass an Isolate to toV8() of event listeners
​https://bugs.webkit.org/show_bug.cgi?id=107517

Reviewed by Adam Barth.

By using Context::GetIsolate(), this patch passes an Isolate to toV8().
I think this would be the last patch to pass an Isolate to toV8().
In the next patch, I will make an Isolate parameter mandatory for toV8().

No tests. No change in behavior.

• bindings/v8/V8AbstractEventListener.cpp:

(WebCore::V8AbstractEventListener::getReceiverObject):

• bindings/v8/V8AbstractEventListener.h:

(V8AbstractEventListener):

• bindings/v8/V8EventListener.cpp:

(WebCore::V8EventListener::callListenerFunction):

• bindings/v8/V8LazyEventListener.cpp:

(WebCore::toObjectWrapper):
(WebCore::V8LazyEventListener::callListenerFunction):
(WebCore::V8LazyEventListener::prepareListenerObject):

• bindings/v8/V8WorkerContextEventListener.cpp:

(WebCore::V8WorkerContextEventListener::getReceiverObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8AbstractEventListener.cpp (modified) (2 diffs)
• bindings/v8/V8AbstractEventListener.h (modified) (1 diff)
• bindings/v8/V8EventListener.cpp (modified) (1 diff)
• bindings/v8/V8LazyEventListener.cpp (modified) (3 diffs)
• bindings/v8/V8WorkerContextEventListener.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Pass an Isolate to toV8() of event listeners
+        https://bugs.webkit.org/show_bug.cgi?id=107517
+
+        Reviewed by Adam Barth.
+
+        By using Context::GetIsolate(), this patch passes an Isolate to toV8().
+        I think this would be the last patch to pass an Isolate to toV8().
+        In the next patch, I will make an Isolate parameter mandatory for toV8().
+
+        No tests. No change in behavior.
+
+        * bindings/v8/V8AbstractEventListener.cpp:
+        (WebCore::V8AbstractEventListener::getReceiverObject):
+        * bindings/v8/V8AbstractEventListener.h:
+        (V8AbstractEventListener):
+        * bindings/v8/V8EventListener.cpp:
+        (WebCore::V8EventListener::callListenerFunction):
+        * bindings/v8/V8LazyEventListener.cpp:
+        (WebCore::toObjectWrapper):
+        (WebCore::V8LazyEventListener::callListenerFunction):
+        (WebCore::V8LazyEventListener::prepareListenerObject):
+        * bindings/v8/V8WorkerContextEventListener.cpp:
+        (WebCore::V8WorkerContextEventListener::getReceiverObject):
+
 2013-01-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/bindings/v8/V8AbstractEventListener.cpp

@@ -183 +183 @@
 }
 
-v8::Local<v8::Object> V8AbstractEventListener::getReceiverObject(Event* event)
+v8::Local<v8::Object> V8AbstractEventListener::getReceiverObject(ScriptExecutionContext* context, Event* event)
 {
     if (!m_listener.isEmpty() && !m_listener->IsFunction())
@@ -189 +189 @@
 
     EventTarget* target = event->currentTarget();
-    v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>());
+    v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), toV8Context(context, worldContext())->GetIsolate());
     if (value.IsEmpty())
         return v8::Local<v8::Object>();

trunk/Source/WebCore/bindings/v8/V8AbstractEventListener.h

@@ -116 +116 @@
 
         // Get the receiver object to use for event listener call.
-        v8::Local<v8::Object> getReceiverObject(Event*);
+        v8::Local<v8::Object> getReceiverObject(ScriptExecutionContext*, Event*);
 
     private:

trunk/Source/WebCore/bindings/v8/V8EventListener.cpp

@@ -73 +73 @@
 
     v8::Local<v8::Function> handlerFunction = getListenerFunction(context);
-    v8::Local<v8::Object> receiver = getReceiverObject(event);
+    v8::Local<v8::Object> receiver = getReceiverObject(context, event);
     if (handlerFunction.IsEmpty() || receiver.IsEmpty())
         return v8::Local<v8::Value>();

trunk/Source/WebCore/bindings/v8/V8LazyEventListener.cpp

@@ -64 +64 @@
 
 template<typename T>
-v8::Handle<v8::Object> toObjectWrapper(T* domObject)
+v8::Handle<v8::Object> toObjectWrapper(T* domObject, v8::Isolate* isolate)
 {
     if (!domObject)
         return v8::Object::New();
-    v8::Handle<v8::Value> value = toV8(domObject, v8::Handle<v8::Object>());
+    v8::Handle<v8::Value> value = toV8(domObject, v8::Handle<v8::Object>(), isolate);
     if (value.IsEmpty())
         return v8::Object::New();
@@ -81 +81 @@
 
     v8::Local<v8::Function> handlerFunction = listenerObject.As<v8::Function>();
-    v8::Local<v8::Object> receiver = getReceiverObject(event);
+    v8::Local<v8::Object> receiver = getReceiverObject(context, event);
     if (handlerFunction.IsEmpty() || receiver.IsEmpty())
         return v8::Local<v8::Value>();
@@ -179 +179 @@
         formElement = static_cast<HTMLElement*>(m_node)->form();
 
-    v8::Handle<v8::Object> nodeWrapper = toObjectWrapper<Node>(m_node);
-    v8::Handle<v8::Object> formWrapper = toObjectWrapper<HTMLFormElement>(formElement);
-    v8::Handle<v8::Object> documentWrapper = toObjectWrapper<Document>(m_node ? m_node->ownerDocument() : 0);
+    v8::Handle<v8::Object> nodeWrapper = toObjectWrapper<Node>(m_node, v8Context->GetIsolate());
+    v8::Handle<v8::Object> formWrapper = toObjectWrapper<HTMLFormElement>(formElement, v8Context->GetIsolate());
+    v8::Handle<v8::Object> documentWrapper = toObjectWrapper<Document>(m_node ? m_node->ownerDocument() : 0, v8Context->GetIsolate());
 
     v8::Local<v8::Object> thisObject = v8::Object::New();

trunk/Source/WebCore/bindings/v8/V8WorkerContextEventListener.cpp

@@ -119 +119 @@
 
     EventTarget* target = event->currentTarget();
-    v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>());
+    v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), toV8Context(context, worldContext())->GetIsolate());
     if (value.IsEmpty())
         return v8::Local<v8::Object>();