IDL: Drop value conversion (V8 -> C++) macros from generated code

Source/bindings/templates/methods.cpp

+{% from 'conversions.cpp' import v8_value_to_local_cpp_value %}
+
+
 {##############################################################################}
 {% macro generate_method(method, world_suffix) %}
 {% filter conditional(method.conditional_string) %}
+{% if method.returns_promise and method.has_exception_state %}
+static void {{method.name}}{{method.overload_index}}Method{{world_suffix}}Promise(const v8::FunctionCallbackInfo<v8::Value>& info, ExceptionState& exceptionState)
+{% else %}
 static void {{method.name}}{{method.overload_index}}Method{{world_suffix}}(const v8::FunctionCallbackInfo<v8::Value>& info)
+{% endif %}
 {
     {# Local variables #}
-    {% if method.has_exception_state %}
+    {% if method.has_exception_state and not method.returns_promise %}
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{interface_name}}", info.Holder(), info.GetIsolate());
     {% endif %}
     {# Overloaded methods have length checked during overload resolution #}
     {% if method.number_of_required_arguments and not method.overload_index %}
     if (UNLIKELY(info.Length() < {{method.number_of_required_arguments}})) {
         {{throw_minimum_arity_type_error(method, method.number_of_required_arguments) | indent(8)}}
-        return;
     }
     {% endif %}
     {% if not method.is_static %}
     {{cpp_class}}* impl = {{v8_class}}::toImpl(info.Holder());
     {% endif %}
     {% if method.is_custom_element_callbacks %}
     CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
     {% endif %}
     {# Security checks #}
     {% if method.is_check_security_for_window %}
     if (LocalDOMWindow* window = impl->toDOMWindow()) {
         if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), window->frame(), exceptionState)) {
-            {{throw_from_exception_state(method)}};
-            return;
+            {{throw_from_exception_state(method) | indent(12)}}
         }
         if (!window->document())
             return;
     }
     {% elif method.is_check_security_for_frame %}
     if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), impl->frame(), exceptionState)) {
-        {{throw_from_exception_state(method)}};
-        return;
+        {{throw_from_exception_state(method) | indent(8)}}
     }
     {% endif %}
     {% if method.is_check_security_for_node %}
     if (!BindingSecurity::shouldAllowAccessToNode(info.GetIsolate(), impl->{{method.name}}(exceptionState), exceptionState)) {
         v8SetReturnValueNull(info);
-        {{throw_from_exception_state(method)}};
-        return;
+        {{throw_from_exception_state(method) | indent(8)}}
     }
     {% endif %}
     {# Call method #}
     {% if method.arguments %}
     {{generate_arguments(method, world_suffix) | indent}}
     {% endif %}
     {% if world_suffix %}
     {{cpp_method_call(method, method.v8_set_return_value_for_main_world, method.cpp_value) | indent}}
     {% else %}
     {{cpp_method_call(method, method.v8_set_return_value, method.cpp_value) | indent}}
     {% endif %}
 }
+{% if method.returns_promise and method.has_exception_state %}
+
+static void {{method.name}}{{method.overload_index}}Method{{world_suffix}}(const v8::FunctionCallbackInfo<v8::Value>& info)
+{
+    ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{interface_name}}", info.Holder(), info.GetIsolate());
+    {{method.name}}{{method.overload_index}}Method{{world_suffix}}Promise(info, exceptionState);
+    if (exceptionState.hadException())
+        v8SetReturnValue(info, exceptionState.reject(ScriptState::current(info.GetIsolate())).v8Value());
+}
+{% endif %}
 {% endfilter %}
 {% endmacro %}
 
 
 {######################################}
 {% macro generate_arguments(method, world_suffix) %}
 {% for argument in method.arguments %}
 {{generate_argument_var_declaration(argument)}};
 {% endfor %}
 {
@@ skipping 53 matching lines @@
 {% endif %}{# method.name #}
 {% else %}{# argument.idl_type == 'EventListener' #}
 {# Callback functions must be functions:
    http://www.w3.org/TR/WebIDL/#es-callback-function #}
 {% if argument.is_optional %}
 if (!isUndefinedOrNull(info[{{argument.index}}])) {
     if (!info[{{argument.index}}]->IsFunction()) {
         {{throw_type_error(method,
               '"The callback provided as parameter %s is not a function."' %
                   (argument.index + 1)) | indent(8)}}
-        return;
     }
     {{argument.name}} = V8{{argument.idl_type}}::create(v8::Local<v8::Function>::Cast(info[{{argument.index}}]), ScriptState::current(info.GetIsolate()));
 } else {
     {{argument.name}} = nullptr;
 }
 {% else %}{# argument.is_optional #}
 if (info.Length() <= {{argument.index}} || !{% if argument.is_nullable %}(info[{{argument.index}}]->IsFunction() || info[{{argument.index}}]->IsNull()){% else %}info[{{argument.index}}]->IsFunction(){% endif %}) {
     {{throw_type_error(method,
           '"The callback provided as parameter %s is not a function."' %
-              (argument.index + 1)) | indent }}
-    return;
+              (argument.index + 1)) | indent}}
 }
 {{argument.name}} = {% if argument.is_nullable %}info[{{argument.index}}]->IsNull() ? nullptr : {% endif %}V8{{argument.idl_type}}::create(v8::Local<v8::Function>::Cast(info[{{argument.index}}]), ScriptState::current(info.GetIsolate()));
 {% endif %}{# argument.is_optional #}
 {% endif %}{# argument.idl_type == 'EventListener' #}
 {% elif argument.is_callback_function %}
 if (!info[{{argument.index}}]->IsFunction(){% if argument.is_nullable %} && !info[{{argument.index}}]->IsNull(){% endif %}) {
     {{throw_type_error(method,
           '"The callback provided as parameter %s is not a function."' %
-              (argument.index + 1)) | indent(8)}}
-    return;
+              (argument.index + 1)) | indent}}
 }
-{{argument.v8_value_to_local_cpp_value}};
+{{v8_value_to_local_cpp_value(argument)}}
 {% elif argument.is_variadic_wrapper_type %}
 for (int i = {{argument.index}}; i < info.Length(); ++i) {
     if (!V8{{argument.idl_type}}::hasInstance(info[i], info.GetIsolate())) {
         {{throw_type_error(method, '"parameter %s is not of type \'%s\'."' %
                                    (argument.index + 1, argument.idl_type)) | indent(8)}}
-        return;
     }
     {{argument.name}}.append(V8{{argument.idl_type}}::toImpl(v8::Local<v8::Object>::Cast(info[i])));
 }
 {% elif argument.is_dictionary %}
 {% if not argument.use_permissive_dictionary_conversion %}
 {# Dictionaries must have type Undefined, Null or Object:
 http://heycam.github.io/webidl/#es-dictionary #}
 if (!isUndefinedOrNull(info[{{argument.index}}]) && !info[{{argument.index}}]->IsObject()) {
     {{throw_type_error(method, '"parameter %s (\'%s\') is not an object."' %
                                (argument.index + 1, argument.name)) | indent}}
-    return;
 }
 {% endif %}{# not argument.use_permissive_dictionary_conversion #}
-{{argument.v8_value_to_local_cpp_value}};
+{{v8_value_to_local_cpp_value(argument)}}
 {% else %}{# argument.is_nullable #}
-{{argument.v8_value_to_local_cpp_value}};
+{{v8_value_to_local_cpp_value(argument)}}
 {% endif %}{# argument.is_nullable #}
 {# Type checking, possibly throw a TypeError, per:
    http://www.w3.org/TR/WebIDL/#es-type-mapping #}
 {% if argument.has_type_checking_interface and not argument.is_variadic_wrapper_type %}
 {# Type checking for wrapper interface types (if interface not implemented,
    throw a TypeError), per http://www.w3.org/TR/WebIDL/#es-interface
    Note: for variadic arguments, the type checking is done for each matched
    argument instead; see argument.is_variadic_wrapper_type code-path above. #}
 if (!{{argument.name}}{% if argument.is_nullable %} && !isUndefinedOrNull(info[{{argument.index}}]){% endif %}) {
     {{throw_type_error(method, '"parameter %s is not of type \'%s\'."' %
                                (argument.index + 1, argument.idl_type)) | indent}}
-    return;
 }
 {% elif argument.enum_validation_expression %}
 {# Invalid enum values: http://www.w3.org/TR/WebIDL/#idl-enums #}
 String string = {{argument.name}};
 if (!({{argument.enum_validation_expression}})) {
     {{throw_type_error(method,
           '"parameter %s (\'" + string + "\') is not a valid enum value."' %
               (argument.index + 1)) | indent}}
-    return;
 }
 {% elif argument.idl_type == 'Promise' %}
 {# We require this for our implementation of promises, though not in spec:
 http://heycam.github.io/webidl/#es-promise #}
 if (!{{argument.name}}.isUndefinedOrNull() && !{{argument.name}}.isObject()) {
     {{throw_type_error(method, '"parameter %s (\'%s\') is not an object."' %
                                (argument.index + 1, argument.name)) | indent}}
-    return;
 }
 {% endif %}
 {% endmacro %}
 
 
 {######################################}
 {% macro cpp_method_call(method, v8_set_return_value, cpp_value) %}
 {# Local variables #}
 {% if method.is_call_with_script_state %}
 {# [ConstructorCallWith=ScriptState] #}
@@ skipping 24 matching lines @@
 {{method.cpp_type}} result;
 {{cpp_value}};
 {% elif method.is_constructor %}
 {{method.cpp_type}} impl = {{cpp_value}};
 {% elif method.use_local_result %}
 {{method.cpp_type}} result = {{cpp_value}};
 {% endif %}
 {# Post-call #}
 {% if method.is_raises_exception %}
 if (exceptionState.hadException()) {
-    {{throw_from_exception_state(method)}};
-    return;
+    {{throw_from_exception_state(method) | indent}}
 }
 {% endif %}
 {# Set return value #}
 {% if method.is_constructor %}
 {{generate_constructor_wrapper(method)}}
 {%- elif v8_set_return_value %}
 {% if method.is_explicit_nullable %}
 if (result.isNull())
     v8SetReturnValueNull(info);
 else
@@ skipping 13 matching lines @@
 if (info.Length() >= {{argument_index}} + 1 && listener && !impl->toNode())
     {{hidden_dependency_action}}(info.GetIsolate(), info.Holder(), info[{{argument_index}}], {{v8_class}}::eventListenerCacheIndex);
 {% endif %}
 {% endmacro %}
 
 
 {######################################}
 {% macro throw_type_error(method, error_message) %}
 {% if method.has_exception_state %}
 exceptionState.throwTypeError({{error_message}});
-{{throw_from_exception_state(method)}};
+{{throw_from_exception_state(method)}}
 {% elif method.idl_type == 'Promise' %}
 v8SetReturnValue(info, ScriptPromise::rejectRaw(info.GetIsolate(), V8ThrowException::createTypeError(info.GetIsolate(), {{type_error_message(method, error_message)}})));
+return;
 {% else %}
 V8ThrowException::throwTypeError(info.GetIsolate(), {{type_error_message(method, error_message)}});
+return;
 {% endif %}{# method.has_exception_state #}
 {% endmacro %}
 
 
 {######################################}
 {% macro type_error_message(method, error_message) %}
 {% if method.is_constructor %}
 ExceptionMessages::failedToConstruct("{{interface_name}}", {{error_message}})
 {%- else %}
 ExceptionMessages::failedToExecute("{{method.name}}", "{{interface_name}}", {{error_message}})
 {%- endif %}
 {%- endmacro %}
 
 
 {######################################}
 {% macro throw_from_exception_state(method_or_overloads) %}

[yhirano, 2015/02/25 04:00:11]

You changed this macro's meaning a bit: Are "propagate_exception" or
"propagate_error_with_exception_state" more suitable for its name now?

[Jens Widell, 2015/02/25 07:37:11]

Yes, "propagate_error_with_exception_state" is probably a better name.

[Jens Widell, 2015/02/25 07:49:43]

Done.

-{% if method_or_overloads.idl_type == 'Promise' or method_or_overloads.returns_promise_all %}
-v8SetReturnValue(info, exceptionState.reject(ScriptState::current(info.GetIsolate())).v8Value())
-{%- else %}
-exceptionState.throwIfNeeded()
-{%- endif %}
+{% if method_or_overloads.returns_promise_all %}
+v8SetReturnValue(info, exceptionState.reject(ScriptState::current(info.GetIsolate())).v8Value());
+{% elif not method_or_overloads.returns_promise %}
+exceptionState.throwIfNeeded();
+{% endif %}
+return;
 {%- endmacro %}
 
 
 {######################################}
 {% macro throw_minimum_arity_type_error(method, number_of_required_arguments) %}
 {% if method.has_exception_state %}
 setMinimumArityTypeError(exceptionState, {{number_of_required_arguments}}, info.Length());
-{{throw_from_exception_state(method)}};
+{{throw_from_exception_state(method)}}
 {%- elif method.idl_type == 'Promise' %}
 v8SetReturnValue(info, ScriptPromise::rejectRaw(info.GetIsolate(), {{create_minimum_arity_type_error_without_exception_state(method, number_of_required_arguments)}}));
+return;
 {%- else %}
 V8ThrowException::throwException({{create_minimum_arity_type_error_without_exception_state(method, number_of_required_arguments)}}, info.GetIsolate());
+return;
 {%- endif %}
 {%- endmacro %}
 
 
 {######################################}
 {% macro create_minimum_arity_type_error_without_exception_state(method, number_of_required_arguments) %}
 {% if method.is_constructor %}
 createMinimumArityTypeErrorForConstructor(info.GetIsolate(), "{{interface_name}}", {{number_of_required_arguments}}, info.Length())
 {%- else %}
 createMinimumArityTypeErrorForMethod(info.GetIsolate(), "{{method.name}}", "{{interface_name}}", {{number_of_required_arguments}}, info.Length())
@@ skipping 61 matching lines @@
     default:
         {# If methods are overloaded between interface and partial interface #}
         {# definitions, need to invoke methods defined in the partial #}
         {# interface. #}
         {# FIXME: we do not need to always generate this code. #}
         {# Invalid arity, throw error #}
         {# Report full list of valid arities if gaps and above minimum #}
         {% if overloads.valid_arities %}
         if (info.Length() >= {{overloads.minarg}}) {
             setArityTypeError(exceptionState, "{{overloads.valid_arities}}", info.Length());
-            {{throw_from_exception_state(overloads)}};
-            return;
+            {{throw_from_exception_state(overloads) | indent(12)}}
         }
         {% endif %}
         break;
     {% endif %}
     }
     {% if not is_partial and overloads.has_partial_overloads %}
     ASSERT({{overloads.name}}MethodForPartialInterface);
     ({{overloads.name}}MethodForPartialInterface)(info);
     {% else %}
     {% if overloads.length != 0 %}
     if (info.Length() < {{overloads.length}}) {
         {# Otherwise just report "not enough arguments" #}
         exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments({{overloads.length}}, info.Length()));
-        {{throw_from_exception_state(overloads)}};
-        return;
+        {{throw_from_exception_state(overloads) | indent(8)}}
     }
     {% endif %}
     {# No match, throw error #}
     exceptionState.throwTypeError("No function was found that matched the signature provided.");
-    {{throw_from_exception_state(overloads)}};
+    {{throw_from_exception_state(overloads) | indent}}
     {% endif %}
 }
 {% endmacro %}
 
 
 {##############################################################################}
 {% macro method_callback(method, world_suffix) %}
 {% filter conditional(method.conditional_string) %}
 static void {{method.name}}MethodCallback{{world_suffix}}(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
@@ skipping 102 matching lines @@
     v8::Local<v8::Value> argv[] = { {{method.arguments | join(', ', 'handle')}} };
     {% else %}
     {# Empty array initializers are illegal, and don\t compile in MSVC. #}
     v8::Local<v8::Value> *argv = 0;
     {% endif %}
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{cpp_class}}", scriptState->context()->Global(), scriptState->isolate());
     v8::Local<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, scriptStateInUserScript, "{{cpp_class}}", "{{method.name}}", holder, {{method.arguments | length}}, argv);
     if (v8Value.IsEmpty())
         return false;
     {% if method.idl_type != 'void' %}
-    {{method.private_script_v8_value_to_local_cpp_value}};
+    {{v8_value_to_local_cpp_value(method.private_script_v8_value_to_local_cpp_value) | indent}}
     *result = cppValue;
     {% endif %}
     RELEASE_ASSERT(!exceptionState.hadException());
     return true;
 }
 {% endmacro %}
 
 
 {##############################################################################}
 {% macro generate_constructor(constructor) %}
@@ skipping 13 matching lines @@
         return;
     }
     {% endif %}
     {% if constructor.has_exception_state %}
     ExceptionState exceptionState(ExceptionState::ConstructionContext, "{{interface_name}}", info.Holder(), info.GetIsolate());
     {% endif %}
     {# Overloaded constructors have length checked during overload resolution #}
     {% if constructor.number_of_required_arguments and not constructor.overload_index %}
     if (UNLIKELY(info.Length() < {{constructor.number_of_required_arguments}})) {
         {{throw_minimum_arity_type_error(constructor, constructor.number_of_required_arguments) | indent(8)}}
-        return;
     }
     {% endif %}
     {% if constructor.arguments %}
     {{generate_arguments(constructor) | indent}}
     {% endif %}
     {{cpp_method_call(constructor, constructor.v8_set_return_value, constructor.cpp_value) | indent}}
 }
 {% endmacro %}
 
 
@@ skipping 60 matching lines @@
                               if method.overloads else
                               method.runtime_enabled_function) %}
     prototypeObject->Set(v8AtomicString(isolate, "{{method.name}}"), v8::FunctionTemplate::New(isolate, {{cpp_class_or_partial}}V8Internal::{{method.name}}MethodCallback, v8Undefined(), defaultSignature, {{method.number_of_required_arguments}})->GetFunction());
     {% endfilter %}{# runtime_enabled() #}
     {% endfilter %}{# exposed() #}
     {% endfilter %}{# per_context_enabled() #}
     {% endfor %}
     {% endif %}
 }
 {%- endmacro %}