Chrome 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
 from generator import *
 from htmldartgenerator import *
+from idlnode import IDLArgument
 from systemhtml import js_support_checks, GetCallbackInfo, HTML_LIBRARY_NAMES
 
 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
@@ skipping 650 matching lines @@
           '        }\n'
           '        Document* document = domWindow->document();\n')
 
     if needs_receiver:
       body_emitter.Emit(
           '        $WEBCORE_CLASS_NAME* receiver = DartDOMWrapper::receiver< $WEBCORE_CLASS_NAME >(args);\n',
           WEBCORE_CLASS_NAME=self._interface_type_info.native_type())
 
     if requires_stack_info:
       self._cpp_impl_includes.add('"ScriptArguments.h"')
+      self._cpp_impl_includes.add('"ScriptCallStack.h"')
       body_emitter.Emit(
           '\n'
           '        ScriptState* currentState = ScriptState::current();\n'
           '        if (!currentState) {\n'
           '            exception = Dart_NewStringFromCString("Failed to retrieve a script state");\n'
           '            goto fail;\n'
           '        }\n'
           '        ScriptState& state = *currentState;\n'
           '\n'
           '        Dart_Handle customArgument = Dart_GetNativeArgument(args, $INDEX);\n'
@@ skipping 18 matching lines @@
           '            return;\n',
           INDEX=len(arguments) + 1)
 
     # Emit arguments.
     start_index = 1 if needs_receiver else 0
     for i, argument in enumerate(arguments):
       type_info = self._TypeInfo(argument.type.id)
       argument_expression_template, type, cls, function = \
           type_info.to_native_info(argument, self._interface.id)
 
-      if ((IsOptional(argument) and not self._IsArgumentOptionalInWebCore(node, argument)) or
-          (argument.ext_attrs.get('Optional') == 'DefaultIsNullString') or
-          _IsOptionalStringArgumentInInitEventMethod(self._interface, node, argument)):
+      if (isinstance(argument, IDLArgument) and (
+          (IsOptional(argument) and not self._IsArgumentOptionalInWebCore(node, argument)) or
+           (argument.ext_attrs.get('Default') == 'NullString') or
+           _IsOptionalStringArgumentInInitEventMethod(self._interface, node, argument))):
         function += 'WithNullCheck'
 
       argument_name = DartDomNameOfAttribute(argument)
       if type_info.pass_native_by_ref():
         invocation_template =\
             '        $TYPE $ARGUMENT_NAME;\n'\
             '        $CLS::$FUNCTION(Dart_GetNativeArgument(args, $INDEX), $ARGUMENT_NAME, exception);\n'
       else:
         invocation_template =\
             '        $TYPE $ARGUMENT_NAME = $CLS::$FUNCTION(Dart_GetNativeArgument(args, $INDEX), exception);\n'
@@ skipping 181 matching lines @@
         includes_emitter.Emit('#include "$PATH"\n', PATH=path)
         body_emitter.Emit(
             '    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('Optional') == 'DefaultIsUndefined' and
+      argument.ext_attrs.get('Default') == 'Undefined' and
       argument.type.id == 'DOMString')