Roll 50: Updated for push to origin/master.

tools/dom/scripts/htmlrenamer.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.
 import logging
 import monitored
 import re
 
 typed_array_renames = {
     'ArrayBuffer': 'ByteBuffer',
@@ skipping 53 matching lines @@
     'WebGL2RenderingContextBase': 'RenderingContextBase2',
     'WindowTimers': '_WindowTimers',
     'XMLHttpRequest': 'HttpRequest',
     'XMLHttpRequestUpload': 'HttpRequestUpload',
     'XMLHttpRequestEventTarget': 'HttpRequestEventTarget',
 }, **typed_array_renames))
 
 # Interfaces that are suppressed, but need to still exist for Dartium and to
 # properly wrap DOM objects if/when encountered.
 _removed_html_interfaces = [
+  'Bluetooth',
+  'BluetoothAdvertisingData',
+  'BluetoothCharacteristicProperties',
+  'BluetoothDevice',
+  'BluetoothRemoteGATTCharacteristic',
+  'BluetoothRemoteGATTServer',
+  'BluetoothRemoteGATTService',
+  'BluetoothUUID',
   'Cache', # TODO: Symbol conflicts with Angular: dartbug.com/20937
   'CanvasPathMethods',
   'CDataSection',
   'CSSPrimitiveValue',
   'CSSUnknownRule',
   'CSSValue',
   'Counter',
   'DOMFileSystemSync', # Workers
   'DatabaseSync', # Workers
   'DataView', # Typed arrays
   'DirectoryEntrySync', # Workers
   'DirectoryReaderSync', # Workers
   'DocumentType',
   'EntrySync', # Workers
   'FileEntrySync', # Workers
   'FileReaderSync', # Workers
   'FileWriterSync', # Workers
   'HTMLAllCollection',
   'HTMLAppletElement',
   'HTMLBaseFontElement',
   'HTMLDirectoryElement',
   'HTMLFontElement',
   'HTMLFrameElement',
   'HTMLFrameSetElement',
   'HTMLMarqueeElement',
   'IDBAny',
+  'NFC',
   'Notation',
   'PagePopupController',
   'RGBColor',
   'RadioNodeList',  # Folded onto NodeList in dart2js.
   'Rect',
   'Response', # TODO: Symbol conflicts with Angular: dartbug.com/20937
   'ServiceWorker',
   'SQLTransactionSync', # Workers
   'SQLTransactionSyncCallback', # Workers
   'SVGAltGlyphDefElement', # Webkit only.
@@ skipping 11 matching lines @@
   'SVGFontFaceUriElement',
   'SVGGlyphElement',
   'SVGGlyphRefElement',
   'SVGHKernElement',
   'SVGMPathElement',
   'SVGPaint',
   'SVGMissingGlyphElement',
   'SVGTRefElement',
   'SVGVKernElement',
   'SubtleCrypto',
+  'USB',
+  'USBAlternateInterface',
+  'USBConfiguration',
+  'USBConnectionEvent',
+  'USBDevice',
+  'USBEndpoint',
+  'USBInTransferResult',
+  'USBInterface',
+  'USBIsochronousInTransferPacket',
+  'USBIsochronousInTransferResult',
+  'USBIsochronousOutTransferPacket',
+  'USBIsochronousOutTransferResult',
+  'USBOutTransferResult',
   'WebKitCSSFilterValue',
   'WebKitCSSMatrix',
   'WebKitCSSMixFunctionValue',
   'WebKitCSSTransformValue',
   'WebKitMediaSource',
   'WebKitNotification',
   'WebGLRenderingContextBase',
   'WebGL2RenderingContextBase',
   'WebKitSourceBuffer',
   'WebKitSourceBufferList',
   'WorkerLocation', # Workers
   'WorkerNavigator', # Workers
+  'Worklet', # Rendering Workers
+  'WorkletGlobalScope', # Rendering Workers
   'XMLHttpRequestProgressEvent',
   # Obsolete event for NaCl.
   'ResourceProgressEvent',
 ]
 
 for interface in _removed_html_interfaces:
   html_interface_renames[interface] = '_' + interface
 
 convert_to_future_members = monitored.Set(
     'htmlrenamer.converted_to_future_members', [
@@ skipping 614 matching lines @@
     'KeyboardEvent.keyCode',
     'KeyboardEvent.which',
     'Location.valueOf',
     'MessageEvent.data',
     'MessageEvent.ports',
     'MessageEvent.webkitInitMessageEvent',
     'MouseEvent.webkitMovementX',
     'MouseEvent.webkitMovementY',
     'MouseEvent.x',
     'MouseEvent.y',
+    'Navigator.bluetooth',
     'Navigator.registerServiceWorker',
     'Navigator.unregisterServiceWorker',
     'Navigator.isProtocolHandlerRegistered',
     'Navigator.unregisterProtocolHandler',
+    'Navigator.usb',
     'Node.compareDocumentPosition',
     'Node.get:DOCUMENT_POSITION_CONTAINED_BY',
     'Node.get:DOCUMENT_POSITION_CONTAINS',
     'Node.get:DOCUMENT_POSITION_DISCONNECTED',
     'Node.get:DOCUMENT_POSITION_FOLLOWING',
     'Node.get:DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC',
     'Node.get:DOCUMENT_POSITION_PRECEDING',
     'Node.get:childNodes',
     'Node.get:prefix',
     'Node.hasAttributes',
     'Node.isDefaultNamespace',
     'Node.isEqualNode',
     'Node.isSameNode',
     'Node.isSupported',
     'Node.lookupNamespaceURI',
     'Node.lookupPrefix',
     'Node.normalize',
     'Node.set:nodeValue',
     'NodeFilter.acceptNode',
     'NodeIterator.expandEntityReferences',
     'NodeIterator.filter',
     'NodeList.item',
     'ParentNode.append',
     'ParentNode.prepend',
+    'RTCPeerConnection.generateCertificate',
     'ServiceWorkerMessageEvent.data',
     'ShadowRoot.getElementsByTagNameNS',
     'SVGElement.getPresentationAttribute',
     'SVGElementInstance.on:wheel',
     'Touch.get:webkitRadiusX',
     'Touch.get:webkitRadiusY',
     'Touch.get:webkitForce',
     'Touch.get:webkitRotationAngle',
     'WheelEvent.wheelDelta',
     'WheelEvent.wheelDeltaX',
     'WheelEvent.wheelDeltaY',
     'Window.on:wheel',
     'WindowEventHandlers.on:beforeUnload',
     'WorkerGlobalScope.webkitIndexedDB',
     'XMLHttpRequest.open',
 # TODO(jacobr): should these be removed?
     'Document.close',
     'Document.hasFocus',
     ])
 
 # Manual dart: library name lookup.
 _library_names = monitored.Dict('htmlrenamer._library_names', {
   'ANGLEInstancedArrays': 'web_gl',
   'CHROMIUMSubscribeUniform': 'web_gl',
   'Database': 'web_sql',
   'Navigator': 'html',
   'Window': 'html',
+  'AnalyserNode': 'web_audio',
+  'AudioBufferCallback': 'web_audio',
+  'AudioBuffer': 'web_audio',
+  'AudioBufferSourceNode': 'web_audio',
+  'AudioContext': 'web_audio',
+  'AudioDestinationNode': 'web_audio',
+  'AudioListener': 'web_audio',
+  'AudioNode': 'web_audio',
+  'AudioParam': 'web_audio',
+  'AudioProcessingEvent': 'web_audio',
+  'AudioSourceNode': 'web_audio',
+  'BiquadFilterNode': 'web_audio',
+  'ChannelMergerNode': 'web_audio',
+  'ChannelSplitterNode': 'web_audio',
+  'ConvolverNode': 'web_audio',
+  'DelayNode': 'web_audio',
+  'DynamicsCompressorNode': 'web_audio',
+  'GainNode': 'web_audio',
+  'IIRFilterNode': 'web_audio',
+  'MediaElementAudioSourceNode': 'web_audio',
+  'MediaStreamAudioDestinationNode': 'web_audio',
+  'MediaStreamAudioSourceNode': 'web_audio',
+  'OfflineAudioCompletionEvent': 'web_audio',
+  'OfflineAudioContext': 'web_audio',
+  'OscillatorNode': 'web_audio',
+  'PannerNode': 'web_audio',
+  'PeriodicWave': 'web_audio',
+  'ScriptProcessorNode': 'web_audio',
+  'StereoPannerNode': 'web_audio',
+  'WaveShaperNode': 'web_audio',
+  'WindowWebAudio': 'web_audio',
 })
 
 _library_ids = monitored.Dict('htmlrenamer._library_names', {
   'ANGLEInstancedArrays': 'WebGl',
   'CHROMIUMSubscribeUniform': 'WebGl',
   'Database': 'WebSql',
   'Navigator': 'Html',
   'Window': 'Html',
+  'AnalyserNode': 'WebAudio',
+  'AudioBufferCallback': 'WebAudio',
+  'AudioBuffer': 'WebAudio',
+  'AudioBufferSourceNode': 'WebAudio',
+  'AudioContext': 'WebAudio',
+  'AudioDestinationNode': 'WebAudio',
+  'AudioListener': 'WebAudio',
+  'AudioNode': 'WebAudio',
+  'AudioParam': 'WebAudio',
+  'AudioProcessingEvent': 'WebAudio',
+  'AudioSourceNode': 'WebAudio',
+  'BiquadFilterNode': 'WebAudio',
+  'ChannelMergerNode': 'WebAudio',
+  'ChannelSplitterNode': 'WebAudio',
+  'ConvolverNode': 'WebAudio',
+  'DelayNode': 'WebAudio',
+  'DynamicsCompressorNode': 'WebAudio',
+  'GainNode': 'WebAudio',
+  'IIRFilterNode': 'WebAudio',
+  'MediaElementAudioSourceNode': 'WebAudio',
+  'MediaStreamAudioDestinationNode': 'WebAudio',
+  'MediaStreamAudioSourceNode': 'WebAudio',
+  'OfflineAudioCompletionEvent': 'WebAudio',
+  'OfflineAudioContext': 'WebAudio',
+  'OscillatorNode': 'WebAudio',
+  'PannerNode': 'WebAudio',
+  'PeriodicWave': 'WebAudio',
+  'ScriptProcessorNode': 'WebAudio',
+  'StereoPannerNode': 'WebAudio',
+  'WaveShaperNode': 'WebAudio',
+  'WindowWebAudio': 'WebAudio',
 })
 
 class HtmlRenamer(object):
   def __init__(self, database, metadata):
     self._database = database
     self._metadata = metadata
 
   def RenameInterface(self, interface):
     if 'Callback' in interface.ext_attrs:
       if interface.id in _removed_html_interfaces:
@@ skipping 89 matching lines @@
     for interface in self._database.Hierarchy(interface):
       match = find_match(interface.id)
       if match:
         return match
 
   def GetLibraryName(self, interface):
     # Some types have attributes merged in from many other interfaces.
     if interface.id in _library_names:
       return _library_names[interface.id]
 
-    # TODO(ager, blois): The conditional has been removed from indexed db,
-    # so we can no longer determine the library based on the conditionals.
+    # Support for IDL conditional has been removed from indexed db, web_sql,
+    # svg and web_gl so we can no longer determine the library based on conditional.
+    # Use interface prefix to do that.  web_audio interfaces have no common prefix
+    # - all audio interfaces added to _library_names/_library_ids.
     if interface.id.startswith("IDB"):
       return 'indexed_db'
     if interface.id.startswith("SQL"):
       return 'web_sql'
     if interface.id.startswith("SVG"):
       return 'svg'
     if interface.id.startswith("WebGL") or interface.id.startswith("OES") \
         or interface.id.startswith("EXT"):
       return 'web_gl'
 
-    if 'Conditional' in interface.ext_attrs:
-      if 'WEB_AUDIO' in interface.ext_attrs['Conditional']:
-        return 'web_audio'
-      if 'INDEXED_DATABASE' in interface.ext_attrs['Conditional']:
-        return 'indexed_db'
-      if 'SQL_DATABASE' in interface.ext_attrs['Conditional']:
-        return 'web_sql'
-
     if interface.id in typed_array_renames:
       return 'typed_data'
 
     return 'html'
 
   def GetLibraryId(self, interface):
     # Some types have attributes merged in from many other interfaces.
     if interface.id in _library_ids:
       return _library_ids[interface.id]
 
-    # TODO(ager, blois): The conditional has been removed from indexed db,
-    # so we can no longer determine the library based on the conditionals.
+    # Support for IDL conditional has been removed from indexed db, web_sql,
+    # svg and web_gl so we can no longer determine the library based on conditional.
+    # Use interface prefix to do that.  web_audio interfaces have no common prefix
+    # - all audio interfaces added to _library_names/_library_ids.
     if interface.id.startswith("IDB"):
       return 'IndexedDb'
     if interface.id.startswith("SQL"):
       return 'WebSql'
     if interface.id.startswith("SVG"):
       return 'Svg'
     if interface.id.startswith("WebGL") or interface.id.startswith("OES") \
         or interface.id.startswith("EXT"):
       return 'WebGl'
 
-    if 'Conditional' in interface.ext_attrs:
-      if 'WEB_AUDIO' in interface.ext_attrs['Conditional']:
-        return 'WebAudio'
-      if 'INDEXED_DATABASE' in interface.ext_attrs['Conditional']:
-        return 'IndexedDb'
-      if 'SQL_DATABASE' in interface.ext_attrs['Conditional']:
-        return 'WebSql'
-
     if interface.id in typed_array_renames:
       return 'TypedData'
 
     return 'Html'
 
   def DartifyTypeName(self, type_name):
     """Converts a DOM name to a Dart-friendly class name. """
 
     if type_name in html_interface_renames:
       return html_interface_renames[type_name]
@@ skipping 21 matching lines @@
 
     # We're looking for a sequence of letters which start with capital letter
     # then a series of caps and finishes with either the end of the string or
     # a capital letter.
     # The [0-9] check is for names such as 2D or 3D
     # The following test cases should match as:
     #   WebKitCSSFilterValue: WebKit(C)(SS)(F)ilterValue
     #   XPathNSResolver: (X)()(P)ath(N)(S)(R)esolver (no change)
     #   IFrameElement: (I)()(F)rameElement (no change)
     return re.sub(r'([A-Z])([A-Z]{2,})([A-Z]|$)', toLower, name)