Make the MediaQueryList listener an EventListener

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 117 matching lines @@
    argument instead; see argument.is_variadic_wrapper_type code-path below. #}
 if (info.Length() > {{argument.index}} && {% if argument.is_nullable %}!isUndefinedOrNull(info[{{argument.index}}]) && {% endif %}!V8{{argument.idl_type}}::hasInstance(info[{{argument.index}}], info.GetIsolate())) {
     {{throw_type_error(method, '"parameter %s is not of type \'%s\'."' %
                                (argument.index + 1, argument.idl_type)) | indent}}
     return;
 }
 {% endif %}{# argument.has_type_checking_interface #}
 {% if argument.is_callback_interface %}
 {# FIXME: remove EventListener special case #}
 {% if argument.idl_type == 'EventListener' %}
-{% if method.name == 'removeEventListener' %}
+{% if method.name == 'removeEventListener' or method.name == 'removeListener' %}
 {{argument.name}} = V8EventListenerList::getEventListener(ScriptState::current(info.GetIsolate()), info[{{argument.index}}], false, ListenerFindOnly);
 {% else %}{# method.name == 'addEventListener' #}
 {{argument.name}} = V8EventListenerList::getEventListener(ScriptState::current(info.GetIsolate()), info[{{argument.index}}], false, ListenerFindOrCreate);
 {% 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 (info.Length() > {{argument.index}} && !isUndefinedOrNull(info[{{argument.index}}])) {
     if (!info[{{argument.index}}]->IsFunction()) {
@@ skipping 126 matching lines @@
 {% if method.is_explicit_nullable %}
 if (result.isNull())
     v8SetReturnValueNull(info);
 else
     {{v8_set_return_value}};
 {% else %}
 {{v8_set_return_value}};
 {% endif %}
 {%- endif %}{# None for void #}
 {# Post-set #}
-{% if interface_name == 'EventTarget' and method.name in ('addEventListener',
-                                                          'removeEventListener') %}
+{% if interface_name in ('EventTarget', 'MediaQueryList')
+    and method.name in ('addEventListener', 'removeEventListener', 'addListener', 'removeListener') %}
 {% set hidden_dependency_action = 'addHiddenValueToArray'
-       if method.name == 'addEventListener' else 'removeHiddenValueFromArray' %}
+       if method.name in ('addEventListener', 'addListener') else 'removeHiddenValueFromArray' %}
+{% set argument_index = '1' if interface_name == 'EventTarget' else '0' %}
 {# Length check needed to skip action on legacy calls without enough arguments.
    http://crbug.com/353484 #}
 if (info.Length() >= 2 && listener && !impl->toNode())

[Jens Widell, 2014/08/16 06:56:08]

Should we adjust the "2" here to "argument_index+1"?

[cbiesinger, 2014/08/29 22:54:13]

Done.

-    {{hidden_dependency_action}}(info.Holder(), info[1], {{v8_class}}::eventListenerCacheIndex, info.GetIsolate());
+    {{hidden_dependency_action}}(info.Holder(), info[{{argument_index}}], {{v8_class}}::eventListenerCacheIndex, info.GetIsolate());
 {% endif %}
 {% endmacro %}
 
 
 {######################################}
 {% macro union_type_method_call_and_set_return_value(method) %}
 {% for cpp_type in method.cpp_type %}
 bool result{{loop.index0}}Enabled = false;
 {{cpp_type}} result{{loop.index0}};
 {% endfor %}
@@ skipping 313 matching lines @@
 v8::Handle<v8::Object> wrapper = wrap(impl.get(), info.Holder(), info.GetIsolate());
 {% else %}
 {% set constructor_class = v8_class + ('Constructor'
                                        if constructor.is_named_constructor else
                                        '') %}
 v8::Handle<v8::Object> wrapper = info.Holder();
 V8DOMWrapper::associateObjectWithWrapper<{{v8_class}}>(impl.release(), &{{constructor_class}}::wrapperTypeInfo, wrapper, info.GetIsolate(), {{wrapper_configuration}});
 {% endif %}
 v8SetReturnValue(info, wrapper);
 {% endmacro %}