| Index: tools/dom/scripts/htmlrenamer.py
|
| diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
|
| index 53b23283a6172375f99b72f81195a7e113369dd3..5152ffa52d07e2cd478c10c97c6cc253b4c58263 100644
|
| --- a/tools/dom/scripts/htmlrenamer.py
|
| +++ b/tools/dom/scripts/htmlrenamer.py
|
| @@ -151,7 +151,8 @@ convert_to_future_members = monitored.Set(
|
| # Members from the standard dom that should not be exposed publicly in dart:html
|
| # but need to be exposed internally to implement dart:html on top of a standard
|
| # browser.
|
| -_private_html_members = monitored.Set('htmlrenamer._private_html_members', [
|
| +private_html_members = monitored.Set('htmlrenamer.private_html_members', [
|
| + 'AudioNode.connect',
|
| 'CanvasRenderingContext2D.arc',
|
| 'CompositionEvent.initCompositionEvent',
|
| 'CustomEvent.initCustomEvent',
|
| @@ -348,6 +349,110 @@ renamed_html_members = monitored.Dict('htmlrenamer.renamed_html_members', {
|
| #'WorkerContext.webkitRequestFileSystemSync': '_requestFileSystemSync',
|
| })
|
|
|
| +# Members that have multiple definitions, but their types are vary, so we rename
|
| +# them to make them distinct.
|
| +renamed_overloads = monitored.Dict('htmldartgenreator.renamed_overloads', {
|
| + 'AudioContext.createBuffer(unsigned long numberOfChannels, unsigned long '
|
| + 'numberOfFrames, float sampleRate)': 'createEmptyBuffer',
|
| + 'AudioContext.createBuffer(ArrayBuffer buffer, boolean mixToMono)':
|
| + 'createBufferFromBuffer',
|
| + 'CSS.supports(DOMString conditionText)': 'supportsCondition',
|
| + 'CSS.supports(DOMString property, DOMString value)': 'supportsProperty',
|
| + 'CanvasRenderingContext2D.createPattern(HTMLCanvasElement canvas, '
|
| + 'DOMString repetitionType)': 'createPatternFromCanvas',
|
| + 'CanvasRenderingContext2D.createPattern(HTMLImageElement image, '
|
| + 'DOMString repetitionType)': 'createPatternFromImage',
|
| + 'CanvasRenderingContext2D.setFillColor(DOMString color, float alpha)':
|
| + 'setFillColorString',
|
| + 'CanvasRenderingContext2D.setFillColor(float grayLevel, float alpha)':
|
| + 'setFillColorGrayLevel',
|
| + 'CanvasRenderingContext2D.setFillColor(float r, float g, float b, float a)':
|
| + 'setFillColorRgb',
|
| + 'CanvasRenderingContext2D.setFillColor(float c, float m, float y, float k, '
|
| + 'float a)': 'setFillColorCmyk',
|
| + 'CanvasRenderingContext2D.setShadow(float width, float height, float blur, '
|
| + 'DOMString color, float alpha)': 'setShadowString',
|
| + 'CanvasRenderingContext2D.setShadow(float width, float height, float blur, '
|
| + 'float grayLevel, float alpha)': 'setShadowGrayLevel',
|
| + 'CanvasRenderingContext2D.setShadow(float width, float height, float blur, '
|
| + 'float r, float g, float b, float a)': 'setShadowRgb',
|
| + 'CanvasRenderingContext2D.setShadow(float width, float height, float blur, '
|
| + 'float c, float m, float y, float k, float a)': 'setShadowCmyk',
|
| + 'CanvasRenderingContext2D.setStrokeColor(DOMString color, float alpha)':
|
| + 'setStrokeColorString',
|
| + 'CanvasRenderingContext2D.setStrokeColor(float grayLevel, float alpha)':
|
| + 'setStrokeColorGrayLevel',
|
| + 'CanvasRenderingContext2D.setStrokeColor(float r, float g, float b, float a)':
|
| + 'setStrokeColorRgb',
|
| + 'CanvasRenderingContext2D.setStrokeColor(float c, float m, float y, float k,'
|
| + ' float a)': 'setStrokeColorCmyk',
|
| + 'DataTransferItemList.add(File file)': 'addFile',
|
| + 'DataTransferItemList.add(DOMString data, DOMString type)': 'addData',
|
| + 'FormData.append(DOMString name, DOMString value)': 'appendString',
|
| + 'FormData.append(DOMString name, Blob value, DOMString filename)':
|
| + 'appendBlob',
|
| + 'IDBDatabase.transaction(DOMStringList storeNames, DOMString mode)':
|
| + 'transactionStores',
|
| + 'IDBDatabase.transaction(sequence<DOMString> storeNames, DOMString mode)':
|
| + 'transactionList',
|
| + 'IDBDatabase.transaction(DOMString storeName, DOMString mode)':
|
| + 'transactionStore',
|
| + 'RTCDataChannel.send(ArrayBuffer data)': 'sendByteBuffer',
|
| + 'RTCDataChannel.send(ArrayBufferView data)': 'sendTypedData',
|
| + 'RTCDataChannel.send(Blob data)': 'sendBlob',
|
| + 'RTCDataChannel.send(DOMString data)': 'sendString',
|
| + 'URL.createObjectURL(WebKitMediaSource source)':
|
| + 'createObjectUrlFromSource',
|
| + 'URL.createObjectURL(MediaStream stream)': 'createObjectUrlFromStream',
|
| + 'URL.createObjectURL(Blob blob)': 'createObjectUrlFromBlob',
|
| + 'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
|
| + 'unsigned long internalformat, unsigned long format, unsigned long '
|
| + 'type, ImageData pixels)': 'texImage2DData',
|
| + 'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
|
| + 'unsigned long internalformat, unsigned long format, unsigned long '
|
| + 'type, HTMLImageElement image)': 'texImage2DImage',
|
| + 'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
|
| + 'unsigned long internalformat, unsigned long format, unsigned long '
|
| + 'type, HTMLCanvasElement canvas)': 'texImage2DCanvas',
|
| + 'WebGLRenderingContext.texImage2D(unsigned long target, long level, '
|
| + 'unsigned long internalformat, unsigned long format, unsigned long '
|
| + 'type, HTMLVideoElement video)': 'texImage2DVideo',
|
| + 'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
|
| + 'long xoffset, long yoffset, unsigned long format, unsigned long type, '
|
| + 'ImageData pixels)': 'texSubImage2DData',
|
| + 'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
|
| + 'long xoffset, long yoffset, unsigned long format, unsigned long type, '
|
| + 'HTMLImageElement image)': 'texSubImage2DImage',
|
| + 'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
|
| + 'long xoffset, long yoffset, unsigned long format, unsigned long type, '
|
| + 'HTMLCanvasElement canvas)': 'texSubImage2DCanvas',
|
| + 'WebGLRenderingContext.texSubImage2D(unsigned long target, long level, '
|
| + 'long xoffset, long yoffset, unsigned long format, unsigned long type, '
|
| + 'HTMLVideoElement video)': 'texSubImage2DVideo',
|
| + 'WebGLRenderingContext.bufferData(unsigned long target, '
|
| + 'ArrayBufferView data, unsigned long usage)': 'bufferTypedData',
|
| + 'WebGLRenderingContext.bufferData(unsigned long target, long long size, '
|
| + 'unsigned long usage)': 'bufferEmptyData',
|
| + 'WebGLRenderingContext.bufferSubData(unsigned long target, '
|
| + 'long long offset, ArrayBufferView data)': 'bufferSubTypedData',
|
| + 'WebSocket.send(ArrayBuffer data)': 'sendByteBuffer',
|
| + 'WebSocket.send(ArrayBufferView data)': 'sendTypeData',
|
| + 'WebSocket.send(DOMString data)': 'sendString',
|
| + 'WebSocket.send(Blob data)': 'sendBlob'
|
| +})
|
| +
|
| +# Members that have multiple definitions, but their types are identical (only
|
| +# number of arguments vary), so we do not rename them as a _raw method.
|
| +keep_overloaded_members = monitored.Set(
|
| + 'htmldartgenerator.keep_overloaded_members', [
|
| + 'AudioBufferSourceNode.start',
|
| + 'CanvasRenderingContext2D.putImageData',
|
| + 'CanvasRenderingContext2D.webkitPutImageDataHD',
|
| + 'HTMLInputElement.setRangeText',
|
| + 'HTMLTextAreaElement.setRangeText',
|
| + 'XMLHttpRequest.send'
|
| +])
|
| +
|
| for member in convert_to_future_members:
|
| if member in renamed_html_members:
|
| renamed_html_members[member] = '_' + renamed_html_members[member]
|
| @@ -677,7 +782,7 @@ class HtmlRenamer(object):
|
| renamed_html_members)
|
|
|
| target_name = renamed_html_members[name] if name else member
|
| - if self._FindMatch(interface, member, member_prefix, _private_html_members):
|
| + if self._FindMatch(interface, member, member_prefix, private_html_members):
|
| if not target_name.startswith('$dom_'): # e.g. $dom_svgClassName
|
| target_name = '$dom_' + target_name
|
|
|
|
|