IDL: Values for dictionaries should be a object, null or undefined

Source/bindings/templates/methods.cpp

 {##############################################################################}
 {% macro generate_method(method, world_suffix) %}
 {% filter conditional(method.conditional_string) %}
 static void {{method.name}}{{method.overload_index}}Method{{world_suffix}}(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     {# Local variables #}
     {% if method.has_exception_state %}
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{interface_name}}", info.Holder(), info.GetIsolate());
     {% endif %}
     {# Overloaded methods have length checked during overload resolution #}
@@ skipping 179 matching lines @@
 }
 {% 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 in ['Dictionary', 'Promise'] %}
+{% elif argument.is_dictionary or argument.idl_type == 'Dictionary' %}

[Jens Widell, 2014/09/12 09:13:53]

It would make sense to have this check before we call the dictionary's toImpl()
rather than after, since the check only looks at the raw argument value
(info[N]). As it is now, toImpl() needs to support being called with a bogus
value and return something that will never be used.

[bashi, 2014/09/12 10:00:49]

Done, and now I can change if -> ASSERT() in toImpl() :)

 {# Dictionaries must have type Undefined, Null or Object:
 http://heycam.github.io/webidl/#es-dictionary
-We also require this for our implementation of promises, though not in spec:
+FIXME: Remove generic 'Dictionary' special-casing. #}
+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;
+}
+{% elif argument.idl_type == 'Promise' %}
+{# We also 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 %}
 
 
@@ skipping 416 matching lines @@
   if method.is_per_world_bindings else '0' %}
 {% set property_attribute =
   'static_cast<v8::PropertyAttribute>(%s)' % ' | '.join(method.property_attributes)
   if method.property_attributes else 'v8::None' %}
 {% set only_exposed_to_private_script = 'V8DOMConfiguration::OnlyExposedToPrivateScript' if method.only_exposed_to_private_script else 'V8DOMConfiguration::ExposedToAllScripts' %}
 static const V8DOMConfiguration::MethodConfiguration {{method.name}}MethodConfiguration = {
     "{{method.name}}", {{method_callback}}, {{method_callback_for_main_world}}, {{method.length}}, {{only_exposed_to_private_script}},
 };
 V8DOMConfiguration::installMethod({{method.function_template}}, {{method.signature}}, {{property_attribute}}, {{method.name}}MethodConfiguration, isolate);
 {%- endmacro %}