Index: Source/bindings/templates/callback_interface.cpp |
diff --git a/Source/bindings/templates/callback_interface.cpp b/Source/bindings/templates/callback_interface.cpp |
index 262ac7bfda945e3b29ef49317342919430e03fa3..1537c3bf16d83647cf3c672c1c2428e20b2aa8bc 100644 |
--- a/Source/bindings/templates/callback_interface.cpp |
+++ b/Source/bindings/templates/callback_interface.cpp |
@@ -68,6 +68,15 @@ namespace WebCore { |
v8::Context::Scope scope(v8Context); |
+{% if method.call_with_this_handle %} |
+ v8::Handle<v8::Value> thisHandle = thisValue.v8Value(); |
+ if (thisHandle.IsEmpty()) { |
+ if (!isScriptControllerTerminating()) |
+ CRASH(); |
+ return true; |
+ } |
+ ASSERT(thisHandle->IsObject()); |
+{% endif %} |
{% for argument in method.arguments %} |
{{argument.cpp_to_v8_conversion | indent}} |
if ({{argument.name}}Handle.IsEmpty()) { |
@@ -83,7 +92,8 @@ namespace WebCore { |
{% endif %} |
bool callbackReturnValue = false; |
- return !invokeCallback(m_callback.newLocal(isolate), {{method.arguments | length}}, argv, callbackReturnValue, scriptExecutionContext(), isolate); |
+{% set this_handle_parameter = 'v8::Handle<v8::Object>::Cast(thisHandle), ' if method.call_with_this_handle else '' %} |
+ return !invokeCallback(m_callback.newLocal(isolate), {{this_handle_parameter}}{{method.arguments | length}}, argv, callbackReturnValue, scriptExecutionContext(), isolate); |
} |
{% endif %} |