[DeprecateAs] if call addEventListener or removeEventListener without enough arguments

Source/bindings/scripts/v8_methods.py

 # 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.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 59 matching lines @@
         if is_static:
             return 'functionTemplate'
         if 'Unforgeable' in extended_attributes:
             return 'instanceTemplate'
         return 'prototypeTemplate'
 
     is_call_with_script_arguments = has_extended_attribute_value(method, 'CallWith', 'ScriptArguments')
     if is_call_with_script_arguments:
         includes.update(['bindings/v8/ScriptCallStackFactory.h',
                          'core/inspector/ScriptArguments.h'])
-    is_call_with_script_state = has_extended_attribute_value(method, 'CallWith', 'ScriptState')
+    is_call_with_script_state = has_extended_attribute_value(
+        method, 'CallWith', 'ScriptState')
     if is_call_with_script_state:
         includes.add('bindings/v8/ScriptState.h')
-    is_check_security_for_node = 'CheckSecurity' in extended_attributes
+    is_check_security_for_node = has_extended_attribute_value(
+        method, 'CheckSecurity', 'Node')
     if is_check_security_for_node:
         includes.add('bindings/v8/BindingSecurity.h')
     is_custom_element_callbacks = 'CustomElementCallbacks' in extended_attributes
     if is_custom_element_callbacks:
         includes.add('core/dom/custom/CustomElementCallbackDispatcher.h')
 
     has_event_listener_argument = any(
         argument for argument in arguments
-        if argument.idl_type.name == 'EventListener')
+        if argument.idl_type.name == 'EventListenerOrNull')

[haraken, 2014/06/12 04:23:23]

Shouldn't this be:

  if argument.idl_type.name == 'EventListener' or argument.idl_type.name ==
'EventListenerOrNull'

?

(BTW, I was assuming that we have idl_type.name and idl_type.nullable
separately. idl_type.name stores the type name (without "OrNull") and
idl_type.nullable stores whether the type is nullable or not.)

[Nils Barth (inactive), 2014/06/12 04:55:40]

The only use of EventListener is as a nullable type, so
argument.idl_type.name == 'EventListener'
is dead code.

Python note:
For multiple matches, use |in|:
if argument.idl_type.name in ('EventListener', 'EventListenerOrNull'):
No, the type name includes nullability:
http://heycam.github.io/webidl/#idl-nullable-type
"""
The type name of a nullable type is the concatenation of the type name of the
inner type T and the string “OrNull”.
"""

We have IdlType.base_type to hold the base type of nullable/array/etc. types;
(in the spec, for nullable this is "inner type", for array this is "element
type", but we're not distinguishing these currently)
I'm using IdlType.name here to be tighter, as this is an ugly special case.

     is_check_security_for_frame = (
-        'CheckSecurity' in interface.extended_attributes and
+        has_extended_attribute_value(interface, 'CheckSecurity', 'Frame') and
         'DoNotCheckSecurity' not in extended_attributes)
     is_raises_exception = 'RaisesException' in extended_attributes
 
     arguments_need_try_catch = any(argument_needs_try_catch(argument)
                                    for argument in arguments)
 
     return {
         'activity_logging_world_list': v8_utilities.activity_logging_world_list(method),  # [ActivityLogging]
         'arguments': [generate_argument(interface, method, argument, index)
                       for index, argument in enumerate(arguments)],
         'arguments_need_try_catch': arguments_need_try_catch,
         'conditional_string': v8_utilities.conditional_string(method),
         'cpp_type': idl_type.cpp_type,
         'cpp_value': this_cpp_value,
         'deprecate_as': v8_utilities.deprecate_as(method),  # [DeprecateAs]
         'do_not_check_signature': not(is_static or
             v8_utilities.has_extended_attribute(method,
                 ['DoNotCheckSecurity', 'DoNotCheckSignature', 'NotEnumerable',
                  'ReadOnly', 'RuntimeEnabled', 'Unforgeable'])),
         'function_template': function_template(),
         'idl_type': idl_type.base_type,
         'has_event_listener_argument': has_event_listener_argument,
         'has_exception_state':
-            has_event_listener_argument or
+            interface.name == 'EventTarget' or  # FIXME: merge with is_check_security_for_frame http://crbug.com/383699
             is_raises_exception or
             is_check_security_for_frame or
             any(argument for argument in arguments
                 if argument.idl_type.name == 'SerializedScriptValue' or
                    argument.idl_type.is_integer_type),
         'is_call_with_execution_context': has_extended_attribute_value(method, 'CallWith', 'ExecutionContext'),
         'is_call_with_script_arguments': is_call_with_script_arguments,
         'is_call_with_script_state': is_call_with_script_state,
         'is_check_security_for_frame': is_check_security_for_frame,
         'is_check_security_for_node': is_check_security_for_node,
@@ skipping 36 matching lines @@
 
     return {
         'cpp_type': idl_type.cpp_type_args(extended_attributes=extended_attributes,
                                            used_as_argument=True,
                                            used_as_variadic_argument=argument.is_variadic),
         'cpp_value': this_cpp_value,
         'enum_validation_expression': idl_type.enum_validation_expression,
         'has_default': 'Default' in extended_attributes,
         'has_event_listener_argument': any(
             argument_so_far for argument_so_far in method.arguments[:index]
-            if argument_so_far.idl_type.name == 'EventListener'),
+            if argument_so_far.idl_type.name == 'EventListenerOrNull'),
         'has_type_checking_interface':
             (has_extended_attribute_value(interface, 'TypeChecking', 'Interface') or
              has_extended_attribute_value(method, 'TypeChecking', 'Interface')) and
             idl_type.is_wrapper_type,
         'has_type_checking_unrestricted':
             (has_extended_attribute_value(interface, 'TypeChecking', 'Unrestricted') or
              has_extended_attribute_value(method, 'TypeChecking', 'Unrestricted')) and
             idl_type.name in ('Float', 'Double'),
         # Dictionary is special-cased, but arrays and sequences shouldn't be
         'idl_type': not idl_type.array_or_sequence_type and idl_type.base_type,
@@ skipping 13 matching lines @@
     }
 
 
 ################################################################################
 # Value handling
 ################################################################################
 
 def cpp_value(interface, method, number_of_arguments):
     def cpp_argument(argument):
         idl_type = argument.idl_type
-        if idl_type.name == 'EventListener':
+        if idl_type.name == 'EventListenerOrNull':
             if (interface.name == 'EventTarget' and
                 method.name == 'removeEventListener'):
                 # FIXME: remove this special case by moving get() into
                 # EventTarget::removeEventListener
                 return '%s.get()' % argument.name
             return argument.name
         if (idl_type.is_callback_interface or
             idl_type.name in ['NodeFilter', 'XPathNSResolver']):
             # FIXME: remove this special case
             return '%s.release()' % argument.name
@@ skipping 93 matching lines @@
 
 
 def union_arguments(idl_type):
     """Return list of ['result0Enabled', 'result0', 'result1Enabled', ...] for union types, for use in setting return value"""
     return [arg
             for i in range(len(idl_type.member_types))
             for arg in ['result%sEnabled' % i, 'result%s' % i]]
 
 IdlType.union_arguments = property(lambda self: None)
 IdlUnionType.union_arguments = property(union_arguments)