Update DOM scripts after recent webkit merge.

client/dom/scripts/dartgenerator.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 generates Dart APIs from the IDL database."""
 
 import emitter
 import idlnode
 import logging
@@ skipping 1751 matching lines @@
         '  bool isEmpty() {\n'
         '    return length == 0;\n'
         '  }\n'
         '\n'
         '  Iterator<$TYPE> iterator() {\n'
         '    return new _FixedSizeListIterator<$TYPE>(this);\n'
         '  }\n',
         TYPE=element_type)
 
   def _HasNativeIndexGetter(self, interface):
-    return ('HasIndexGetter' in interface.ext_attrs or
-            'HasNumericIndexGetter' in interface.ext_attrs)
+    return ('IndexedGetter' in interface.ext_attrs or
+            'NumericIndexedGetter' in interface.ext_attrs)
 
   def _EmitNativeIndexGetter(self, interface, element_type):
     method_name = '_index'
     self._members_emitter.Emit(
         '\n'
         '  $TYPE operator[](int index) { return $METHOD(this, index); }\n'
         '  static $TYPE $METHOD(var _this, int index) native;\n',
         TYPE=element_type, METHOD=method_name)
 
   def _HasNativeIndexSetter(self, interface):
-    return 'HasCustomIndexSetter' in interface.ext_attrs
+    return 'CustomIndexedSetter' in interface.ext_attrs
 
   def _EmitNativeIndexSetter(self, interface, element_type):
     method_name = '_set_index'
     self._members_emitter.Emit(
         '\n'
         '  void operator[]=(int index, $TYPE value) {\n'
         '    return $METHOD(this, index, value);\n'
         '  }\n'
         '  static $METHOD(_this, index, value) native;\n',
         TYPE=element_type, METHOD=method_name)
@@ skipping 391 matching lines @@
     #
     # and
     #
     #   class YImpl extends ListBase<T> { copies of transitive XImpl methods; }
     #
     self._members_emitter.Emit(
         '\n'
         '  $TYPE operator[](int index) native "return this[index];";\n',
         TYPE=self._NarrowOutputType(element_type))
 
-    if 'HasCustomIndexSetter' in self._interface.ext_attrs:
+    if 'CustomIndexedSetter' in self._interface.ext_attrs:
       self._members_emitter.Emit(
           '\n'
           '  void operator[]=(int index, $TYPE value) native "this[index] = value";\n',
           TYPE=self._NarrowInputType(element_type))
     else:
       self._members_emitter.Emit(
           '\n'
           '  void operator[]=(int index, $TYPE value) {\n'
           '    throw new UnsupportedOperationException("Cannot assign element of immutable List.");\n'
           '  }\n',
@@ skipping 531 matching lines @@
         RESOLVER=self._cpp_resolver_emitter.Fragments())
 
   def _GenerateCppHeader(self):
     webcore_include = self._interface_type_info.webcore_include()
     if webcore_include:
       webcore_include = '#include "%s.h"\n' % webcore_include
     else:
       webcore_include = ''
 
     if ('CustomToJS' in self._interface.ext_attrs or
+        'CustomToJSObject' in self._interface.ext_attrs or
         'PureInterface' in self._interface.ext_attrs or
+        'CPPPureInterface' in self._interface.ext_attrs or
         self._interface_type_info.custom_to_dart()):
       to_dart_value_template = (
           'Dart_Handle toDartValue($(WEBCORE_CLASS_NAME)* value);\n')
     else:
       to_dart_value_template = (
           'inline Dart_Handle toDartValue($(WEBCORE_CLASS_NAME)* value)\n'
           '{\n'
           '    return DartDOMWrapper::toDart<Dart$(INTERFACE)>(value);\n'
           '}\n')
     to_dart_value_emitter = emitter.Emitter()
@@ skipping 98 matching lines @@
     arguments.append(attr.id)
     parameter_definitions_emitter = emitter.Emitter()
     self._GenerateParameterAdapter(parameter_definitions_emitter, attr, 0)
     parameter_definitions = parameter_definitions_emitter.Fragments()
     self._GenerateNativeCallback(cpp_callback_name, attr, parameter_definitions,
         webcore_function_name, arguments, idl_return_type=None,
         raises_dart_exceptions=True,
         raises_dom_exceptions=attr.set_raises)
 
   def _HasNativeIndexGetter(self, interface):
-    return ('HasCustomIndexGetter' in interface.ext_attrs or
-            'HasNumericIndexGetter' in interface.ext_attrs)
+    return ('CustomIndexedGetter' in interface.ext_attrs or
+            'NumericIndexedGetter' in interface.ext_attrs)
 
   def _EmitNativeIndexGetter(self, interface, element_type):
     dart_declaration = '%s operator[](int index)' % element_type
     self._GenerateNativeBinding('numericIndexGetter', 2, dart_declaration,
         'Callback', True)
 
   def _EmitNativeIndexSetter(self, interface, element_type):
     dart_declaration = 'void operator[]=(int index, %s value)' % element_type
     self._GenerateNativeBinding('numericIndexSetter', 3, dart_declaration,
         'Callback', True)
@@ skipping 78 matching lines @@
                                        argument_list)
     is_custom = 'Custom' in operation.ext_attrs
     cpp_callback_name = self._GenerateNativeBinding(
         native_name, 1 + len(operation.arguments), dart_declaration, 'Callback',
         is_custom)
     if is_custom:
       return
 
     # Generate callback.
     webcore_function_name = operation.id
-    if 'ImplementationFunction' in operation.ext_attrs:
-      webcore_function_name = operation.ext_attrs['ImplementationFunction']
+    if 'ImplementedAs' in operation.ext_attrs:
+      webcore_function_name = operation.ext_attrs['ImplementedAs']
 
     parameter_definitions_emitter = emitter.Emitter()
     raises_dart_exceptions = len(operation.arguments) > 0 or operation.raises
     arguments = []
 
     # Process 'CallWith' argument.
-    if ('CallWith' in operation.ext_attrs and
-        operation.ext_attrs['CallWith'] == 'ScriptExecutionContext'):
-      parameter_definitions_emitter.Emit(
-          '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
-          '        if (!context)\n'
-          '            return;\n')
-      arguments.append('context')
+    if 'CallWith' in operation.ext_attrs:
+      call_with = operation.ext_attrs['CallWith']
+      if call_with == 'ScriptExecutionContext':
+        parameter_definitions_emitter.Emit(
+            '        ScriptExecutionContext* context = DartUtilities::scriptExecutionContext();\n'
+            '        if (!context)\n'
+            '            return;\n')
+        arguments.append('context')
+      elif call_with == 'ScriptArguments|CallStack':
+        raises_dart_exceptions = True
+        self._cpp_impl_includes['ScriptArguments'] = 1
+        self._cpp_impl_includes['ScriptCallStack'] = 1
+        self._cpp_impl_includes['V8Proxy'] = 1
+        self._cpp_impl_includes['v8'] = 1
+        parameter_definitions_emitter.Emit(
+            '        v8::HandleScope handleScope;\n'
+            '        v8::Context::Scope scope(V8Proxy::mainWorldContext(DartUtilities::domWindowForCurrentIsolate()->frame()));\n'
+            '        Dart_Handle customArgument = Dart_GetNativeArgument(args, $INDEX);\n'
+            '        RefPtr<ScriptArguments> scriptArguments(DartUtilities::createScriptArguments(customArgument, exception));\n'
+            '        if (!scriptArguments)\n'
+            '            goto fail;\n'
+            '        RefPtr<ScriptCallStack> scriptCallStack(DartUtilities::createScriptCallStack());\n'
+            '        if (!scriptCallStack->size())\n'
+            '            return;\n',
+            INDEX=len(operation.arguments))
+        arguments.extend(['scriptArguments', 'scriptCallStack'])
 
     # Process Dart arguments.
     for (i, argument) in enumerate(operation.arguments):
-      if i == len(operation.arguments) - 1 and 'CustomArgumentHandling' in operation.ext_attrs:
+      if i == len(operation.arguments) - 1 and self._interface.id == 'Console' and argument.id == 'arg':
         # FIXME: we are skipping last argument here because it was added in
         # supplemental dart.idl. Cleanup dart.idl and remove this check.
         break
       self._GenerateParameterAdapter(parameter_definitions_emitter, argument, i)
       arguments.append(argument.id)
 
     if operation.id in ['addEventListener', 'removeEventListener']:
       # addEventListener's and removeEventListener's last argument is marked
       # as optional in idl, but is not optional in webcore implementation.
       if len(operation.arguments) == 2:
         arguments.append('false')
 
     if self._interface.id == 'CSSStyleDeclaration' and operation.id == 'setProperty':
       # CSSStyleDeclaration.setProperty priority parameter is optional in Dart
       # idl, but is not optional in webcore implementation.
       if len(operation.arguments) == 2:
         arguments.append('String()')
 
-    # Process auxiliary arguments.
-    if 'CustomArgumentHandling' in operation.ext_attrs:
-      raises_dart_exceptions = True
-      self._cpp_impl_includes['ScriptArguments'] = 1
-      self._cpp_impl_includes['ScriptCallStack'] = 1
-      self._cpp_impl_includes['V8Proxy'] = 1
-      self._cpp_impl_includes['v8'] = 1
-      parameter_definitions_emitter.Emit(
-          '        v8::HandleScope handleScope;\n'
-          '        v8::Context::Scope scope(V8Proxy::mainWorldContext(DartUtilities::domWindowForCurrentIsolate()->frame()));\n'
-          '        Dart_Handle customArgument = Dart_GetNativeArgument(args, $INDEX);\n'
-          '        RefPtr<ScriptArguments> scriptArguments(DartUtilities::createScriptArguments(customArgument, exception));\n'
-          '        if (!scriptArguments)\n'
-          '            goto fail;\n'
-          '        RefPtr<ScriptCallStack> scriptCallStack(DartUtilities::createScriptCallStack());\n'
-          '        if (!scriptCallStack->size())\n'
-          '            return;\n',
-          INDEX=len(operation.arguments))
-      arguments.extend(['scriptArguments', 'scriptCallStack'])
-
     if 'NeedsUserGestureCheck' in operation.ext_attrs:
       arguments.extend('DartUtilities::processingUserGesture')
 
     parameter_definitions = parameter_definitions_emitter.Fragments()
     self._GenerateNativeCallback(cpp_callback_name, operation,
         parameter_definitions, webcore_function_name, arguments,
         idl_return_type=operation.type,
         raises_dart_exceptions=raises_dart_exceptions,
         raises_dom_exceptions=operation.raises)
 
@@ skipping 22 matching lines @@
         elif return_type_info.idl_type() in svg_primitive_types:
           conversion_cast = '%s::create($BODY)'
         else:
           conversion_cast = 'static_cast<%s*>($BODY)'
         conversion_cast = conversion_cast % return_type_info.native_type()
       nested_templates.append(conversion_cast)
 
       if return_type_info.conversion_include():
         self._cpp_impl_includes[return_type_info.conversion_include()] = 1
       if (return_type_info.idl_type() in ['DOMString', 'AtomicString'] and
-          'ConvertNullStringTo' in idl_node.ext_attrs):
+          'TreatReturnedNullStringAs' in idl_node.ext_attrs):
         nested_templates.append('$BODY, ConvertDefaultToNull')
       nested_templates.append(
           '        Dart_Handle returnValue = toDartValue($BODY);\n'
           '        if (returnValue)\n'
           '            Dart_SetReturnValue(args, returnValue);\n')
     else:
       nested_templates.append('        $BODY;\n')
 
     if raises_dom_exceptions:
       nested_templates.append(
@@ skipping 88 matching lines @@
     namespace = 'HTMLNames'
     svg_exceptions = ['class', 'id', 'onabort', 'onclick', 'onerror', 'onload',
                       'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover',
                       'onmouseup', 'onresize', 'onscroll', 'onunload']
     if self._interface.id.startswith('SVG') and not attr.id in svg_exceptions:
       namespace = 'SVGNames'
     self._cpp_impl_includes[namespace] = 1
 
     attribute_name = attr.ext_attrs['Reflect'] or attr.id.lower()
     return 'WebCore::%s::%sAttr' % (namespace, attribute_name)