IDL: Make idl_type.is_wrapper_type false for callback interfaces

Source/bindings/scripts/v8_types.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 62 matching lines @@
 ]))
 
 IdlType.is_array_buffer_or_view = property(
     lambda self: self.base_type in ARRAY_BUFFER_AND_VIEW_TYPES)
 
 IdlType.is_typed_array = property(
     lambda self: self.base_type in TYPED_ARRAY_TYPES)
 
 IdlType.is_wrapper_type = property(
     lambda self: (self.is_interface_type and
+                  not self.is_callback_interface and
                   self.base_type not in NON_WRAPPER_TYPES))
 
 
 ################################################################################
 # C++ types
 ################################################################################
 
 CPP_TYPE_SAME_AS_IDL_TYPE = set([
     'double',
     'float',
@@ skipping 510 matching lines @@
     return expression
 
 
 # FIXME: this function should be refactored, as this takes too many flags.
 def v8_value_to_local_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index=None, declare_variable=True, isolate='info.GetIsolate()', bailout_return_value=None, use_exception_state=False, restricted_float=False):
     """Returns an expression that converts a V8 value to a C++ value and stores it as a local value."""
 
     this_cpp_type = idl_type.cpp_type_args(extended_attributes=extended_attributes, raw_type=True)
     idl_type = idl_type.preprocessed_type
 
-    if idl_type.base_type in ('void', 'object', 'EventHandler', 'EventListener'):
-        return {
-            'error_message': 'no V8 -> C++ conversion for IDL type: %s' % idl_type.name
-        }
-
     cpp_value = v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index, isolate, restricted_float=restricted_float)
 
     # Optional expression that returns a value to be assigned to the local variable.
     assign_expression = None
     # Optional void expression executed unconditionally.
     set_expression = None
     # Optional expression that returns true if the conversion fails.
     check_expression = None
     # Optional expression used as the return value when returning. Only
     # meaningful if 'check_expression' is not None.
@@ skipping 14 matching lines @@
             # Note: 'not idl_type.v8_conversion_needs_exception_state' implies
             # 'idl_type.is_string_type', but there are types for which both are
             # true (ByteString and USVString), so using idl_type.is_string_type
             # as the condition here would be wrong.
             if not idl_type.v8_conversion_needs_exception_state:
                 if use_exception_state:
                     check_expression = '!%s.prepare(exceptionState)' % variable_name
                 else:
                     check_expression = '!%s.prepare()' % variable_name
     elif not idl_type.v8_conversion_is_trivial:
-        raise Exception('unclassified V8 -> C++ conversion for IDL type: %s' % idl_type.name)
+        return {
+            'error_message': 'no V8 -> C++ conversion for IDL type: %s' % idl_type.name
+        }
     else:
         assign_expression = cpp_value
 
     # Types that don't need error handling, and simply assign a value to the
     # local variable.
 
     return {
         'assign_expression': assign_expression,
         'check_expression': check_expression,
         'cpp_type': this_cpp_type,
@@ skipping 316 matching lines @@
     number_of_nullable_member_types_union)
 
 
 def includes_nullable_type_union(idl_type):
     # http://heycam.github.io/webidl/#dfn-includes-a-nullable-type
     return idl_type.number_of_nullable_member_types == 1
 
 IdlTypeBase.includes_nullable_type = False
 IdlNullableType.includes_nullable_type = True
 IdlUnionType.includes_nullable_type = property(includes_nullable_type_union)