Use ExceptionState when converting string arguments to promise methods

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 16 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Generate template values for methods.
 
 Extends IdlArgument with property |default_cpp_value|.
 Extends IdlTypeBase and IdlUnionType with property |union_arguments|.
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-compiler
 """
 
-from idl_definitions import IdlArgument
+from idl_definitions import IdlArgument, IdlOperation
 from idl_types import IdlTypeBase, IdlUnionType, inherits_interface
 from v8_globals import includes
 import v8_types
 import v8_utilities
 from v8_utilities import has_extended_attribute_value
 
 
 # Methods with any of these require custom method registration code in the
 # interface's configure*Template() function.
 CUSTOM_REGISTRATION_EXTENDED_ATTRIBUTES = frozenset([
     'DoNotCheckSecurity',
     'DoNotCheckSignature',
     'NotEnumerable',
     'Unforgeable',
 ])
 
 
 def argument_needs_try_catch(method, argument):
-    return_promise = method.idl_type and method.idl_type.name == 'Promise'
     idl_type = argument.idl_type
     base_type = idl_type.base_type
 
     return not(
         # These cases are handled by separate code paths in the
         # generate_argument() macro in Source/bindings/templates/methods.cpp.
         idl_type.is_callback_interface or
         base_type == 'SerializedScriptValue' or
         (argument.is_variadic and idl_type.is_wrapper_type) or
         # Variadic arguments use toImplArguments() with throws excentions via
         # its ExceptionState& argument.
         argument.is_variadic or
         # String and enumeration arguments converted using one of the
         # TOSTRING_* macros except for _PROMISE variants in
         # Source/bindings/core/v8/V8BindingMacros.h don't use a v8::TryCatch.
         ((base_type == 'DOMString' or idl_type.is_enum) and
-         not return_promise) or
+         not method.returns_promise) or
         # Conversion that take an ExceptionState& argument throw all their
         # exceptions via it, and doesn't need/use a TryCatch, except if the
         # argument has [Clamp], in which case it uses a separate code path in
         # Source/bindings/templates/methods.cpp, which *does* use a TryCatch.
-        argument.v8_conversion_needs_exception_state or
+        argument_conversion_needs_exception_state(method, argument) or
         # A trivial conversion cannot throw exceptions at all, so doesn't need a
         # TryCatch to catch them.
         idl_type.v8_conversion_is_trivial)
 
 
 def use_local_result(method):
     extended_attributes = method.extended_attributes
     idl_type = method.idl_type
     return (has_extended_attribute_value(method, 'CallWith', 'ScriptState') or
             'ImplementedInPrivateScript' in extended_attributes or
@@ skipping 78 matching lines @@
         'function_template': function_template(),
         'has_custom_registration': is_static or
             v8_utilities.has_extended_attribute(
                 method, CUSTOM_REGISTRATION_EXTENDED_ATTRIBUTES),
         'has_exception_state':
             is_raises_exception or
             is_check_security_for_frame or
             is_check_security_for_window or
             any(argument for argument in arguments
                 if (argument.idl_type.name == 'SerializedScriptValue' or
-                    argument.v8_conversion_needs_exception_state)),
+                    argument_conversion_needs_exception_state(method, argument))),
         'idl_type': idl_type.base_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,
         'is_check_security_for_window': is_check_security_for_window,
         'is_custom': 'Custom' in extended_attributes,
         'is_custom_element_callbacks': is_custom_element_callbacks,
         'is_do_not_check_security': is_do_not_check_security,
@@ skipping 30 matching lines @@
         '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)
 
     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.')
 
     default_cpp_value = argument.default_cpp_value
     return {
         'cpp_type': idl_type.cpp_type_args(extended_attributes=extended_attributes,
                                            raw_type=True,
@@ skipping 23 matching lines @@
         '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),
+        'v8_value_to_local_cpp_value': v8_value_to_local_cpp_value(argument, index, return_promise=method.returns_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':
@@ skipping 181 matching lines @@
         return '%s::create()' % argument.idl_type.base_type
     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)
 
 
-def v8_conversion_needs_exception_state(argument):
-    return (argument.idl_type.v8_conversion_needs_exception_state or
-            argument.is_variadic)
+def method_returns_promise(method):
+    return method.idl_type and method.idl_type.name == 'Promise'
 
-IdlArgument.v8_conversion_needs_exception_state = property(v8_conversion_needs_exception_state)
+IdlOperation.returns_promise = property(method_returns_promise)
+
+
+def argument_conversion_needs_exception_state(method, argument):
+    idl_type = argument.idl_type
+    return (idl_type.v8_conversion_needs_exception_state or
+            argument.is_variadic or
+            (method.returns_promise and (idl_type.is_string_type or
+                                         idl_type.is_enum)))