Patchable version of 12929005

tools/dom/scripts/htmlrenamer.py

Index: tools/dom/scripts/htmlrenamer.py
diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
index a94f70035045bc5e08a6840c2f0b3ff8d84db09f..ef1c70ee572b4d7bbf5363382091d9c3d4b757e8 100644
--- a/tools/dom/scripts/htmlrenamer.py
+++ b/tools/dom/scripts/htmlrenamer.py
@@ -6,7 +6,23 @@ import logging
 import monitored
 import re
 
-html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', {
+typed_array_renames = {
+    'ArrayBuffer': 'ByteBuffer',
+    'ArrayBufferView': 'TypedData',
+    'DataView': 'ByteData',
+    'Float32Array': 'Float32List',
+    'Float64Array': 'Float64List',
+    'Int8Array': 'Int8List',
+    'Int16Array': 'Int16List',
+    'Int32Array': 'Int32List',
+    'Uint8Array': 'Uint8List',
+    'Uint8ClampedArray': 'Uint8ClampedList',
+    'Uint16Array': 'Uint16List',
+    'Uint32Array': 'Uint32List',
+}
+
+html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames',
+                                        dict({
     'CDATASection': 'CDataSection',
     'Clipboard': 'DataTransfer',
     'Database': 'SqlDatabase', # Avoid conflict with Index DB's Database.
@@ -55,7 +71,7 @@ html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', {
     'XMLHttpRequestException': 'HttpRequestException',
     'XMLHttpRequestProgressEvent': 'HttpRequestProgressEvent',
     'XMLHttpRequestUpload': 'HttpRequestUpload',
-})
+}, **typed_array_renames))
 
 # Interfaces that are suppressed, but need to still exist for Dartium and to
 # properly wrap DOM objects if/when encountered.
@@ -321,6 +337,11 @@ renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', {
         'resolveLocalFileSystemSyncUrl',
     'WorkerContext.webkitResolveLocalFileSystemURL':
         'resolveLocalFileSystemUrl',
+
+    # Typed array renames
+    'ArrayBuffer.byteLength': 'lengthInBytes',
+    'ArrayBufferView.byteLength': 'lengthInBytes',
+    'ArrayBufferView.byteOffset': 'offsetInBytes',
 })
 
 for member in convert_to_future_members:
@@ -690,6 +711,9 @@ class HtmlRenamer(object):
       if 'SQL_DATABASE' in interface.ext_attrs['Conditional']:
         return 'web_sql'
 
+    if interface.id in typed_array_renames:
+      return 'typeddata'
+
     return 'html'
 
   def DartifyTypeName(self, type_name):