- Setup infrastructure to white list some native methods as not requiring

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 71 matching lines @@
   ('DOMURL', 'createObjectUrlFromSourceCallback'): 'URLMediaSource',
   ('DOMURL', 'createObjectUrlFromStreamCallback'): 'URLMediaStream',
   ('DOMURL', '_createObjectUrlFromWebKitSourceCallback'): 'URLMediaSource',
   ('DOMURL', '_createObjectURL_2Callback'): 'URLMediaSource',
   ('DOMURL', '_createObjectURL_3Callback'): 'URLMediaSource',
   ('DOMURL', '_createObjectURL_4Callback'): 'URLMediaStream',
 }
 
 _cpp_partial_map = {}
 
+_cpp_no_auto_scope_list = [
+  ['Node', 'firstChild', 'Getter'],

[vsm, 2013/12/20 18:18:56]

More efficient to make this a set of tuples instead of a list of lists:

_cpp_no_auto_scope_list = Set([
  ('Node', 'firstChild', 'Getter'),
  ...
])

[siva, 2013/12/20 18:46:00]

Done.

+  ['Node', 'lastChild', 'Getter'],
+  ['Node', 'nextSibling', 'Getter'],
+  ['Node', 'previousSibling', 'Getter'],
+  ['Node', 'childNodes', 'Getter'],
+  ['NodeList', 'length', 'Getter'],
+  ['NodeList', 'item', 'Callback'],
+  ['Document', 'body', 'Getter'],
+]
+
 def _GetCPPPartialNames(interface):
   interface_name = interface.ext_attrs.get('ImplementedAs', interface.id)
   if not _cpp_partial_map:
     for (type, member) in _cpp_callback_map.keys():
       if type not in _cpp_partial_map:
         _cpp_partial_map[type] = set([])
 
       name_with_path = _cpp_callback_map[(type, member)]
       if name_with_path in _cpp_import_map:
         name_with_path = _cpp_import_map[name_with_path]
@@ skipping 329 matching lines @@
         '    static void returnToDart(Dart_NativeArguments args,\n'
         '                             NativeType* value)\n'
         '    {\n'
         '        if (value) {\n'
         '            DartDOMData* domData = static_cast<DartDOMData*>(\n'
         '                Dart_GetNativeIsolateData(args));\n'
         '            Dart_WeakPersistentHandle result =\n'
         '                DartDOMWrapper::lookupWrapper<Dart$(INTERFACE)>(domData, value);\n'
         '            if (result)\n'
         '                Dart_SetWeakHandleReturnValue(args, result);\n'
-        '            else\n'
+        '            else {\n'
+        '                DartApiScope apiScope();\n'
         '                Dart_SetReturnValue(args, createWrapper(domData, value));\n'
+        '            }\n'
         '        }\n'
         '    }\n',
         INTERFACE=self._interface.id)
 
     if ('CustomToV8' in ext_attrs or
         'PureInterface' in ext_attrs or
         'CPPPureInterface' in ext_attrs or
         self._interface_type_info.custom_to_dart()):
       to_dart_emitter.Emit(
           '    static Dart_Handle createWrapper(DartDOMData* domData, NativeType* value);\n')
@@ skipping 600 matching lines @@
             value_expression,
             self._interface.id,
             ext_attrs)
         set_return_value = '%s' % (return_to_dart_conversion)
       invocation_emitter.Emit(
         '        $RETURN_VALUE;\n',
         RETURN_VALUE=set_return_value)
 
   def _GenerateNativeBinding(self, idl_name, argument_count, dart_declaration,
       native_suffix, is_custom, emit_metadata=True):
+
+    def _GenerateAutoSetupScope(self, idl_name, native_suffix):

[vsm, 2013/12/20 18:18:56]

With the above, this function can be:

return (self._interface.id, idl_name, native_suffix) not in
_cpp_no_auto_scope_list

[siva, 2013/12/20 18:46:00]

Done.

+      for no_scope in _cpp_no_auto_scope_list:
+        if (self._interface.id == no_scope[0] and
+            idl_name == no_scope[1] and
+            native_suffix == no_scope[2]):
+          return 'false'
+      return 'true'
+
     metadata = []
     if emit_metadata:
       metadata = self._metadata.GetFormattedMetadata(
           self._renamer.GetLibraryName(self._interface),
           self._interface, idl_name, '  ')
 
     native_binding = '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
     self._members_emitter.Emit(
         '\n'
         '  $METADATA$DART_DECLARATION native "$NATIVE_BINDING";\n',
         DOMINTERFACE=self._interface.id,
         METADATA=metadata,
         DART_DECLARATION=dart_declaration,
         NATIVE_BINDING=native_binding)
 
     cpp_callback_name = '%s%s' % (idl_name, native_suffix)
+    auto_scope_setup = _GenerateAutoSetupScope(self, idl_name, native_suffix)
 
     self._cpp_resolver_emitter.Emit(
         '    if (argumentCount == $ARGC && name == "$NATIVE_BINDING") {\n'
-        '        *autoSetupScope = true;\n'
+        '        *autoSetupScope = $AUTO_SCOPE_SETUP;\n'
         '        return Dart$(INTERFACE_NAME)Internal::$CPP_CALLBACK_NAME;\n'
         '    }\n',
         ARGC=argument_count,
         NATIVE_BINDING=native_binding,
         INTERFACE_NAME=self._interface.id,
+        AUTO_SCOPE_SETUP=auto_scope_setup,
         CPP_CALLBACK_NAME=cpp_callback_name)
 
     if is_custom:
       self._cpp_declarations_emitter.Emit(
           '\n'
           'void $CPP_CALLBACK_NAME(Dart_NativeArguments);\n',
           CPP_CALLBACK_NAME=cpp_callback_name)
 
     return cpp_callback_name
 
@@ skipping 183 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')