IDL: make optional arguments (without default) explicit sometimes

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 71 matching lines @@
 
 
 def method_context(interface, method):
     arguments = method.arguments
     extended_attributes = method.extended_attributes
     idl_type = method.idl_type
     is_static = method.is_static
     name = method.name
 
     idl_type.add_includes_for_type()
-    this_cpp_value = cpp_value(interface, method, len(arguments))
+    this_cpp_value = cpp_value(interface, method)
 
     def function_template():
         if is_static:
             return 'functionTemplate'
         if 'Unforgeable' in extended_attributes:
             return 'instanceTemplate'
         return 'prototypeTemplate'
 
     is_implemented_in_private_script = 'ImplementedInPrivateScript' in extended_attributes
     if is_implemented_in_private_script:
@@ skipping 95 matching lines @@
         'use_local_result': use_local_result(method),
         'v8_set_return_value': v8_set_return_value(interface.name, method, this_cpp_value),
         'v8_set_return_value_for_main_world': v8_set_return_value(interface.name, method, this_cpp_value, for_main_world=True),
         'world_suffixes': ['', 'ForMainWorld'] if 'PerWorldBindings' in extended_attributes else [''],  # [PerWorldBindings],
     }
 
 
 def argument_context(interface, method, argument, index):
     extended_attributes = argument.extended_attributes
     idl_type = argument.idl_type
-    this_cpp_value = cpp_value(interface, method, index)
     is_variadic_wrapper_type = argument.is_variadic and idl_type.is_wrapper_type
     return_promise = (method.idl_type.name == 'Promise' if method.idl_type
                                                         else False)
 
+    is_explicit_optional = argument.is_optional and not argument.default_value
+    if is_explicit_optional:
+        includes.add('bindings/core/v8/Optional.h')
+
     if ('ImplementedInPrivateScript' in extended_attributes and
         not idl_type.is_wrapper_type and
         not idl_type.is_basic_type):
         raise Exception('Private scripts supports only primitive types and DOM wrappers.')
 
     return {
         'cpp_type': idl_type.cpp_type_args(extended_attributes=extended_attributes,
                                            raw_type=True,
                                            used_as_variadic_argument=argument.is_variadic),
-        'cpp_value': this_cpp_value,
+        'cpp_type_initializer': idl_type.cpp_type_initializer,
         # FIXME: check that the default value's type is compatible with the argument's
         'default_value': argument.default_cpp_value,
         'enum_validation_expression': idl_type.enum_validation_expression,
         'handle': '%sHandle' % argument.name,
-        # FIXME: remove once [Default] removed and just use argument.default_value
-        'has_default': 'Default' in extended_attributes or argument.default_value,
         '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': idl_type.base_type,
         'idl_type_object': idl_type,
         'index': index,
         'is_clamp': 'Clamp' in extended_attributes,
         'is_callback_interface': idl_type.is_callback_interface,
+        'is_explicit_optional': is_explicit_optional,
         'is_nullable': idl_type.is_nullable,
         'is_optional': argument.is_optional,
         'is_variadic_wrapper_type': is_variadic_wrapper_type,
         'is_wrapper_type': idl_type.is_wrapper_type,
         'name': argument.name,
         'private_script_cpp_value_to_v8_value': idl_type.cpp_value_to_v8_value(
             argument.name, isolate='scriptState->isolate()',
             creation_context='scriptState->context()->Global()'),
-        'v8_set_return_value': v8_set_return_value(interface.name, method, this_cpp_value),
-        'v8_set_return_value_for_main_world': v8_set_return_value(interface.name, method, this_cpp_value, for_main_world=True),
         'v8_value_to_local_cpp_value': v8_value_to_local_cpp_value(argument, index, return_promise=return_promise),
         'vector_type': v8_types.cpp_ptr_type('Vector', 'HeapVector', idl_type.gc_type),
     }
 
 
 def argument_declarations_for_private_script(interface, method):
     argument_declarations = ['LocalFrame* frame']
     argument_declarations.append('%s* holderImpl' % interface.name)
     argument_declarations.extend(['%s %s' % (argument.idl_type.cpp_type_args(
         used_as_rvalue_type=True), argument.name) for argument in method.arguments])
     if method.idl_type.name != 'void':
         argument_declarations.append('%s* %s' % (method.idl_type.cpp_type, 'result'))
     return argument_declarations
 
 
 ################################################################################
 # Value handling
 ################################################################################
 
-def cpp_value(interface, method, number_of_arguments):
+def cpp_value(interface, method):
     def cpp_argument(argument):
         idl_type = argument.idl_type
+        if argument.is_optional and not argument.default_value:
+            cpp_type_optional = v8_types.cpp_template_type(
+                'Optional', idl_type.cpp_type_args(
+                    extended_attributes=argument.extended_attributes,
+                    raw_type=idl_type.preprocessed_type.is_string_type,
+                    used_in_cpp_sequence=True))
+            return '{cpp_type_optional}({name}, {name}Missing)'.format(
+                cpp_type_optional=cpp_type_optional,
+                name=argument.name)
         if idl_type.name == 'EventListener':
             return argument.name
         if (idl_type.is_callback_interface or
             idl_type.name in ['NodeFilter', 'NodeFilterOrNull',
                               'XPathNSResolver', 'XPathNSResolverOrNull']):
             # FIXME: remove this special case
             return '%s.release()' % argument.name
         return argument.name
 
-    # Truncate omitted optional arguments
-    arguments = method.arguments[:number_of_arguments]
     cpp_arguments = []
     if 'ImplementedInPrivateScript' in method.extended_attributes:
         cpp_arguments.append('toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())')
         cpp_arguments.append('impl')
 
     if method.is_constructor:
         call_with_values = interface.extended_attributes.get('ConstructorCallWith')
     else:
         call_with_values = method.extended_attributes.get('CallWith')
     cpp_arguments.extend(v8_utilities.call_with_arguments(call_with_values))
 
     # Members of IDL partial interface definitions are implemented in C++ as
     # static member functions, which for instance members (non-static members)
     # take *impl as their first argument
     if ('PartialInterfaceImplementedAs' in method.extended_attributes and
         not 'ImplementedInPrivateScript' in method.extended_attributes and
         not method.is_static):
         cpp_arguments.append('*impl')
-    cpp_arguments.extend(cpp_argument(argument) for argument in arguments)
+    cpp_arguments.extend(cpp_argument(argument) for argument in method.arguments)
 
     this_union_arguments = method.idl_type and method.idl_type.union_arguments
     if this_union_arguments:
         cpp_arguments.extend([member_argument['cpp_value']
                               for member_argument in this_union_arguments])
 
     if 'ImplementedInPrivateScript' in method.extended_attributes:
         if method.idl_type.name != 'void':
             cpp_arguments.append('&result')
     elif ('RaisesException' in method.extended_attributes or
@@ skipping 123 matching lines @@
 
 
 def argument_default_cpp_value(argument):
     if not argument.default_value:
         return None
     return argument.idl_type.literal_cpp_value(argument.default_value)
 
 IdlTypeBase.union_arguments = None
 IdlUnionType.union_arguments = property(union_arguments)
 IdlArgument.default_cpp_value = property(argument_default_cpp_value)