Add explicit resolver string map to dart:html generator

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, IDLAttribute
 from systemhtml import js_support_checks, GetCallbackInfo, HTML_LIBRARY_NAMES
 
+# This is an ugly hack to get things working on the M35 roll.  Once we
+# generate dart:blink from the new scripts, this shouldn't be needed.
+_cpp_resolver_string_map = {
+  'XMLHttpRequest_constructorCallback_RESOLVER_STRING_0_':
+      'XMLHttpRequest_constructorCallback_RESOLVER_STRING_1_XMLHttpRequestOptions',
+}
+
 # TODO(vsm): This logic needs to pulled from the source IDL.  These tables are
 # an ugly workaround.
 _cpp_callback_map = {
   ('DataTransferItem', 'webkitGetAsEntry'): 'DataTransferItemFileSystem',
   ('Document', 'fonts'): 'DocumentFontFaceSet',
   ('Document', 'webkitIsFullScreen'): 'DocumentFullscreen',
   ('Document', 'webkitFullScreenKeyboardInputAllowed'): 'DocumentFullscreen',
   ('Document', 'webkitCurrentFullScreenElement'): 'DocumentFullscreen',
   ('Document', 'webkitCancelFullScreen'): 'DocumentFullscreen',
   ('Document', 'webkitFullscreenEnabled'): 'DocumentFullscreen',
@@ skipping 554 matching lines @@
         type_ids = [p.type.id for p in arguments[:argument_count]]
         constructor_callback_id = \
             DeriveResolverString(self._interface.id, cpp_suffix, None, type_ids)
     else:
         constructor_callback_id = self._interface.id + '_' + constructor_callback_cpp_name
 
     if self._dart_use_blink:
         # First we emit the toplevel function
         dart_native_name = \
             DeriveNativeName(self._interface.id, constructor_callback_cpp_name, "")
+        if constructor_callback_id in _cpp_resolver_string_map:
+            constructor_callback_id = \
+                _cpp_resolver_string_map[constructor_callback_id]
         self._native_library_emitter.Emit(
             '\n'
             '$FACTORY_METHOD_NAME($PARAMETERS) native "$ID";\n',
             FACTORY_METHOD_NAME=dart_native_name,
             PARAMETERS=parameters,
             ID=constructor_callback_id)
 
         # Then we emit the impedance matching wrapper to call out to the
         # toplevel wrapper
         if not emit_to_native:
@@ skipping 401 matching lines @@
       self._EmitExplicitIndexedGetter(dart_element_type)
     else:
       if self._dart_use_blink:
           dart_native_name = \
               DeriveNativeName(self._interface.id, "NativeIndexed", "Getter")
           # First emit a toplevel function to do the native call
           # Calls to this are emitted elsewhere,
           resolver_string = \
               DeriveResolverString(self._interface.id, "item", "Callback",
                                    ["unsigned long"])
+          if resolver_string in _cpp_resolver_string_map:
+              resolver_string = \
+                  _cpp_resolver_string_map[resolver_string]
           self._native_library_emitter.Emit(
               '\n'
               '$(DART_NATIVE_NAME)(mthis, index) '
               'native "$(RESOLVER_STRING)";\n',
               DART_NATIVE_NAME = dart_native_name,
               RESOLVER_STRING=resolver_string)
 
           # Emit the method which calls the toplevel function, along with
           # the [] operator.
           self._members_emitter.Emit(
@@ skipping 621 matching lines @@
         native_binding = \
             '%s_%s_%s' % (self._interface.id, idl_name, native_suffix)
 
     if self._dart_use_blink:
         if not static:
             formals = ", ".join(['mthis'] + parameters)
             actuals = ", ".join(['this'] + parameters)
         else:
             formals = ", ".join(parameters)
             actuals = ", ".join(parameters)
-
+        if native_binding in _cpp_resolver_string_map:
+            native_binding = \
+                _cpp_resolver_string_map[native_binding]
         self._native_library_emitter.Emit(
             '\n'
             '$DART_NAME($FORMALS) native "$NATIVE_BINDING";\n',
             DART_NAME=dart_native_name,
             FORMALS=formals,
             NATIVE_BINDING=native_binding)
 
         if not emit_to_native:
             caller_emitter = self._members_emitter
             full_dart_name = DeriveQualifiedName(self._native_library_name,
@@ skipping 273 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')