Fixes for 1750 roll

tools/dom/scripts/systemnative.py

 #!/usr/bin/python
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This module provides shared functionality for the systems to generate
 native binding from the IDL database."""
 
 import emitter
 import os
@@ skipping 21 matching lines @@
   ('DOMWindow', 'storage'): 'DOMWindowQuota',
   ('DOMWindow', 'webkitStorageInfo'): 'DOMWindowQuota',
   ('DOMWindow', 'openDatabase'): 'DOMWindowWebDatabase',
   ('DOMWindow', 'webkitRequestFileSystem'): 'DOMWindowFileSystem',
   ('DOMWindow', 'webkitResolveLocalFileSystemURL'): 'DOMWindowFileSystem',
   ('DOMWindow', 'atob'): 'DOMWindowBase64',
   ('DOMWindow', 'btoa'): 'DOMWindowBase64',
   ('DOMWindow', 'clearTimeout'): 'DOMWindowTimers',
   ('DOMWindow', 'clearInterval'): 'DOMWindowTimers',
   ('DOMWindow', 'createImageBitmap'): 'ImageBitmapFactories',
+  ('Element', 'animate'): 'ElementAnimation',
   ('HTMLInputElement', 'webkitEntries'): 'HTMLInputElementFileSystem',
   ('HTMLVideoElement', 'getVideoPlaybackQuality'): 'HTMLVideoElementMediaSource',
   ('Navigator', 'doNotTrack'): 'NavigatorDoNotTrack',
   ('Navigator', 'geolocation'): 'NavigatorGeolocation',
   ('Navigator', 'webkitPersistentStorage'): 'NavigatorStorageQuota',
   ('Navigator', 'webkitTemporaryStorage'): 'NavigatorStorageQuota',
   ('Navigator', 'registerProtocolHandler'): 'NavigatorContentUtils',
   ('Navigator', 'unregisterProtocolHandler'): 'NavigatorContentUtils',
   ('Navigator', 'webkitGetUserMedia'): 'NavigatorMediaStream',
   ('Navigator', 'webkitGetGamepads'): 'NavigatorGamepad',
@@ skipping 140 matching lines @@
     if IsPureInterface(self._interface.id) or IsCustomType(self._interface.id):
       return
 
     cpp_impl_includes = set(['"' + partial + '.h"'
                              for partial in _GetCPPPartialNames(self._interface)])
     cpp_header_handlers_emitter = emitter.Emitter()
     cpp_impl_handlers_emitter = emitter.Emitter()
     class_name = 'Dart%s' % self._interface.id
     for operation in self._interface.operations:
       function_name = operation.id
+      return_type = self.SecureOutputType(operation.type.id)
       parameters = []
       arguments = []
       if operation.ext_attrs.get('CallWith') == 'ThisValue':
         parameters.append('ScriptValue scriptValue')
       conversion_includes = []
       for argument in operation.arguments:
         argument_type_info = self._TypeInfo(argument.type.id)
         parameters.append('%s %s' % (argument_type_info.parameter_type(),
                                      argument.id))
         arguments.append(argument_type_info.to_dart_conversion(argument.id))
         conversion_includes.extend(argument_type_info.conversion_includes())
 
       # FIXME(vsm): Handle ThisValue attribute.
+      if (return_type == 'void'):
+        ret = ''
+      else:
+        ret = '        return 0;\n'
+
       if operation.ext_attrs.get('CallWith') == 'ThisValue':
         cpp_header_handlers_emitter.Emit(
             '\n'
-            '    virtual bool $FUNCTION($PARAMETERS) {\n'
+            '    virtual $RETURN_TYPE $FUNCTION($PARAMETERS) {\n'
             '        DART_UNIMPLEMENTED();\n'
-            '        return false;\n'
+            '$RET'
             '    }\n',
+            RETURN_TYPE=return_type,
+            RET=ret,
             FUNCTION=function_name,
             PARAMETERS=', '.join(parameters))
         continue
 
       cpp_header_handlers_emitter.Emit(
           '\n'
-          '    virtual bool $FUNCTION($PARAMETERS);\n',
+          '    virtual $RETURN_TYPE $FUNCTION($PARAMETERS);\n',
+          RETURN_TYPE=return_type,
           FUNCTION=function_name,
           PARAMETERS=', '.join(parameters))
 
       if 'Custom' in operation.ext_attrs:
         continue
 
       cpp_impl_includes |= set(conversion_includes)
       arguments_declaration = 'Dart_Handle arguments[] = { %s }' % ', '.join(arguments)
       if not len(arguments):
         arguments_declaration = 'Dart_Handle* arguments = 0'
+      if (return_type == 'void'):
+        ret1 = 'return'
+        ret2 = ''
+      else:
+        ret1 = 'return 0'
+        ret2 = ' return'
       cpp_impl_handlers_emitter.Emit(
           '\n'
-          'bool $CLASS_NAME::$FUNCTION($PARAMETERS)\n'
+          '$RETURN_TYPE $CLASS_NAME::$FUNCTION($PARAMETERS)\n'
           '{\n'
           '    if (!m_callback.isIsolateAlive())\n'
-          '        return false;\n'
+          '        $RET1;\n'
           '    DartIsolateScope scope(m_callback.isolate());\n'
           '    DartApiScope apiScope;\n'
           '    $ARGUMENTS_DECLARATION;\n'
-          '    return m_callback.handleEvent($ARGUMENT_COUNT, arguments);\n'
+          '   $RET2 m_callback.handleEvent($ARGUMENT_COUNT, arguments);\n'
           '}\n',
+          RETURN_TYPE=return_type,
+          RET1=ret1,
+          RET2=ret2,
           CLASS_NAME=class_name,
           FUNCTION=function_name,
           PARAMETERS=', '.join(parameters),
           ARGUMENTS_DECLARATION=arguments_declaration,
           ARGUMENT_COUNT=len(arguments))
 
     cpp_header_emitter = self._cpp_library_emitter.CreateHeaderEmitter(
         self._interface.id,
         self._renamer.GetLibraryName(self._interface),
         True)
@@ skipping 241 matching lines @@
         '               }\n'
         '            }\n'
         '        }\n'
         '    }\n',
         INTERFACE=self._interface.id)
 
     if ('CustomToV8' in ext_attrs or
         'PureInterface' in ext_attrs or
         'CPPPureInterface' in ext_attrs or
         'SpecialWrapFor' in ext_attrs or
+        ('Custom' in ext_attrs and ext_attrs['Custom'] == 'Wrap') or
+        ('Custom' in ext_attrs and ext_attrs['Custom'] == 'ToV8') or
         self._interface_type_info.custom_to_dart()):
       to_dart_emitter.Emit(
           '    static Dart_Handle createWrapper(DartDOMData* domData, NativeType* value);\n')
     else:
       to_dart_emitter.Emit(
           '    static Dart_Handle createWrapper(DartDOMData* domData, NativeType* value)\n'
           '    {\n'
           '        return DartDOMWrapper::createWrapper<Dart$(INTERFACE)>(domData, value);\n'
           '    }\n',
           INTERFACE=self._interface.id)
@@ skipping 58 matching lines @@
       if attr.id == 'operator':
         webcore_function_name = '_operator'
       elif attr.id == 'target' and attr.type.id == 'SVGAnimatedString':
         webcore_function_name = 'svgTarget'
       elif attr.id == 'CSS':
         webcore_function_name = 'css'
       else:
         webcore_function_name = self._ToWebKitName(attr.id)
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
+    raises = ('RaisesException' in attr.ext_attrs and
+              attr.ext_attrs['RaisesException'] != 'Setter')
     self._GenerateNativeCallback(
         cpp_callback_name,
         True,
         function_expression,
         attr,
         [],
         attr.type.id,
         attr.type.nullable,
-        'GetterRaisesException' in attr.ext_attrs or 'RaisesException' in attr.ext_attrs,
+        raises,
         auto_scope_setup)
 
   def _AddSetter(self, attr, html_name):
     type_info = self._TypeInfo(attr.type.id)
     dart_declaration = 'void set %s(%s value)' % (html_name, self._DartType(attr.type.id))
     is_custom = set(['Custom', 'CustomSetter', 'V8CustomSetter']) & set(attr.ext_attrs)
     native_suffix = 'Setter'
     auto_scope_setup = self._GenerateAutoSetupScope(attr.id, native_suffix)
     cpp_callback_name = self._GenerateNativeBinding(attr.id, 2,
         dart_declaration, native_suffix, is_custom, auto_scope_setup)
     if is_custom:
       return
 
     if 'Reflect' in attr.ext_attrs:
       webcore_function_name = self._TypeInfo(attr.type.id).webcore_setter_name()
     else:
+      if 'ImplementedAs' in attr.ext_attrs:
+        attr_name = attr.ext_attrs['ImplementedAs']
+      else:
+        attr_name = attr.id
       webcore_function_name = re.sub(r'^(xml|css|(?=[A-Z])|\w)',
                                      lambda s: s.group(1).upper(),
-                                     attr.id)
+                                     attr_name)
       webcore_function_name = 'set%s' % webcore_function_name
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
+    raises = ('RaisesException' in attr.ext_attrs and
+              attr.ext_attrs['RaisesException'] != 'Getter')
     self._GenerateNativeCallback(
         cpp_callback_name,
         True,
         function_expression,
         attr,
         [attr],
         'void',
         False,
-        'SetterRaisesException' in attr.ext_attrs,
+        raises,
         auto_scope_setup,
         generate_custom_element_scope_if_needed=True)
 
   def AddIndexer(self, element_type):
     """Adds all the methods required to complete implementation of List."""
     # We would like to simply inherit the implementation of everything except
     # length, [], and maybe []=.  It is possible to extend from a base
     # array implementation class only when there is no other implementation
     # inheritance.  There might be no implementation inheritance other than
     # DOMBaseWrapper for many classes, but there might be some where the
@@ skipping 436 matching lines @@
         '            goto fail;\n'
         '        }\n')
 
 
     if needs_receiver:
       interface_name = self._interface_type_info.native_type()
       # Hack to determine if this came from the _cpp_callback_map.
       # In this case, the getter is mapped to a static method.
       if (not function_expression.startswith('receiver->') and
           not function_expression.startswith(interface_name + '::')):
-        if interface_name == 'DOMWindow' or interface_name == 'Navigator' or interface_name == 'WorkerGlobalScope':
+        if interface_name in ['DOMWindow', 'Element', 'Navigator', 'WorkerGlobalScope']:
           cpp_arguments.insert(0, 'receiver')
         else:
           cpp_arguments.append('receiver')
       elif self._IsStatic(node.id):
         cpp_arguments.insert(0, 'receiver')
 
     function_call = '%s(%s)' % (function_expression, ', '.join(cpp_arguments))
     if return_type == 'void':
       invocation_emitter.Emit(
         '        $FUNCTION_CALL;\n',
         FUNCTION_CALL=function_call)
     else:
       return_type_info = self._TypeInfo(return_type)
       self._cpp_impl_includes |= set(return_type_info.conversion_includes())
 
       if return_type_is_nullable:
         invocation_emitter.Emit(
           '        bool isNull = false;\n'
           '        $NATIVE_TYPE result = $FUNCTION_CALL;\n'
           '        if (isNull)\n'
           '            return;\n',
-          NATIVE_TYPE=return_type_info.native_type(),
+          NATIVE_TYPE=return_type_info.parameter_type(),
           FUNCTION_CALL=function_call)
         value_expression = 'result'
       else:
         value_expression = function_call
 
       # Generate to Dart conversion of C++ value.
       if return_type_info.dart_type() == 'bool':
         set_return_value = 'Dart_SetBooleanReturnValue(args, %s)' % (value_expression)
       elif return_type_info.dart_type() == 'int':
         if return_type_info.native_type() == 'unsigned':
@@ skipping 255 matching lines @@
     e.Emit("};\n");
     e.Emit('\n');
     e.Emit('} // namespace WebCore\n');
 
 def _IsOptionalStringArgumentInInitEventMethod(interface, operation, argument):
   return (
       interface.id.endswith('Event') and
       operation.id.startswith('init') and
       argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')