Dartium Roll 38 roll

bindings/dart/scripts/dart_attributes.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 26 matching lines @@
 from idl_types import inherits_interface
 from dart_interface import suppress_getter, suppress_setter
 import dart_types
 from dart_utilities import DartUtilities
 from v8_globals import includes, interfaces
 
 
 def generate_attribute(interface, attribute):
     idl_type = attribute.idl_type
     base_idl_type = idl_type.base_type
+    # TODO(terry): Work around for DOMString[] base should be IDLTypeArray
+    if base_idl_type == None:
+        # Returns Array or Sequence.
+        base_idl_type = idl_type.inner_name
     extended_attributes = attribute.extended_attributes
 
     idl_type.add_includes_for_type()
 
     # [CheckSecurity]
     is_check_security_for_node = 'CheckSecurity' in extended_attributes
     if is_check_security_for_node:
         includes.add('bindings/common/BindingSecurity.h')
     # [Custom]
     has_custom_getter = (('Custom' in extended_attributes and
@@ skipping 19 matching lines @@
         extended_attributes['RaisesException'] in [None, 'Setter'])
     # [DartStrictTypeChecking]
     has_strict_type_checking = (
         ('DartStrictTypeChecking' in extended_attributes or
          'DartStrictTypeChecking' in interface.extended_attributes) and
         idl_type.is_wrapper_type)
 
     if (base_idl_type == 'EventHandler' and
         interface.name in ['Window', 'WorkerGlobalScope'] and
         attribute.name == 'onerror'):
-        includes.add('bindings/v8/V8ErrorHandler.h')
+        includes.add('bindings/core/v8/V8ErrorHandler.h')
 
     is_auto_scope = not 'DartNoAutoScope' in extended_attributes
     contents = {
         'access_control_list': access_control_list(attribute),
         'activity_logging_world_list_for_getter': DartUtilities.activity_logging_world_list(attribute, 'Getter'),  # [ActivityLogging]
         'activity_logging_world_list_for_setter': DartUtilities.activity_logging_world_list(attribute, 'Setter'),  # [ActivityLogging]
         'cached_attribute_validation_method': extended_attributes.get('CachedAttribute'),
         'conditional_string': DartUtilities.conditional_string(attribute),
         'constructor_type': idl_type.constructor_type_name
                             if is_constructor_attribute(attribute) else None,
@@ skipping 139 matching lines @@
         not attribute.is_static):
         # Pass by reference.
         arguments.append('*receiver')
 
     # TODO(jacobr): refactor has_type_checking_nullable to better match v8.
     has_type_checking_nullable = (
         (DartUtilities.has_extended_attribute_value(interface, 'TypeChecking', 'Nullable') or
          DartUtilities.has_extended_attribute_value(attribute, 'TypeChecking', 'Nullable')) and
          idl_type.is_wrapper_type)
 
-    if attribute.idl_type.is_nullable and not has_type_checking_nullable:
+    if attribute.idl_type.is_explicit_nullable:
         arguments.append('isNull')
     if contents['is_getter_raises_exception']:
         arguments.append('es')
     return '%s(%s)' % (getter_name, ', '.join(arguments))
 
 
 CONTENT_ATTRIBUTE_GETTER_NAMES = {
     'boolean': 'hasAttribute',
     'long': 'getIntegralAttribute',
     'unsigned long': 'getUnsignedIntegralAttribute',
@@ skipping 10 matching lines @@
         # Special-case for performance optimization.
         return 'get%sAttribute' % content_attribute_name.capitalize()
 
     arguments.append(scoped_content_attribute_name(interface, attribute))
 
     base_idl_type = attribute.idl_type.base_type
     if base_idl_type in CONTENT_ATTRIBUTE_GETTER_NAMES:
         return CONTENT_ATTRIBUTE_GETTER_NAMES[base_idl_type]
     if 'URL' in attribute.extended_attributes:
         return 'getURLAttribute'
-    return 'getAttribute'
+    return 'fastGetAttribute'
 
 
 def is_keep_alive_for_gc(interface, attribute):
     idl_type = attribute.idl_type
     base_idl_type = idl_type.base_type
     extended_attributes = attribute.extended_attributes
     return (
         # For readonly attributes, for performance reasons we keep the attribute
         # wrapper alive while the owner wrapper is alive, because the attribute
         # never changes.
@@ skipping 42 matching lines @@
     idl_type = attribute.idl_type
 
     # TODO(terry): Should be able to eliminate suppress_setter as we move from
     #              IGNORE_MEMBERS to DartSuppress in the IDL.
     suppress = (suppress_setter(interface.name, attribute.name) or
                 DartUtilities.has_extended_attribute_value(attribute, 'DartSuppress', 'Setter'))
     contents.update({
         'is_setter_suppressed':  suppress,
         'setter_lvalue': dart_types.check_reserved_name(attribute.name),
         'cpp_type': this_cpp_type,
-        'local_cpp_type': idl_type.cpp_type_args(attribute.extended_attributes, used_as_argument=True),
+        'local_cpp_type': idl_type.cpp_type_args(attribute.extended_attributes, raw_type=True),
         'cpp_setter': setter_expression(interface, attribute, contents),
         'dart_value_to_local_cpp_value':
             attribute.idl_type.dart_value_to_local_cpp_value(
                 interface_extended_attributes, extended_attributes, attribute.name, False, 1,
                 contents['is_auto_scope']),
     })
 
 
 def setter_expression(interface, attribute, contents):
     extended_attributes = attribute.extended_attributes
     arguments = DartUtilities.call_with_arguments(attribute, extended_attributes.get('SetterCallWith'))
 
     this_setter_base_name = setter_base_name(interface, attribute, arguments)
     setter_name = DartUtilities.scoped_name(interface, attribute, this_setter_base_name)
 
     if ('PartialInterfaceImplementedAs' in extended_attributes and
         not attribute.is_static):
         arguments.append('*receiver')
     idl_type = attribute.idl_type
     if idl_type.base_type == 'EventHandler':
         getter_name = DartUtilities.scoped_name(interface, attribute, DartUtilities.cpp_name(attribute))
         contents['event_handler_getter_expression'] = '%s(%s)' % (
             getter_name, ', '.join(arguments))
         # FIXME(vsm): Do we need to support this? If so, what's our analogue of
         # V8EventListenerList?
         arguments.append('nullptr')
         # if (interface.name in ['Window', 'WorkerGlobalScope'] and
         #    attribute.name == 'onerror'):
-        #    includes.add('bindings/v8/V8ErrorHandler.h')
+        #    includes.add('bindings/core/v8/V8ErrorHandler.h')
         #    arguments.append('V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(jsValue, true, info.GetIsolate())')
         # else:
         #    arguments.append('V8EventListenerList::getEventListener(jsValue, true, ListenerFindOrCreate)')
     else:
         attribute_name = dart_types.check_reserved_name(attribute.name)
         arguments.append(attribute_name)
     if contents['is_setter_raises_exception']:
         arguments.append('es')
 
     return '%s(%s)' % (setter_name, ', '.join(arguments))
@@ skipping 12 matching lines @@
     arguments.append(scoped_content_attribute_name(interface, attribute))
 
     base_idl_type = attribute.idl_type.base_type
     if base_idl_type in CONTENT_ATTRIBUTE_SETTER_NAMES:
         return CONTENT_ATTRIBUTE_SETTER_NAMES[base_idl_type]
     return 'setAttribute'
 
 
 def scoped_content_attribute_name(interface, attribute):
     content_attribute_name = attribute.extended_attributes['Reflect'] or attribute.name.lower()
-    namespace = 'SVGNames' if interface.name.startswith('SVG') else 'HTMLNames'
-    includes.add('%s.h' % namespace)
-    return 'WebCore::%s::%sAttr' % (namespace, content_attribute_name)
+    if interface.name.startswith('SVG'):
+        # SVG's xmlbase/xmlspace/xmllang need special behavior, i.e.
+        # it is in XMLNames namespace and the generated attribute has no xml prefix.
+        if attribute.name.startswith('xml'):
+            namespace = 'XMLNames'
+            content_attribute_name = content_attribute_name[3:]
+        else:
+            namespace = 'SVGNames'
+    else:
+        namespace = 'HTMLNames'
+    includes.add('core/%s.h' % namespace)
+    return '%s::%sAttr' % (namespace, content_attribute_name)
 
 
 ################################################################################
 # Attribute configuration
 ################################################################################
 
 # [Replaceable]
 def setter_callback_name(interface, attribute):
     cpp_class_name = DartUtilities.cpp_name(interface)
     extended_attributes = attribute.extended_attributes
@@ skipping 43 matching lines @@
 # Constructors
 ################################################################################
 
 idl_types.IdlType.constructor_type_name = property(
     # FIXME: replace this with a [ConstructorAttribute] extended attribute
     lambda self: DartUtilities.strip_suffix(self.base_type, 'Constructor'))
 
 
 def is_constructor_attribute(attribute):
     # FIXME: replace this with [ConstructorAttribute] extended attribute
-    return attribute.idl_type.base_type.endswith('Constructor')
+    return attribute.idl_type.name.endswith('Constructor')
 
 
 def generate_constructor_getter(interface, attribute, contents):
     contents['needs_constructor_getter_callback'] = contents['measure_as'] or contents['deprecate_as']