IDL compiler: sync Python to r163665

Source/bindings/templates/callback_interface.cpp

 {# http://www.chromium.org/blink/coding-style#TOC-License #}
 /*
  * Copyright (C) 2013 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.
@@ skipping 23 matching lines @@
 
 #include "config.h"
 {% filter conditional(conditional_string) %}
 #include "{{v8_class}}.h"
 
 {% for filename in cpp_includes %}
 #include "{{filename}}"
 {% endfor %}
 namespace WebCore {
 
-{{v8_class}}::{{v8_class}}(v8::Handle<v8::Object> callback, ExecutionContext* context)
+{{v8_class}}::{{v8_class}}(v8::Handle<v8::Function> callback, ExecutionContext* context)
     : ActiveDOMCallback(context)
     , m_callback(toIsolate(context), callback)
     , m_world(DOMWrapperWorld::current())
 {
 }
 
 {{v8_class}}::~{{v8_class}}()
 {
 }
 
 {% for method in methods if not method.custom %}
 {{method.return_cpp_type}} {{v8_class}}::{{method.name}}({{method.argument_declarations | join(', ')}})
 {
+    {% set return_default = 'return true'
+           if method.return_idl_type == 'boolean' else 'return' %}{# void #}
     if (!canInvokeCallback())
-        return true;
+        {{return_default}};
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
 
     v8::Handle<v8::Context> v8Context = toV8Context(executionContext(), m_world.get());
     if (v8Context.IsEmpty())
-        return true;
+        {{return_default}};
 
     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;
+        {{return_default}};
     }
     ASSERT(thisHandle->IsObject());
     {% endif %}
     {% for argument in method.arguments %}
     {{argument.cpp_to_v8_conversion | indent}}
     if ({{argument.name}}Handle.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
-        return true;
+        {{return_default}};
     }
     {% endfor %}
     {% if method.arguments %}
     v8::Handle<v8::Value> argv[] = { {{method.handles | join(', ')}} };
     {% else %}
     v8::Handle<v8::Value> *argv = 0;
     {% endif %}
 
-    bool callbackReturnValue = false;
     {% 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, executionContext(), isolate);
+    {% if method.return_idl_type == 'boolean' %}
+    return invokeCallback(m_callback.newLocal(isolate), {{this_handle_parameter}}{{method.arguments | length}}, argv, executionContext(), isolate);
+    {% else %}{# void #}
+    invokeCallback(m_callback.newLocal(isolate), {{this_handle_parameter}}{{method.arguments | length}}, argv, executionContext(), isolate);
+    {% endif %}
 }
 
 {% endfor %}
 } // namespace WebCore
 {% endfilter %}