Dartium Roll 38 roll

bindings/dart/scripts/dart_interface.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 an interface.
 
 Design doc: http://www.chromium.org/developers/design-documents/idl-compiler
 """
 
 from collections import defaultdict
 
 import idl_types
-from idl_types import IdlType, inherits_interface
+from idl_types import IdlType, inherits_interface, IdlArrayOrSequenceType, IdlArrayType
 import dart_attributes
 import dart_methods
 import dart_types
 from dart_utilities import DartUtilities
 from v8_globals import includes
 
 
 INTERFACE_H_INCLUDES = frozenset([
-    'bindings/dart/DartDOMWrapper.h',
+    'bindings/core/dart/DartDOMWrapper.h',
     'platform/heap/Handle.h',
 ])
 
 INTERFACE_CPP_INCLUDES = frozenset([
-    'DartUtilities.h',
+
+    'bindings/core/dart/DartUtilities.h',
     'wtf/GetPtr.h',
     'wtf/RefPtr.h',
 ])
 
 
 # TODO(terry): Temporary to not generate a method, getter/setter. Format is:
 #
 #               interface_name.method_name
 #               interface_name.get:attribute_name
 #               interface_name.set:attribute_name
@@ skipping 366 matching lines @@
         # FIXME(vsm): We probably need bindings/dart/DartController and
         # core/frame/LocalFrame.h here.
         includes.update(['DartDocument.h'])
 
     if inherits_interface(interface.name, 'DataTransferItemList'):
         # FIXME(jacobr): this is a hack.
         includes.update(['core/html/HTMLCollection.h'])
 
 
     if inherits_interface(interface.name, 'EventTarget'):
-        includes.update(['DartEventListener.h'])
+        includes.update(['bindings/core/dart/DartEventListener.h'])
 
     # [ActiveDOMObject]
     is_active_dom_object = 'ActiveDOMObject' in extended_attributes
 
     # [CheckSecurity]
     is_check_security = 'CheckSecurity' in extended_attributes
     if is_check_security:
         includes.add('bindings/common/BindingSecurity.h')
 
     # [DependentLifetime]
     is_dependent_lifetime = 'DependentLifetime' in extended_attributes
 
     # [MeasureAs]
 # TODO(terry): Remove Me?
 #    is_measure_as = 'MeasureAs' in extended_attributes
 #    if is_measure_as:
 #        includes.add('core/frame/UseCounter.h')
 
     # [SetWrapperReferenceFrom]
     reachable_node_function = extended_attributes.get('SetWrapperReferenceFrom')
     if reachable_node_function:
         # FIXME(vsm): We may need bindings/dart/DartGCController.h instead.
-        includes.update(['bindings/v8/V8GCController.h',
+        includes.update(['bindings/core/v8/V8GCController.h',
                          'core/dom/Element.h'])
 
     # [SetWrapperReferenceTo]
     set_wrapper_reference_to_list = [{
         'name': argument.name,
         # FIXME: properly should be:
-        # 'cpp_type': argument.idl_type.cpp_type_args(used_as_argument=True),
+        # 'cpp_type': argument.idl_type.cpp_type_args(used_as_rvalue_type=True),
         # (if type is non-wrapper type like NodeFilter, normally RefPtr)
         # Raw pointers faster though, and NodeFilter hacky anyway.
         'cpp_type': argument.idl_type.implemented_as + '*',
         'idl_type': argument.idl_type,
         'v8_type': dart_types.v8_type(argument.idl_type.name),
     } for argument in extended_attributes.get('SetWrapperReferenceTo', [])]
     for set_wrapper_reference_to in set_wrapper_reference_to_list:
         set_wrapper_reference_to['idl_type'].add_includes_for_type()
 
     # [SpecialWrapFor]
@@ skipping 61 matching lines @@
 
     # [CustomConstructor]
     custom_constructors = [generate_custom_constructor(interface, constructor)
                            for constructor in interface.custom_constructors]
 
     # [EventConstructor]
     has_event_constructor = 'EventConstructor' in extended_attributes
     any_type_attributes = [attribute for attribute in interface.attributes
                            if attribute.idl_type.name == 'Any']
     if has_event_constructor:
-        includes.add('bindings/common/Dictionary.h')
+        includes.add('bindings/core/v8/Dictionary.h')
         if any_type_attributes:
-            includes.add('bindings/v8/SerializedScriptValue.h')
+            includes.add('bindings/core/v8/SerializedScriptValue.h')
 
     # [NamedConstructor]
     named_constructor = generate_named_constructor(interface)
 
     add_native_entries(interface, constructors, bool(custom_constructors))
     add_native_entries(interface, custom_constructors, bool(custom_constructors))
     if named_constructor:
         add_native_entries(interface, [named_constructor], bool(custom_constructors))
 
     if (constructors or custom_constructors or has_event_constructor or
@@ skipping 297 matching lines @@
     cpp_value = 'info[%s]' % index
     idl_type = argument['idl_type_object']
     # FIXME(vsm): We need Dart specific checks for the rest of this method.
     # FIXME: proper type checking, sharing code with attributes and methods
     # FIXME(terry): DartStrictTypeChecking no longer supported; TypeChecking is
     #               new extended attribute.
     if idl_type.name == 'String' and argument['is_strict_type_checking']:
         return ' || '.join(['isUndefinedOrNull(%s)' % cpp_value,
                             '%s->IsString()' % cpp_value,
                             '%s->IsObject()' % cpp_value])
-    if idl_type.array_or_sequence_type:
+    if idl_type.native_array_element_type:
         return '%s->IsArray()' % cpp_value
     if idl_type.is_callback_interface:
         return ' || '.join(['%s->IsNull()' % cpp_value,
                             '%s->IsFunction()' % cpp_value])
     if idl_type.is_wrapper_type:
         type_check = 'V8{idl_type}::hasInstance({cpp_value}, info.GetIsolate())'.format(idl_type=idl_type.base_type, cpp_value=cpp_value)
         if idl_type.is_nullable:
             type_check = ' || '.join(['%s->IsNull()' % cpp_value, type_check])
         return type_check
     if idl_type.is_interface_type:
@@ skipping 59 matching lines @@
         'number_of_arguments': len(constructor.arguments),
     }
 
 
 def constructor_argument_list(interface, constructor):
     # FIXME: unify with dart_methods.cpp_argument.
 
     def cpp_argument(argument):
         argument_name = dart_types.check_reserved_name(argument.name)
         idl_type = argument.idl_type
-        if idl_type.is_typed_array_type:
+        # FIXMEDART: there has to be a cleaner way to check for arraylike
+        # types such as Uint8ClampedArray.
+        if isinstance(idl_type, IdlArrayType) or idl_type.preprocessed_type.is_typed_array_type:
             return '%s.get()' % argument_name
 
         return argument_name
 
     arguments = []
     # [ConstructorCallWith=ExecutionContext]
     if DartUtilities.has_extended_attribute_value(interface, 'ConstructorCallWith', 'ExecutionContext'):
         arguments.append('context')
     # [ConstructorCallWith=Document]
     if DartUtilities.has_extended_attribute_value(interface, 'ConstructorCallWith', 'Document'):
         arguments.append('document')
 
     arguments.extend([cpp_argument(argument) for argument in constructor.arguments])
 
     # [RaisesException=Constructor]
     if interface.extended_attributes.get('RaisesException') == 'Constructor':
         arguments.append('es')
 
     return arguments
 
 
 # TODO(terry): Eliminate this function use dart_methods.generate_argument instead
 #              for all constructor arguments.
 def constructor_argument(interface, argument, index):
     idl_type = argument.idl_type
     default_value = str(argument.default_value) if argument.default_value else None
 
     argument_content = {
         'cpp_type': idl_type.cpp_type_args(),
-        'local_cpp_type': idl_type.cpp_type_args(argument.extended_attributes, used_as_argument=True),
+        'local_cpp_type': idl_type.cpp_type_args(argument.extended_attributes, raw_type=True),
         # FIXME: check that the default value's type is compatible with the argument's
         'default_value': default_value,
         # FIXME: remove once [Default] removed and just use argument.default_value
         'has_default': 'Default' in argument.extended_attributes or default_value,
         'idl_type_object': idl_type,
         'preprocessed_type': str(idl_type.preprocessed_type),
         # 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,
+        'idl_type': idl_type.native_array_element_type,
         'index': index,
-        'is_array_or_sequence_type': not not idl_type.array_or_sequence_type,
+        'is_array_or_sequence_type': not not idl_type.native_array_element_type,
         'is_optional': argument.is_optional,
         'is_strict_type_checking': False,  # Required for overload resolution
         'name': argument.name,
         'dart_value_to_local_cpp_value': dart_methods.dart_value_to_local_cpp_value(interface, argument, index),
     }
     return argument_content
 
 
 def generate_constructor_overloads(constructors):
     if len(constructors) <= 1:
@@ skipping 225 matching lines @@
         deleter = next(
             method
             for method in interface.operations
             if ('deleter' in method.specials and
                 len(method.arguments) == 1 and
                 str(method.arguments[0].idl_type) == 'DOMString'))
     except StopIteration:
         return None
 
     return property_deleter(deleter)