| OLD | NEW | 
|---|
| 1 # Copyright (C) 2013 Google Inc. All rights reserved. | 1 # Copyright (C) 2013 Google Inc. All rights reserved. | 
| 2 # | 2 # | 
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without | 
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are | 
| 5 # met: | 5 # met: | 
| 6 # | 6 # | 
| 7 #     * Redistributions of source code must retain the above copyright | 7 #     * Redistributions of source code must retain the above copyright | 
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. | 
| 9 #     * Redistributions in binary form must reproduce the above | 9 #     * Redistributions in binary form must reproduce the above | 
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer | 
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 202             # FIXME: remove check for LegacyImplementedInBaseClass when this | 202             # FIXME: remove check for LegacyImplementedInBaseClass when this | 
| 203             # attribute is removed | 203             # attribute is removed | 
| 204             if 'LegacyImplementedInBaseClass' not in dependency_interface.extend
     ed_attributes: | 204             if 'LegacyImplementedInBaseClass' not in dependency_interface.extend
     ed_attributes: | 
| 205                 element.extended_attributes['ImplementedBy'] = dependency_interf
     ace_name | 205                 element.extended_attributes['ImplementedBy'] = dependency_interf
     ace_name | 
| 206             element.extended_attributes.update(dependency_interface.extended_att
     ributes) | 206             element.extended_attributes.update(dependency_interface.extended_att
     ributes) | 
| 207             target_list.append(element) | 207             target_list.append(element) | 
| 208 | 208 | 
| 209     merge_lists(dependency_interface.attributes, target_interface.attributes) | 209     merge_lists(dependency_interface.attributes, target_interface.attributes) | 
| 210     merge_lists(dependency_interface.constants, target_interface.constants) | 210     merge_lists(dependency_interface.constants, target_interface.constants) | 
| 211     merge_lists(dependency_interface.operations, target_interface.operations) | 211     merge_lists(dependency_interface.operations, target_interface.operations) | 
| OLD | NEW | 
|---|