Retry "Changes for webkit roll 148757-149482"

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
 from generator import *
 from htmldartgenerator import *
 from idlnode import IDLArgument
 from systemhtml import js_support_checks, GetCallbackInfo, HTML_LIBRARY_NAMES
 
+_cpp_type_map = {
+  ('DataTransferItem', 'webkitGetAsEntry'): 'DataTransferItemFileSystem',
+  ('DOMWindow', 'indexedDB'): 'DOMWindowIndexedDatabase',

[Anton Muhin, 2013/05/17 09:55:05]

is this temporary?  if yes, please, add a TODO

+  ('DOMWindow', 'speechSynthesis'): 'DOMWindowSpeechSynthesis',
+  ('DOMWindow', 'webkitNotifications'): 'DOMWindowNotifications',
+  ('DOMWindow', 'storage'): 'DOMWindowQuota',
+  ('DOMWindow', 'webkitStorageInfo'): 'DOMWindowQuota',
+  ('DOMWindow', 'openDatabase'): 'DOMWindowWebDatabase',
+  ('DOMWindow', 'webkitRequestFileSystem'): 'DOMWindowFileSystem',
+  ('DOMWindow', 'webkitResolveLocalFileSystemURL'): 'DOMWindowFileSystem',
+  ('HTMLInputElement', 'webkitEntries'): 'HTMLInputElementFileSystem',
+  ('Navigator', 'doNotTrack'): 'NavigatorDoNotTrack',
+  ('Navigator', 'geolocation'): 'NavigatorGeolocation',
+  ('Navigator', 'webkitPersistentStorage'): 'NavigatorStorageQuota',
+  ('Navigator', 'webkitTemporaryStorage'): 'NavigatorStorageQuota',
+  ('Navigator', 'registerProtocolHandler'): 'NavigatorContentUtils',
+  ('Navigator', 'unregisterProtocolHandler'): 'NavigatorContentUtils',
+  ('Navigator', 'webkitGetUserMedia'): 'NavigatorMediaStream',
+  ('Navigator', 'webkitGetGamepads'): 'NavigatorGamepad',
+  }
+
+_cpp_partial_map = {}
+
+def _GetCPPPartialNames(interface_name):
+  if not _cpp_partial_map:
+    for (type, member) in _cpp_type_map.keys():

[Anton Muhin, 2013/05/17 09:55:05]

nit: please, no () around type, member

+      if type not in _cpp_partial_map:
+        _cpp_partial_map[type] = set([])
+      _cpp_partial_map[type].add(_cpp_type_map[(type, member)])

[Anton Muhin, 2013/05/17 09:55:05]

_cpp_partial_map.setdefault(type, set()).add(....)

+
+  if interface_name in _cpp_partial_map:

[Anton Muhin, 2013/05/17 09:55:05]

return _cpp_partial_map.get(interface_name, set())

+    return _cpp_partial_map[interface_name]
+  else:
+    return set([])
+
+def _GetCPPTypeName(interface_name, callback_name):
+  # TODO(vsm): We need to track the original IDL file name in order to recover
+  # the proper CPP name.
+
+  cpp_tuple = (interface_name, callback_name)

[Anton Muhin, 2013/05/17 09:55:05]

return _cpp_type_name.get((interface_name, callback_name), interface_name)

+  if cpp_tuple in _cpp_type_map:
+    cpp_type_name = _cpp_type_map[cpp_tuple]
+  else:
+    cpp_type_name = interface_name
+  return cpp_type_name
+
 class DartiumBackend(HtmlDartGenerator):
   """Generates Dart implementation for one DOM IDL interface."""
 
   def __init__(self, interface, cpp_library_emitter, options):
     super(DartiumBackend, self).__init__(interface, options)
 
     self._interface = interface
     self._cpp_library_emitter = cpp_library_emitter
     self._database = options.database
     self._template_loader = options.templates
     self._type_registry = options.type_registry
     self._interface_type_info = self._type_registry.TypeInfo(self._interface.id)
     self._metadata = options.metadata
 
   def ImplementsMergedMembers(self):
     # We could not add merged functions to implementation class because
     # underlying c++ object doesn't implement them. Merged functions are
     # generated on merged interface implementation instead.
     return False
 
   def CustomJSMembers(self):
     return {}
 
   def GenerateCallback(self, info):
     if IsPureInterface(self._interface.id) or IsCustomType(self._interface.id):
       return
 
-    cpp_impl_includes = set()
+    cpp_impl_includes = set(['"' + partial + '.h"'
+                             for partial in _GetCPPPartialNames(self._interface.id)])
     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:
       parameters = []
       arguments = []
       conversion_includes = []
       for argument in operation.arguments:
         argument_type_info = self._TypeInfo(argument.type.id)
         parameters.append('%s %s' % (argument_type_info.parameter_type(),
@@ skipping 68 matching lines @@
           self._interface.id,
           self._renamer.GetLibraryName(self._interface))
       self._cpp_impl_emitter = self._cpp_library_emitter.CreateSourceEmitter(self._interface.id)
     else:
       self._cpp_header_emitter = emitter.Emitter()
       self._cpp_impl_emitter = emitter.Emitter()
 
     self._interface_type_info = self._TypeInfo(self._interface.id)
     self._members_emitter = members_emitter
     self._cpp_declarations_emitter = emitter.Emitter()
-    self._cpp_impl_includes = set()
+    self._cpp_impl_includes = set(['"' + partial + '.h"'
+                                   for partial in _GetCPPPartialNames(self._interface.id)])
     self._cpp_definitions_emitter = emitter.Emitter()
     self._cpp_resolver_emitter = emitter.Emitter()
 
     # We need to revisit our treatment of typed arrays, right now
     # it is full of hacks.
     if self._interface.ext_attrs.get('ConstructorTemplate') == 'TypedArray':
       self._cpp_resolver_emitter.Emit(
           '    if (name == "$(INTERFACE_NAME)_constructor_Callback")\n'
           '        return Dart$(INTERFACE_NAME)Internal::constructorCallback;\n',
           INTERFACE_NAME=self._interface.id)
@@ skipping 207 matching lines @@
           webcore_function_name = 'getNonEmptyURLAttribute'
         else:
           webcore_function_name = 'getURLAttribute'
     elif 'ImplementedAs' in attr.ext_attrs:
       webcore_function_name = attr.ext_attrs['ImplementedAs']
     else:
       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':

[Anton Muhin, 2013/05/17 09:55:05]

this is a rename, correct?  There is this implementedBy attribute which should
help here

+        webcore_function_name = 'css'
       else:
         webcore_function_name = self._ToWebKitName(attr.id)
       if attr.type.id.startswith('SVGAnimated'):
         webcore_function_name += 'Animated'
 
     function_expression = self._GenerateWebCoreFunctionExpression(webcore_function_name, attr)
     self._GenerateNativeCallback(
         cpp_callback_name,
         True,
         function_expression,
@@ skipping 419 matching lines @@
     if raises_dom_exception:
       cpp_arguments.append('ec')
       invocation_emitter = body_emitter.Emit(
         '        ExceptionCode ec = 0;\n'
         '$!INVOCATION'
         '        if (UNLIKELY(ec)) {\n'
         '            exception = DartDOMWrapper::exceptionCodeToDartException(ec);\n'
         '            goto fail;\n'
         '        }\n')
 
+
+    if needs_receiver:
+      interface_name = self._interface_type_info.native_type()
+      cpp_type_name = _GetCPPTypeName(interface_name,

[Anton Muhin, 2013/05/17 09:55:05]

nit: single line

+                                      node.id)
+      if interface_name != cpp_type_name:
+        if interface_name == 'DOMWindow' or interface_name == 'Navigator':
+          cpp_arguments.insert(0, 'receiver')

[Anton Muhin, 2013/05/17 09:55:05]

just curious: does the position (1st/last) indeed depends on interface name?

+        else:
+          cpp_arguments.append('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:
@@ skipping 27 matching lines @@
     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)
+
     self._cpp_resolver_emitter.Emit(
         '    if (argumentCount == $ARGC && name == "$NATIVE_BINDING")\n'
         '        return Dart$(INTERFACE_NAME)Internal::$CPP_CALLBACK_NAME;\n',
         ARGC=argument_count,
         NATIVE_BINDING=native_binding,
         INTERFACE_NAME=self._interface.id,
         CPP_CALLBACK_NAME=cpp_callback_name)
 
     if is_custom:
       self._cpp_declarations_emitter.Emit(
@@ skipping 13 matching lines @@
     self._cpp_impl_includes.add('"%s.h"' % namespace)
 
     attribute_name = attr.ext_attrs['Reflect'] or attr.id.lower()
     return 'WebCore::%s::%sAttr' % (namespace, attribute_name)
 
   def _GenerateWebCoreFunctionExpression(self, function_name, idl_node):
     if 'ImplementedBy' in idl_node.ext_attrs:
       return '%s::%s' % (idl_node.ext_attrs['ImplementedBy'], function_name)
     if idl_node.is_static:
       return '%s::%s' % (self._interface_type_info.idl_type(), function_name)
-    return '%s%s' % (self._interface_type_info.receiver(), function_name)
+    interface_name = self._interface_type_info.idl_type()
+    cpp_type_name = _GetCPPTypeName(interface_name, function_name)

[Anton Muhin, 2013/05/17 09:55:05]

overall it looks like _GetCPPTypeName should return None if there is no override
as in most (all?) the cases you do a dispatch anyway.

+    if cpp_type_name == interface_name:
+      return '%s%s' % (self._interface_type_info.receiver(), function_name)
+    else:
+      return '%s::%s' % (cpp_type_name, function_name)
 
   def _IsArgumentOptionalInWebCore(self, operation, argument):
     if not IsOptional(argument):
       return False
     if 'Callback' in argument.ext_attrs:
       return False
     if operation.id in ['addEventListener', 'removeEventListener'] and argument.id == 'useCapture':
       return False
     if 'ForceOptional' in argument.ext_attrs:
       return False
@@ skipping 62 matching lines @@
             '    if (Dart_NativeFunction func = $CLASS_NAME::resolver(name, argumentCount))\n'
             '        return func;\n',
             CLASS_NAME=os.path.splitext(os.path.basename(path))[0])
 
 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')