Do not merge IDL interfaces in dartdomgenerator.

lib/dom/scripts/systemfrog.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
 frog binding from the IDL database."""
 
 import os
 from generator import *
@@ skipping 205 matching lines @@
     (super_setter, super_setter_interface) = self._FindShadowedAttribute(setter)
     if super_getter or super_setter:
       if getter and not setter and super_getter and not super_setter:
         if DartType(getter.type.id) == DartType(super_getter.type.id):
           # Compatible getter, use the superclass property.  This works because
           # JavaScript will do its own dynamic dispatch.
           self._members_emitter.Emit(
               '\n'
               '  // Use implementation from $SUPER.\n'
               '  // final $TYPE $NAME;\n',
-              SUPER=super_getter_interface.id,
+              SUPER=super_getter_interface,
               NAME=DartDomNameOfAttribute(getter),
               TYPE=output_type)
           return
 
       self._members_emitter.Emit('\n  // Shadowing definition.')
       self._AddAttributeUsingProperties(getter, setter)
       return
 
     # Can't generate field if attribute has different name in JS and Dart.
     if self._AttributeChangesName(getter or setter):
@@ skipping 33 matching lines @@
 
   def _AddSetter(self, attr):
     # TODO(sra): Remove native body when Issue 829 fixed.
     self._members_emitter.Emit(
         '  void set $NAME($(OPT_TYPE)value)'
             ' native "this.$NATIVE_NAME = value;";\n',
         NAME=DartDomNameOfAttribute(attr),
         NATIVE_NAME=attr.id,
         OPT_TYPE=TypeOrNothing(self._NarrowInputType(attr.type.id)))
 
-  def _FindShadowedAttribute(self, attr):
+  def _FindShadowedAttribute(self, attr, merged_interfaces={}):
     """Returns (attribute, superinterface) or (None, None)."""
     def FindInParent(interface):
       """Returns matching attribute in parent, or None."""
       if interface.parents:
         parent = interface.parents[0]
         if IsDartCollectionType(parent.type.id):
           return (None, None)
         if IsPureInterface(parent.type.id):
           return (None, None)
         if self._system._database.HasInterface(parent.type.id):
-          parent_interface = self._system._database.GetInterface(parent.type.id)
-          attr2 = FindMatchingAttribute(parent_interface, attr)
-          if attr2:
-            return (attr2, parent_interface)
-          return FindInParent(parent_interface)
+          interfaces_to_search_in = []
+          if parent.type.id in merged_interfaces:
+            # IDL parent was merged into another interface, which became a
+            # parent interface in Dart.
+            interfaces_to_search_in.append(parent.type.id)
+            parent_interface_name = merged_interfaces[parent.type.id]
+          else:
+            parent_interface_name = parent.type.id
+
+          for interface_name in merged_interfaces:
+            if merged_interfaces[interface_name] == parent_interface_name:
+              # IDL parent has another interface that was merged into it.
+              interfaces_to_search_in.append(interface_name)
+
+          interfaces_to_search_in.append(parent_interface_name)
+          for interface_name in interfaces_to_search_in:
+            interface = self._system._database.GetInterface(interface_name)
+            attr2 = FindMatchingAttribute(interface, attr)
+            if attr2:
+              return (attr2, parent_interface_name)
+
+          return FindInParent(
+              self._system._database.GetInterface(parent_interface_name))
       return (None, None)
 
     return FindInParent(self._interface) if attr else (None, None)
 
 
   def AddSecondaryAttribute(self, interface, getter, setter):
     self._SecondaryContext(interface)
     self.AddAttribute(getter, setter)
 
   def AddSecondaryOperation(self, interface, info):
@@ skipping 66 matching lines @@
     if native_body:
       native_string = " '''" + native_body + "'''"
 
     self._members_emitter.Emit(
         '\n'
         '  $TYPE $NAME($PARAMS) native$NATIVESTRING;\n',
         TYPE=self._NarrowOutputType(info.type_name),
         NAME=info.name,
         PARAMS=params,
         NATIVESTRING=native_string)