Chromium Code Reviews| Index: sdk/lib/html/dart2js/html_dart2js.dart |
| diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart |
| index f179a1607536fce4ad3f235eacd35b98287843ec..ff0e8bd5a9fb2a853c37e89ed65d9d65fb6d8b9e 100644 |
| --- a/sdk/lib/html/dart2js/html_dart2js.dart |
| +++ b/sdk/lib/html/dart2js/html_dart2js.dart |
| @@ -1158,7 +1158,12 @@ class CanvasRenderingContext2D extends CanvasRenderingContext native "CanvasRend |
| @DomName('CanvasRenderingContext2D.createPattern') |
| @DocsEditable |
| - CanvasPattern createPattern(canvas_OR_image, String repetitionType) native; |
| + CanvasPattern createPattern(CanvasElement canvas, String repetitionType) native; |
|
blois
2013/06/18 18:11:21
I think that all variants should be named, in case
|
| + |
| + @JSName('createPattern') |
| + @DomName('CanvasRenderingContext2D.createPattern') |
| + @DocsEditable |
| + CanvasPattern createPatternFromImage(ImageElement image, String repetitionType) native; |
| @DomName('CanvasRenderingContext2D.createRadialGradient') |
| @DocsEditable |
| @@ -6190,7 +6195,12 @@ class DataTransferItemList native "DataTransferItemList" { |
| @DomName('DataTransferItemList.add') |
| @DocsEditable |
| - void add(data_OR_file, [String type]) native; |
| + void add(String data, String type) native; |
| + |
| + @JSName('add') |
| + @DomName('DataTransferItemList.add') |
| + @DocsEditable |
| + void addFile(File file) native; |
| @DomName('DataTransferItemList.clear') |
| @DocsEditable |
| @@ -6431,38 +6441,38 @@ class DirectoryEntry extends Entry native "DirectoryEntry" { |
| void __getDirectory(String path, {Map options, _EntryCallback successCallback, _ErrorCallback errorCallback}) { |
| if (errorCallback != null) { |
| var options_1 = convertDartToNative_Dictionary(options); |
| - ___getDirectory_1(path, options_1, successCallback, errorCallback); |
| + __getDirectory_1(path, options_1, successCallback, errorCallback); |
| return; |
| } |
| if (successCallback != null) { |
| var options_2 = convertDartToNative_Dictionary(options); |
| - ___getDirectory_2(path, options_2, successCallback); |
| + __getDirectory_2(path, options_2, successCallback); |
| return; |
| } |
| if (options != null) { |
| var options_3 = convertDartToNative_Dictionary(options); |
| - ___getDirectory_3(path, options_3); |
| + __getDirectory_3(path, options_3); |
| return; |
| } |
| - ___getDirectory_4(path); |
| + __getDirectory_4(path); |
| return; |
| } |
| @JSName('getDirectory') |
| @DomName('DirectoryEntry.getDirectory') |
| @DocsEditable |
| - void ___getDirectory_1(path, options, _EntryCallback successCallback, _ErrorCallback errorCallback) native; |
| + void __getDirectory_1(path, options, _EntryCallback successCallback, _ErrorCallback errorCallback) native; |
| @JSName('getDirectory') |
| @DomName('DirectoryEntry.getDirectory') |
| @DocsEditable |
| - void ___getDirectory_2(path, options, _EntryCallback successCallback) native; |
| + void __getDirectory_2(path, options, _EntryCallback successCallback) native; |
| @JSName('getDirectory') |
| @DomName('DirectoryEntry.getDirectory') |
| @DocsEditable |
| - void ___getDirectory_3(path, options) native; |
| + void __getDirectory_3(path, options) native; |
| @JSName('getDirectory') |
| @DomName('DirectoryEntry.getDirectory') |
| @DocsEditable |
| - void ___getDirectory_4(path) native; |
| + void __getDirectory_4(path) native; |
| @JSName('getDirectory') |
| @DomName('DirectoryEntry.getDirectory') |
| @@ -6480,38 +6490,38 @@ class DirectoryEntry extends Entry native "DirectoryEntry" { |
| void __getFile(String path, {Map options, _EntryCallback successCallback, _ErrorCallback errorCallback}) { |
| if (errorCallback != null) { |
| var options_1 = convertDartToNative_Dictionary(options); |
| - ___getFile_1(path, options_1, successCallback, errorCallback); |
| + __getFile_1(path, options_1, successCallback, errorCallback); |
| return; |
| } |
| if (successCallback != null) { |
| var options_2 = convertDartToNative_Dictionary(options); |
| - ___getFile_2(path, options_2, successCallback); |
| + __getFile_2(path, options_2, successCallback); |
| return; |
| } |
| if (options != null) { |
| var options_3 = convertDartToNative_Dictionary(options); |
| - ___getFile_3(path, options_3); |
| + __getFile_3(path, options_3); |
| return; |
| } |
| - ___getFile_4(path); |
| + __getFile_4(path); |
| return; |
| } |
| @JSName('getFile') |
| @DomName('DirectoryEntry.getFile') |
| @DocsEditable |
| - void ___getFile_1(path, options, _EntryCallback successCallback, _ErrorCallback errorCallback) native; |
| + void __getFile_1(path, options, _EntryCallback successCallback, _ErrorCallback errorCallback) native; |
| @JSName('getFile') |
| @DomName('DirectoryEntry.getFile') |
| @DocsEditable |
| - void ___getFile_2(path, options, _EntryCallback successCallback) native; |
| + void __getFile_2(path, options, _EntryCallback successCallback) native; |
| @JSName('getFile') |
| @DomName('DirectoryEntry.getFile') |
| @DocsEditable |
| - void ___getFile_3(path, options) native; |
| + void __getFile_3(path, options) native; |
| @JSName('getFile') |
| @DomName('DirectoryEntry.getFile') |
| @DocsEditable |
| - void ___getFile_4(path) native; |
| + void __getFile_4(path) native; |
| @JSName('getFile') |
| @DomName('DirectoryEntry.getFile') |
| @@ -15863,13 +15873,13 @@ class MutationObserver native "MutationObserver,WebKitMutationObserver" { |
| @DocsEditable |
| void _observe(Node target, Map options) { |
| var options_1 = convertDartToNative_Dictionary(options); |
| - __observe_1(target, options_1); |
| + _observe_1(target, options_1); |
| return; |
| } |
| @JSName('observe') |
| @DomName('MutationObserver.observe') |
| @DocsEditable |
| - void __observe_1(Node target, options) native; |
| + void _observe_1(Node target, options) native; |
| @DomName('MutationObserver.takeRecords') |
| @DocsEditable |
| @@ -16102,7 +16112,7 @@ class Navigator native "Navigator" { |
| * window.navigator.getUserMedia(audio: true, video: true).then((stream) { |
| * var video = new VideoElement() |
| * ..autoplay = true |
| - * ..src = Url.createObjectUrl(stream); |
| + * ..src = Url.createObjectUrlFromStream(stream); |
| * document.body.append(video); |
| * }); |
| * |
| @@ -18517,7 +18527,22 @@ class RtcDataChannel extends EventTarget native "RTCDataChannel" { |
| @DomName('RTCDataChannel.send') |
| @DocsEditable |
| - void send(data) native; |
| + void send(String data) native; |
| + |
| + @JSName('send') |
| + @DomName('RTCDataChannel.send') |
| + @DocsEditable |
| + void sendBlob(Blob data) native; |
| + |
| + @JSName('send') |
| + @DomName('RTCDataChannel.send') |
| + @DocsEditable |
| + void sendByteBuffer(ByteBuffer data) native; |
| + |
| + @JSName('send') |
| + @DomName('RTCDataChannel.send') |
| + @DocsEditable |
| + void sendTypedData(TypedData data) native; |
| @DomName('RTCDataChannel.onclose') |
| @DocsEditable |
| @@ -18814,20 +18839,20 @@ class RtcPeerConnection extends EventTarget native "RTCPeerConnection,mozRTCPeer |
| void _createAnswer(_RtcSessionDescriptionCallback successCallback, [_RtcErrorCallback failureCallback, Map mediaConstraints]) { |
| if (mediaConstraints != null) { |
| var mediaConstraints_1 = convertDartToNative_Dictionary(mediaConstraints); |
| - __createAnswer_1(successCallback, failureCallback, mediaConstraints_1); |
| + _createAnswer_1(successCallback, failureCallback, mediaConstraints_1); |
| return; |
| } |
| - __createAnswer_2(successCallback, failureCallback); |
| + _createAnswer_2(successCallback, failureCallback); |
| return; |
| } |
| @JSName('createAnswer') |
| @DomName('RTCPeerConnection.createAnswer') |
| @DocsEditable |
| - void __createAnswer_1(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback, mediaConstraints) native; |
| + void _createAnswer_1(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback, mediaConstraints) native; |
| @JSName('createAnswer') |
| @DomName('RTCPeerConnection.createAnswer') |
| @DocsEditable |
| - void __createAnswer_2(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback) native; |
| + void _createAnswer_2(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback) native; |
| @JSName('createDTMFSender') |
| @DomName('RTCPeerConnection.createDTMFSender') |
| @@ -18857,20 +18882,20 @@ class RtcPeerConnection extends EventTarget native "RTCPeerConnection,mozRTCPeer |
| void _createOffer(_RtcSessionDescriptionCallback successCallback, [_RtcErrorCallback failureCallback, Map mediaConstraints]) { |
| if (mediaConstraints != null) { |
| var mediaConstraints_1 = convertDartToNative_Dictionary(mediaConstraints); |
| - __createOffer_1(successCallback, failureCallback, mediaConstraints_1); |
| + _createOffer_1(successCallback, failureCallback, mediaConstraints_1); |
| return; |
| } |
| - __createOffer_2(successCallback, failureCallback); |
| + _createOffer_2(successCallback, failureCallback); |
| return; |
| } |
| @JSName('createOffer') |
| @DomName('RTCPeerConnection.createOffer') |
| @DocsEditable |
| - void __createOffer_1(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback, mediaConstraints) native; |
| + void _createOffer_1(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback, mediaConstraints) native; |
| @JSName('createOffer') |
| @DomName('RTCPeerConnection.createOffer') |
| @DocsEditable |
| - void __createOffer_2(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback) native; |
| + void _createOffer_2(_RtcSessionDescriptionCallback successCallback, _RtcErrorCallback failureCallback) native; |
| @DomName('RTCPeerConnection.dispatchEvent') |
| @DocsEditable |
| @@ -21352,7 +21377,7 @@ class TextAreaElement extends Element native "HTMLTextAreaElement" { |
| @DocsEditable |
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#dom-textarea/input-setrangetext |
| @Experimental |
| - void setRangeText(String replacement, [int start, int end, String selectionMode]) native; |
| + void setRangeText(String replacement, {int start, int end, String selectionMode}) native; |
| @DomName('HTMLTextAreaElement.setSelectionRange') |
| @DocsEditable |
| @@ -22314,10 +22339,14 @@ class UnknownElement extends Element native "HTMLUnknownElement" { |
| @DomName('URL') |
| class Url native "URL" { |
| - static String createObjectUrl(blob_OR_source_OR_stream) => |
| - JS('String', |
| - '(self.URL || self.webkitURL).createObjectURL(#)', |
| - blob_OR_source_OR_stream); |
| + static String createObjectUrl(MediaSource source) => |
| + JS('String', '(self.URL || self.webkitURL).createObjectURL(#)', source); |
| + |
| + static String createObjectUrlFromStream(MediaStream stream) => |
| + JS('String', '(self.URL || self.webkitURL).createObjectURL(#)', stream); |
| + |
| + static String createObjectUrlFromBlob(Blob blob) => |
| + JS('String', '(self.URL || self.webkitURL).createObjectURL(#)', blob); |
| static void revokeObjectUrl(String url) => |
| JS('void', |
| @@ -23471,10 +23500,10 @@ class Window extends EventTarget implements WindowBase native "Window,DOMWindow" |
| @Returns('Window|=Object') |
| WindowBase __getter__(index_OR_name) { |
| if ((index_OR_name is int || index_OR_name == null)) { |
| - return _convertNativeToDart_Window(___getter___1(index_OR_name)); |
| + return _convertNativeToDart_Window(__getter___1(index_OR_name)); |
| } |
| if ((index_OR_name is String || index_OR_name == null)) { |
| - return _convertNativeToDart_Window(___getter___2(index_OR_name)); |
| + return _convertNativeToDart_Window(__getter___2(index_OR_name)); |
| } |
| throw new ArgumentError("Incorrect number or type of arguments"); |
| } |
| @@ -23484,14 +23513,14 @@ class Window extends EventTarget implements WindowBase native "Window,DOMWindow" |
| @Experimental // untriaged |
| @Creates('Window|=Object') |
| @Returns('Window|=Object') |
| - ___getter___1(int index) native; |
| + __getter___1(int index) native; |
| @JSName('__getter__') |
| @DomName('Window.__getter__') |
| @DocsEditable |
| @Experimental // untriaged |
| @Creates('Window|=Object') |
| @Returns('Window|=Object') |
| - ___getter___2(String name) native; |
| + __getter___2(String name) native; |
| @JSName('addEventListener') |
| @DomName('Window.addEventListener') |