Fixes for Blink roll to r151189

tools/dom/scripts/generator.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 systems to generate
 Dart APIs from the IDL database."""
 
 import copy
 import json
@@ skipping 608 matching lines @@
         'Int32Array',
         'Uint8Array',
         'Uint8ClampedArray',
         'Uint16Array',
         'Uint32Array',
     ]
 
     if self._idl_type in WTF_INCLUDES:
       return ['<wtf/%s.h>' % self.native_type()]
 
+    # TODO(vsm): Why does this need special casing?
+    if self._idl_type == 'AnalyserNode':
+      return ['"AnalyserNode.h"', '<wtf/Uint8Array.h>']
+
     if not self._idl_type.startswith('SVG'):
       return ['"%s.h"' % self.native_type()]
 
     if self._idl_type in ['SVGNumber', 'SVGPoint']:
       return ['"SVGPropertyTearOff.h"']
     if self._idl_type.startswith('SVGPathSeg'):
       include = self._idl_type.replace('Abs', '').replace('Rel', '')
     else:
       include = self._idl_type
     return ['"%s.h"' % include] + _svg_supplemental_includes
@@ skipping 42 matching lines @@
   def implementation_name(self):
     implementation_name = self._dart_interface_name
     if self.merged_into():
       implementation_name = '_%s_Merged' % implementation_name
 
     if not self.has_generated_interface():
       implementation_name = '_%s' % implementation_name
 
     return implementation_name
 
+  def native_type(self):
+    database = self._type_registry._database
+    if database.HasInterface(self.idl_type()):
+      interface = database.GetInterface(self.idl_type())
+      if 'ImplementedAs' in interface.ext_attrs:
+        return interface.ext_attrs['ImplementedAs']
+    return super(InterfaceIDLTypeInfo, self).native_type()
+
   def has_generated_interface(self):
     return not self._data.suppress_interface
 
   def list_item_type(self):
     return self._data.item_type
 
   def merged_interface(self):
     # All constants, attributes, and operations of merged interface should be
     # added to this interface. Merged idl interface does not have corresponding
     # Dart generated interface, and all references to merged idl interface
@@ skipping 271 matching lines @@
         native_type='MutationRecordArray', dart_type='List<MutationRecord>'),
     'StyleSheet': TypeData(clazz='Interface', conversion_includes=['CSSStyleSheet']),
     'SVGElement': TypeData(clazz='Interface', custom_to_dart=True),
 
     'ClientRectList': TypeData(clazz='Interface',
         item_type='ClientRect', dart_type='List<Rect>', suppress_interface=True),
     'CSSRuleList': TypeData(clazz='Interface',
         item_type='CSSRule', suppress_interface=True),
     'CSSValueList': TypeData(clazz='Interface',
         item_type='CSSValue', suppress_interface=True),
-    'DOMMimeTypeArray': TypeData(clazz='Interface', item_type='DOMMimeType'),
-    'DOMPluginArray': TypeData(clazz='Interface', item_type='DOMPlugin'),
+    'MimeTypeArray': TypeData(clazz='Interface', item_type='MimeType'),
+    'PluginArray': TypeData(clazz='Interface', item_type='Plugin'),
     'DOMStringList': TypeData(clazz='Interface', item_type='DOMString',
         dart_type='List<String>', custom_to_native=True),
     'EntryArray': TypeData(clazz='Interface', item_type='Entry',
         suppress_interface=True),
     'EntryArraySync': TypeData(clazz='Interface', item_type='EntrySync',
         suppress_interface=True),
     'FileList': TypeData(clazz='Interface', item_type='File',
         dart_type='List<File>'),
     'Future': TypeData(clazz='Interface', dart_type='Future'),
     'GamepadList': TypeData(clazz='Interface', item_type='Gamepad',
         suppress_interface=True),
     'HTMLAllCollection': TypeData(clazz='Interface', item_type='Node'),
     'HTMLCollection': TypeData(clazz='Interface', item_type='Node'),
     'NamedNodeMap': TypeData(clazz='Interface', item_type='Node'),
     'NodeList': TypeData(clazz='Interface', item_type='Node',
                          suppress_interface=False, dart_type='List<Node>'),
     'SVGElementInstanceList': TypeData(clazz='Interface',
         item_type='SVGElementInstance', suppress_interface=True),
-    'SourceBufferList': TypeData(clazz='Interface', item_type='SourceBuffer'),
+    'WebKitSourceBufferList': TypeData(clazz='Interface', item_type='WebKitSourceBuffer'),
     'SpeechGrammarList': TypeData(clazz='Interface', item_type='SpeechGrammar'),
     'SpeechInputResultList': TypeData(clazz='Interface',
         item_type='SpeechInputResult', suppress_interface=True),
     'SpeechRecognitionResultList': TypeData(clazz='Interface',
         item_type='SpeechRecognitionResult', suppress_interface=True),
     'SQLResultSetRowList': TypeData(clazz='Interface', item_type='Dictionary'),
     'StyleSheetList': TypeData(clazz='Interface',
         item_type='StyleSheet', suppress_interface=True),
     'TextTrackCueList': TypeData(clazz='Interface', item_type='TextTrackCue'),
     'TextTrackList': TypeData(clazz='Interface', item_type='TextTrack'),
@@ skipping 102 matching lines @@
           type_name, type_data, dart_interface_name, self)
 
     if type_data.clazz == 'BasicTypedList':
       dart_interface_name = self._renamer.RenameInterface(
           self._database.GetInterface(type_name))
       return BasicTypedListIDLTypeInfo(
           type_name, type_data, dart_interface_name, self)
 
     class_name = '%sIDLTypeInfo' % type_data.clazz
     return globals()[class_name](type_name, type_data)