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 259 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)
+          if parent.type.id in merged_interfaces:
+            merged_interface = self._system._database.GetInterface(
+                merged_interfaces[parent.type.id])
+            attr2 = FindMatchingAttribute(merged_interface, attr)
+            if attr2:
+              return (attr2, parent_interface)
           return FindInParent(parent_interface)

[sra1, 2012/06/07 19:31:07]

If parent_interface was merged into some other interface, we should visit the
interface it was merged into, otherwise we visit HTMLElement twice.

It does not matter here, but only because we don't currently do much with the
superinterface.

Please either (a) fix the code so it does the 'correct' search or add a comment
here explaining why the incorrect search is OK.

[podivilov, 2012/06/08 17:02:21]

Fixed.

       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)