Fixing go.sh occasionally putting types into incorrect libraries.

tools/dom/scripts/htmlrenamer.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.
 import logging
 import monitored
 import re
 
 html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', {
     'CDATASection': 'CDataSection',
@@ skipping 586 matching lines @@
     'Node.set:nodeValue',
     'NodeList.item',
     'ShadowRoot.getElementsByTagNameNS',
     'WheelEvent.wheelDelta',
     'WorkerContext.webkitIndexedDB',
 # TODO(jacobr): should these be removed?
     'Document.close',
     'Document.hasFocus',
     ])
 
+# Manual dart: library name lookup.
+_library_names = monitored.Dict('htmlrenamer._library_names', {
+  'DOMWindow': 'html',
+  'Navigator': 'html',
+  'WorkerContext': 'html',
+})
+
 class HtmlRenamer(object):
   def __init__(self, database):
     self._database = database
 
   def RenameInterface(self, interface):
     if interface.id in html_interface_renames:
       return html_interface_renames[interface.id]
     elif interface.id.startswith('HTML'):
       if any(interface.id in ['Element', 'Document']
              for interface in self._database.Hierarchy(interface)):
@@ skipping 44 matching lines @@
       if member_name in candidates:
         return member_name
       member_name = interface.id + '.' + member_prefix + member
       if member_name in candidates:
         return member_name
       member_name = interface.id + '.*'
       if member_name in candidates:
         return member_name
 
   def GetLibraryName(self, interface):
+    # Some types have attributes merged in from many other interfaces.
+    if interface.id in _library_names:
+      return _library_names[interface.id]
+
     if 'Conditional' in interface.ext_attrs:
       if 'WEB_AUDIO' in interface.ext_attrs['Conditional']:
         return 'web_audio'
       if 'SVG' in interface.ext_attrs['Conditional']:
         return 'svg'
       if 'INDEXED_DATABASE' in interface.ext_attrs['Conditional']:
         return 'indexed_db'
       if 'SQL_DATABASE' in interface.ext_attrs['Conditional']:
-        # WorkerContext has attributes merged in from many other interfaces.
-        if interface.id != 'WorkerContext':
-          return 'web_sql'
+        return 'web_sql'
 
     return 'html'
 
   def DartifyTypeName(self, type_name):
     """Converts a DOM name to a Dart-friendly class name. """
 
     if type_name in html_interface_renames:
       return html_interface_renames[type_name]
 
     # Strip off any standard prefixes.
@@ skipping 14 matching lines @@
 
     # We're looking for a sequence of letters which start with capital letter
     # then a series of caps and finishes with either the end of the string or
     # a capital letter.
     # The [0-9] check is for names such as 2D or 3D
     # The following test cases should match as:
     #   WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue
     #   XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change)
     #   IFrameElement: (I)()(F)rameElement (no change)
     return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name)