Revert "Revert "Refresh dart:dom""

client/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 os
@@ skipping 412 matching lines @@
   def merge_imported_interfaces(self, optional_argument_whitelist):
     """Merges all imported interfaces and loads them into the DB."""
 
     # Step 1: Pre process imported interfaces
     for interface, module_name, import_options in self._imported_interfaces:
       self._split_declarations(interface, optional_argument_whitelist)
       self._annotate(interface, module_name, import_options)
 
     # Step 2: Add all new interfaces and merge overlapping ones
     for interface, module_name, import_options in self._imported_interfaces:
-      if not self._database.HasInterface(interface.id):
-        if import_options.add_new_interfaces:
-          self._database.AddInterface(interface)
-      elif not interface.is_supplemental:
-        old_interface = self._database.GetInterface(interface.id)
-        self._merge_interfaces(old_interface, interface,
-          import_options)
+      if not interface.is_supplemental:
+        if self._database.HasInterface(interface.id):
+          old_interface = self._database.GetInterface(interface.id)
+          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, module_name, import_options in self._imported_interfaces:
-      if (interface.is_supplemental
-          and self._database.HasInterface(interface.id)):
-        old_interface = self._database.GetInterface(interface.id)
-        self._merge_interfaces(old_interface, interface,
-          import_options)
+      if interface.is_supplemental:
+        # For now, ignore WebKit [Supplemental=BaseInterface] attributes.
+        target = interface.ext_attrs['Supplemental']
+        if target:
+          continue
+        target = interface.id
+        if self._database.HasInterface(target):
+          old_interface = self._database.GetInterface(target)
+          self._merge_interfaces(old_interface, interface, import_options)
 
     # Step 4: Resolve 'implements' statements
     for impl_stmt, import_options in self._impl_stmts:
       self._merge_impl_stmt(impl_stmt, import_options)
 
     self._impl_stmts = []
     self._imported_interfaces = []
 
   def import_idl_file(self, file_path,
             import_options=DatabaseBuilderOptions()):
@@ skipping 93 matching lines @@
             for name, value in annotation.items():
               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)
         map(normalize, interface.snippets)