Fixes for Blink roll.

tools/dom/scripts/databasebuilder.py

 #!/usr/bin/python
 # Copyright (c) 2011, 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 copy
 import database
 import idlparser
 import logging
 import multiprocessing
@@ skipping 207 matching lines @@
   def _merge_ext_attrs(self, old_attrs, new_attrs):
     """Merges two sets of extended attributes.
 
     Returns: True if old_attrs has changed.
     """
     changed = False
     for (name, value) in new_attrs.items():
       if name in old_attrs and old_attrs[name] == value:
         pass # Identical
       else:
+        if name == 'ImplementedAs' and name in old_attrs:
+          continue
         old_attrs[name] = value
         changed = True
     return changed
 
   def _merge_nodes(self, old_list, new_list, import_options):
     """Merges two lists of nodes. Annotates nodes with the source of each
     node.
 
     Returns:
       True if the old_list has changed.
@@ skipping 152 matching lines @@
           self._merge_interfaces(old_interface, interface, import_options)
         else:
           if import_options.add_new_interfaces:
             self._database.AddInterface(interface)
 
     # Step 3: Merge in supplemental interfaces
     for interface, import_options in self._imported_interfaces:
       if interface.is_supplemental:
         target_name = interface.ext_attrs['Supplemental']
         if target_name:
-          # [Supplemental=DOMWindow] - merge into DOMWindow.
+          # [Supplemental=Window] - merge into Window.
           target = target_name
         else:
           # [Supplemental] - merge into existing inteface with same name.
           target = interface.id
         if self._database.HasInterface(target):
           old_interface = self._database.GetInterface(target)
           self._merge_interfaces(old_interface, interface, import_options)
         else:
           _logger.warning("Supplemental target '%s' not found", target)
 
@@ skipping 33 matching lines @@
 
     def enabled(idl_node):
       return self._is_node_enabled(idl_node, import_options.idl_defines)
 
     for interface in idl_file.interfaces:
       if not self._is_node_enabled(interface, import_options.idl_defines):
         _logger.info('skipping interface %s (source=%s)'
           % (interface.id, import_options.source))
         continue
 
-      _logger.info('importing interface %s (source=%s)'
-        % (interface.id, import_options.source))
+      _logger.info('importing interface %s (source=%s file=%s)'
+        % (interface.id, import_options.source, idl_file))
       interface.attributes = filter(enabled, interface.attributes)
       interface.operations = filter(enabled, interface.operations)
       self._imported_interfaces.append((interface, import_options))
 
     for implStmt in idl_file.implementsStatements:
       self._impl_stmts.append((implStmt, import_options))
 
     for enum in idl_file.enums:
       self._database.AddEnum(enum)
 
@@ skipping 85 matching lines @@
               if (name in top_level_annotation
                   and value == top_level_annotation[name]):
                 del annotation[name]
 
         map(normalize, interface.parents)
         map(normalize, interface.constants)
         map(normalize, interface.attributes)
         map(normalize, interface.operations)
 
   def fetch_constructor_data(self, options):
-    window_interface = self._database.GetInterface('DOMWindow')
+    window_interface = self._database.GetInterface('Window')
     for attr in window_interface.attributes:
       type = attr.type.id
       if not type.endswith('Constructor'):
         continue
       type = re.sub('(Constructor)+$', '', type)
       # TODO(antonm): Ideally we'd like to have pristine copy of WebKit IDLs and fetch
       # this information directly from it.  Unfortunately right now database is massaged
-      # a lot so it's difficult to maintain necessary information on DOMWindow itself.
+      # a lot so it's difficult to maintain necessary information on Window itself.
       interface = self._database.GetInterface(type)
       if 'V8EnabledPerContext' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledPerContext'] = \
             attr.ext_attrs['V8EnabledPerContext']
       if 'V8EnabledAtRuntime' in attr.ext_attrs:
         interface.ext_attrs['synthesizedV8EnabledAtRuntime'] = \
             attr.ext_attrs['V8EnabledAtRuntime'] or attr.id