Revert "Dart generation changes for splitting apart resolvers."

sdk/lib/html/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 62 matching lines @@
           '    DartIsolateScope scope(m_callback.isolate());\n'
           '    DartApiScope apiScope;\n'
           '    $ARGUMENTS_DECLARATION;\n'
           '    return m_callback.handleEvent($ARGUMENT_COUNT, arguments);\n'
           '}\n',
           CLASS_NAME=class_name,
           PARAMETERS=', '.join(parameters),
           ARGUMENTS_DECLARATION=arguments_declaration,
           ARGUMENT_COUNT=len(arguments))
 
-    cpp_header_emitter = self._cpp_library_emitter.CreateHeaderEmitter(
-        self._interface.id,
-        self._renamer.GetLibraryName(self._interface),
-        True)
+    cpp_header_emitter = self._cpp_library_emitter.CreateHeaderEmitter(self._interface.id, True)
     cpp_header_emitter.Emit(
         self._template_loader.Load('cpp_callback_header.template'),
         INTERFACE=self._interface.id,
         HANDLERS=cpp_header_handlers_emitter.Fragments())
 
     cpp_impl_emitter = self._cpp_library_emitter.CreateSourceEmitter(self._interface.id)
     cpp_impl_emitter.Emit(
         self._template_loader.Load('cpp_callback_implementation.template'),
         INCLUDES=self._GenerateCPPIncludes(cpp_impl_includes),
         INTERFACE=self._interface.id,
@@ skipping 11 matching lines @@
 
   def RootClassName(self):
     return 'NativeFieldWrapperClass1'
 
   def NativeSpec(self):
     return ''
 
   def StartInterface(self, memebers_emitter):
     # Create emitters for c++ implementation.
     if not IsPureInterface(self._interface.id):
-      self._cpp_header_emitter = self._cpp_library_emitter.CreateHeaderEmitter(
-          self._interface.id,
-          self._renamer.GetLibraryName(self._interface))
+      self._cpp_header_emitter = self._cpp_library_emitter.CreateHeaderEmitter(self._interface.id)
       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 = memebers_emitter
     self._cpp_declarations_emitter = emitter.Emitter()
     self._cpp_impl_includes = set()
     self._cpp_definitions_emitter = emitter.Emitter()
@@ skipping 729 matching lines @@
     return self._type_registry.TypeInfo(type_name)
 
   def _DartType(self, type_name):
     return self._type_registry.DartType(type_name)
 
 
 class CPPLibraryEmitter():
   def __init__(self, emitters, cpp_sources_dir):
     self._emitters = emitters
     self._cpp_sources_dir = cpp_sources_dir
-    self._library_headers = {}
+    self._headers_list = []
     self._sources_list = []
 
-  def CreateHeaderEmitter(self, interface_name, library_name, is_callback=False):
+  def CreateHeaderEmitter(self, interface_name, is_callback=False):
     path = os.path.join(self._cpp_sources_dir, 'Dart%s.h' % interface_name)
     if not is_callback:
-      self._library_headers.get(library_name, []).append(path)
+      self._headers_list.append(path)
     return self._emitters.FileEmitter(path)
 
   def CreateSourceEmitter(self, interface_name):
     path = os.path.join(self._cpp_sources_dir, 'Dart%s.cpp' % interface_name)
     self._sources_list.append(path)
     return self._emitters.FileEmitter(path)
 
   def EmitDerivedSources(self, template, output_dir):
     partitions = 20 # FIXME: this should be configurable.
     sources_count = len(self._sources_list)
     for i in range(0, partitions):
       file_path = os.path.join(output_dir, 'DartDerivedSources%02i.cpp' % (i + 1))
       includes_emitter = self._emitters.FileEmitter(file_path).Emit(template)
       for source_file in self._sources_list[i::partitions]:
         path = os.path.relpath(source_file, output_dir)
         includes_emitter.Emit('#include "$PATH"\n', PATH=path)
 
   def EmitResolver(self, template, output_dir):
-    for library_name in self._library_headers.keys():
-      file_path = os.path.join(output_dir, '%s_DartResolver.cpp' % library_name)
-      includes_emitter, body_emitter = self._emitters.FileEmitter(file_path).Emit(
-        template,
-        LIBRARY_NAME=library_name)
-
-      headers = self._library_headers[library_name]
-      for header_file in headers:
-        path = os.path.relpath(header_file, output_dir)
-        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])
+    file_path = os.path.join(output_dir, 'DartResolver.cpp')
+    includes_emitter, body_emitter = self._emitters.FileEmitter(file_path).Emit(template)
+    for header_file in self._headers_list:
+      path = os.path.relpath(header_file, output_dir)
+      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])