sdk/lib/html/dartium/html_dartium.dart - Issue 12463028: "Reverting 19586"

Unified Diff: sdk/lib/html/dartium/html_dartium.dart

Side-by-side diff isn't available for this file because of its large size.

Issue 12463028: "Reverting 19586" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: sdk/lib/html/dartium/html_dartium.dart

diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart

index eadd0952ebda5ffdd505384f8c4d1f2ed6027ea4..5bb5ce700a3d2748b67ffd817e92c52ff0e8817b 100644

--- a/sdk/lib/html/dartium/html_dartium.dart

+++ b/sdk/lib/html/dartium/html_dartium.dart

@@ -6529,14 +6529,7 @@ class DataTransferItem extends NativeFieldWrapperClass1 {

@DomName('DataTransferItem.getAsString')

@DocsEditable

- void _getAsString([_StringCallback callback]) native "DataTransferItem_getAsString_Callback";

- Future<String> getAsString() {

- var completer = new Completer<String>();

- _getAsString(

- (value) { completer.complete(value); });

- return completer.future;

- }

+ void getAsString([StringCallback callback]) native "DataTransferItem_getAsString_Callback";

@DomName('DataTransferItem.webkitGetAsEntry')

@DocsEditable

@@ -6947,39 +6940,15 @@ class DirectoryEntry extends Entry {

@DomName('DirectoryEntry.getDirectory')

@DocsEditable

- void _getDirectory(String path, {Map options, _EntryCallback successCallback, _ErrorCallback errorCallback}) native "DirectoryEntry_getDirectory_Callback";

- Future<Entry> getDirectory(String path, {Map options}) {

- var completer = new Completer<Entry>();

- _getDirectory(path, options : options,

- successCallback : (value) { completer.complete(value); },

- errorCallback : (error) { completer.completeError(error); });

- return completer.future;

- }

+ void getDirectory(String path, {Map options, EntryCallback successCallback, ErrorCallback errorCallback}) native "DirectoryEntry_getDirectory_Callback";

@DomName('DirectoryEntry.getFile')

@DocsEditable

- void _getFile(String path, {Map options, _EntryCallback successCallback, _ErrorCallback errorCallback}) native "DirectoryEntry_getFile_Callback";

- Future<Entry> getFile(String path, {Map options}) {

- var completer = new Completer<Entry>();

- _getFile(path, options : options,

- successCallback : (value) { completer.complete(value); },

- errorCallback : (error) { completer.completeError(error); });

- return completer.future;

- }

+ void getFile(String path, {Map options, EntryCallback successCallback, ErrorCallback errorCallback}) native "DirectoryEntry_getFile_Callback";

@DomName('DirectoryEntry.removeRecursively')

@DocsEditable

- void _removeRecursively(VoidCallback successCallback, [_ErrorCallback errorCallback]) native "DirectoryEntry_removeRecursively_Callback";

- Future removeRecursively() {

- var completer = new Completer();

- _removeRecursively(

- () { completer.complete(); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void removeRecursively(VoidCallback successCallback, [ErrorCallback errorCallback]) native "DirectoryEntry_removeRecursively_Callback";

}

@@ -7025,15 +6994,7 @@ class DirectoryReader extends NativeFieldWrapperClass1 {

@DomName('DirectoryReader.readEntries')

@DocsEditable

- void _readEntries(_EntriesCallback successCallback, [_ErrorCallback errorCallback]) native "DirectoryReader_readEntries_Callback";

- Future<List<Entry>> readEntries() {

- var completer = new Completer<List<Entry>>();

- _readEntries(

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void readEntries(EntriesCallback successCallback, [ErrorCallback errorCallback]) native "DirectoryReader_readEntries_Callback";

}

@@ -10608,7 +10569,7 @@ class EntityReference extends Node {

// WARNING: Do not edit - generated code.

-typedef void _EntriesCallback(List<Entry> entries);

+typedef void EntriesCallback(List<Entry> entries);

// BSD-style license that can be found in the LICENSE file.

@@ -10641,7 +10602,7 @@ class Entry extends NativeFieldWrapperClass1 {

@DocsEditable

String get name native "Entry_name_Getter";

- void _copyTo(DirectoryEntry parent, {String name, _EntryCallback successCallback, _ErrorCallback errorCallback}) {

+ void copyTo(DirectoryEntry parent, [String name, EntryCallback successCallback, ErrorCallback errorCallback]) {

if (?name) {

_copyTo_1(parent, name, successCallback, errorCallback);

return;

@@ -10658,48 +10619,15 @@ class Entry extends NativeFieldWrapperClass1 {

@DocsEditable

void _copyTo_2(parent) native "Entry__copyTo_2_Callback";

- Future _copyTo(DirectoryEntry parent, {String name}) {

- if (?name) {

- _copyTo_1(parent, name);

- return;

- }

- _copyTo_2(parent);

- return;

- }

- @DomName('Entry._copyTo_1')

- @DocsEditable

- void _copyTo_1(parent, name) native "Entry__copyTo_1_Callback";

- @DomName('Entry._copyTo_2')

- @DocsEditable

- void _copyTo_2(parent) native "Entry__copyTo_2_Callback";

@DomName('Entry.getMetadata')

@DocsEditable

- void _getMetadata(MetadataCallback successCallback, [_ErrorCallback errorCallback]) native "Entry_getMetadata_Callback";

- Future<Metadata> getMetadata() {

- var completer = new Completer<Metadata>();

- _getMetadata(

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void getMetadata(MetadataCallback successCallback, [ErrorCallback errorCallback]) native "Entry_getMetadata_Callback";

@DomName('Entry.getParent')

@DocsEditable

- void _getParent([_EntryCallback successCallback, _ErrorCallback errorCallback]) native "Entry_getParent_Callback";

- Future<Entry> getParent() {

- var completer = new Completer<Entry>();

- _getParent(

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void getParent([EntryCallback successCallback, ErrorCallback errorCallback]) native "Entry_getParent_Callback";

- void _moveTo(DirectoryEntry parent, {String name, _EntryCallback successCallback, _ErrorCallback errorCallback}) {

+ void moveTo(DirectoryEntry parent, [String name, EntryCallback successCallback, ErrorCallback errorCallback]) {

if (?name) {

_moveTo_1(parent, name, successCallback, errorCallback);

return;

@@ -10716,34 +10644,9 @@ class Entry extends NativeFieldWrapperClass1 {

@DocsEditable

void _moveTo_2(parent) native "Entry__moveTo_2_Callback";

- Future _moveTo(DirectoryEntry parent, {String name}) {

- if (?name) {

- _moveTo_1(parent, name);

- return;

- }

- _moveTo_2(parent);

- return;

- }

- @DomName('Entry._moveTo_1')

- @DocsEditable

- void _moveTo_1(parent, name) native "Entry__moveTo_1_Callback";

- @DomName('Entry._moveTo_2')

- @DocsEditable

- void _moveTo_2(parent) native "Entry__moveTo_2_Callback";

@DomName('Entry.remove')

@DocsEditable

- void _remove(VoidCallback successCallback, [_ErrorCallback errorCallback]) native "Entry_remove_Callback";

- Future remove() {

- var completer = new Completer();

- _remove(

- () { completer.complete(); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void remove(VoidCallback successCallback, [ErrorCallback errorCallback]) native "Entry_remove_Callback";

@DomName('Entry.toURL')

@DocsEditable

@@ -10757,7 +10660,7 @@ class Entry extends NativeFieldWrapperClass1 {

// WARNING: Do not edit - generated code.

-typedef void _EntryCallback(Entry entry);

+typedef void EntryCallback(Entry entry);

// BSD-style license that can be found in the LICENSE file.

@@ -10822,7 +10725,7 @@ class EntrySync extends NativeFieldWrapperClass1 {

// WARNING: Do not edit - generated code.

-typedef void _ErrorCallback(FileError error);

+typedef void ErrorCallback(FileError error);

// BSD-style license that can be found in the LICENSE file.

@@ -11318,7 +11221,7 @@ class File extends Blob {

// WARNING: Do not edit - generated code.

-typedef void _FileCallback(File file);

+typedef void FileCallback(File file);

// BSD-style license that can be found in the LICENSE file.

@@ -11333,27 +11236,11 @@ class FileEntry extends Entry {

@DomName('FileEntry.createWriter')

@DocsEditable

- void _createWriter(_FileWriterCallback successCallback, [_ErrorCallback errorCallback]) native "FileEntry_createWriter_Callback";

- Future<FileWriter> createWriter() {

- var completer = new Completer<FileWriter>();

- _createWriter(

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void createWriter(FileWriterCallback successCallback, [ErrorCallback errorCallback]) native "FileEntry_createWriter_Callback";

@DomName('FileEntry.file')

@DocsEditable

- void _file(_FileCallback successCallback, [_ErrorCallback errorCallback]) native "FileEntry_file_Callback";

- Future<File> file() {

- var completer = new Completer<File>();

- _file(

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void file(FileCallback successCallback, [ErrorCallback errorCallback]) native "FileEntry_file_Callback";

}

@@ -11892,7 +11779,7 @@ class FileSystem extends NativeFieldWrapperClass1 {

// WARNING: Do not edit - generated code.

-typedef void _FileSystemCallback(FileSystem fileSystem);

+typedef void FileSystemCallback(FileSystem fileSystem);

// BSD-style license that can be found in the LICENSE file.

@@ -12034,7 +11921,7 @@ class FileWriter extends EventTarget {

// WARNING: Do not edit - generated code.

-typedef void _FileWriterCallback(FileWriter fileWriter);

+typedef void FileWriterCallback(FileWriter fileWriter);

// BSD-style license that can be found in the LICENSE file.

@@ -13718,7 +13605,7 @@ class HttpRequest extends EventTarget {

if (method == null) {

method = 'GET';

}

- xhr.open(method, url, async: true);

+ xhr.open(method, url, true);

if (withCredentials != null) {

xhr.withCredentials = withCredentials;

@@ -14028,7 +13915,7 @@ class HttpRequest extends EventTarget {

@DomName('XMLHttpRequest.open')

@DocsEditable

- void open(String method, String url, {bool async, String user, String password}) native "XMLHttpRequest_open_Callback";

+ void open(String method, String url, [bool async, String user, String password]) native "XMLHttpRequest_open_Callback";

/**

* Specify a particular MIME type (such as `text/xml`) desired for the

@@ -14922,7 +14809,7 @@ class InputElement extends _Element_Merged implements

@DocsEditable

void setCustomValidity(String error) native "HTMLInputElement_setCustomValidity_Callback";

- void setRangeText(String replacement, {int start, int end, String selectionMode}) {

+ void setRangeText(String replacement, [int start, int end, String selectionMode]) {

if ((replacement is String || replacement == null) && !?start && !?end && !?selectionMode) {

_setRangeText_1(replacement);

return;

@@ -19542,14 +19429,7 @@ class Notification extends EventTarget {

@DomName('Notification.requestPermission')

@DocsEditable

- static void _requestPermission([_NotificationPermissionCallback callback]) native "Notification_requestPermission_Callback";

- static Future<String> requestPermission() {

- var completer = new Completer<String>();

- _requestPermission(

- (value) { completer.complete(value); });

- return completer.future;

- }

+ static void requestPermission([NotificationPermissionCallback callback]) native "Notification_requestPermission_Callback";

@DomName('Notification.show')

@DocsEditable

@@ -19608,14 +19488,7 @@ class NotificationCenter extends NativeFieldWrapperClass1 {

@DomName('NotificationCenter.requestPermission')

@DocsEditable

- void _requestPermission(VoidCallback callback) native "NotificationCenter_requestPermission_Callback";

- Future requestPermission() {

- var completer = new Completer();

- _requestPermission(

- () { completer.complete(); });

- return completer.future;

- }

+ void requestPermission(VoidCallback callback) native "NotificationCenter_requestPermission_Callback";

}

@@ -19625,7 +19498,7 @@ class NotificationCenter extends NativeFieldWrapperClass1 {

// WARNING: Do not edit - generated code.

-typedef void _NotificationPermissionCallback(String permission);

+typedef void NotificationPermissionCallback(String permission);

// BSD-style license that can be found in the LICENSE file.

@@ -20547,7 +20420,7 @@ class QuoteElement extends _Element_Merged {

// WARNING: Do not edit - generated code.

-typedef void _RtcErrorCallback(String errorInformation);

+typedef void RtcErrorCallback(String errorInformation);

// BSD-style license that can be found in the LICENSE file.

@@ -20555,7 +20428,7 @@ typedef void _RtcErrorCallback(String errorInformation);

// WARNING: Do not edit - generated code.

-typedef void _RtcSessionDescriptionCallback(RtcSessionDescription sdp);

+typedef void RtcSessionDescriptionCallback(RtcSessionDescription sdp);

// BSD-style license that can be found in the LICENSE file.

@@ -21071,15 +20944,7 @@ class RtcPeerConnection extends EventTarget {

@DomName('RTCPeerConnection.createAnswer')

@DocsEditable

- void _createAnswer(_RtcSessionDescriptionCallback successCallback, [_RtcErrorCallback failureCallback, Map mediaConstraints]) native "RTCPeerConnection_createAnswer_Callback";

- Future<RtcSessionDescription> createAnswer([Map mediaConstraints]) {

- var completer = new Completer<RtcSessionDescription>();

- _createAnswer(mediaConstraints,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void createAnswer(RtcSessionDescriptionCallback successCallback, [RtcErrorCallback failureCallback, Map mediaConstraints]) native "RTCPeerConnection_createAnswer_Callback";

@DomName('RTCPeerConnection.createDTMFSender')

@DocsEditable

@@ -21091,15 +20956,7 @@ class RtcPeerConnection extends EventTarget {

@DomName('RTCPeerConnection.createOffer')

@DocsEditable

- void _createOffer(_RtcSessionDescriptionCallback successCallback, [_RtcErrorCallback failureCallback, Map mediaConstraints]) native "RTCPeerConnection_createOffer_Callback";

- Future<RtcSessionDescription> createOffer([Map mediaConstraints]) {

- var completer = new Completer<RtcSessionDescription>();

- _createOffer(mediaConstraints,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void createOffer(RtcSessionDescriptionCallback successCallback, [RtcErrorCallback failureCallback, Map mediaConstraints]) native "RTCPeerConnection_createOffer_Callback";

@DomName('RTCPeerConnection.dispatchEvent')

@DocsEditable

@@ -21127,27 +20984,11 @@ class RtcPeerConnection extends EventTarget {

@DomName('RTCPeerConnection.setLocalDescription')

@DocsEditable

- void _setLocalDescription(RtcSessionDescription description, [VoidCallback successCallback, _RtcErrorCallback failureCallback]) native "RTCPeerConnection_setLocalDescription_Callback";

- Future setLocalDescription(RtcSessionDescription description) {

- var completer = new Completer();

- _setLocalDescription(description,

- () { completer.complete(); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void setLocalDescription(RtcSessionDescription description, [VoidCallback successCallback, RtcErrorCallback failureCallback]) native "RTCPeerConnection_setLocalDescription_Callback";

@DomName('RTCPeerConnection.setRemoteDescription')

@DocsEditable

- void _setRemoteDescription(RtcSessionDescription description, [VoidCallback successCallback, _RtcErrorCallback failureCallback]) native "RTCPeerConnection_setRemoteDescription_Callback";

- Future setRemoteDescription(RtcSessionDescription description) {

- var completer = new Completer();

- _setRemoteDescription(description,

- () { completer.complete(); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void setRemoteDescription(RtcSessionDescription description, [VoidCallback successCallback, RtcErrorCallback failureCallback]) native "RTCPeerConnection_setRemoteDescription_Callback";

@DomName('RTCPeerConnection.updateIce')

@DocsEditable

@@ -22960,27 +22801,11 @@ class StorageInfo extends NativeFieldWrapperClass1 {

@DomName('StorageInfo.queryUsageAndQuota')

@DocsEditable

- void _queryUsageAndQuota(int storageType, [_StorageInfoUsageCallback usageCallback, _StorageInfoErrorCallback errorCallback]) native "StorageInfo_queryUsageAndQuota_Callback";

- Future<int> queryUsageAndQuota(int storageType) {

- var completer = new Completer<int>();

- _queryUsageAndQuota(storageType,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void queryUsageAndQuota(int storageType, [StorageInfoUsageCallback usageCallback, StorageInfoErrorCallback errorCallback]) native "StorageInfo_queryUsageAndQuota_Callback";

@DomName('StorageInfo.requestQuota')

@DocsEditable

- void _requestQuota(int storageType, int newQuotaInBytes, [StorageInfoQuotaCallback quotaCallback, _StorageInfoErrorCallback errorCallback]) native "StorageInfo_requestQuota_Callback";

- Future<int> requestQuota(int storageType, int newQuotaInBytes) {

- var completer = new Completer<int>();

- _requestQuota(storageType, newQuotaInBytes,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void requestQuota(int storageType, int newQuotaInBytes, [StorageInfoQuotaCallback quotaCallback, StorageInfoErrorCallback errorCallback]) native "StorageInfo_requestQuota_Callback";

}

@@ -22990,7 +22815,7 @@ class StorageInfo extends NativeFieldWrapperClass1 {

// WARNING: Do not edit - generated code.

-typedef void _StorageInfoErrorCallback(DomException error);

+typedef void StorageInfoErrorCallback(DomException error);

// BSD-style license that can be found in the LICENSE file.

@@ -23006,7 +22831,7 @@ typedef void StorageInfoQuotaCallback(int grantedQuotaInBytes);

// WARNING: Do not edit - generated code.

-typedef void _StorageInfoUsageCallback(int currentUsageInBytes, int currentQuotaInBytes);

+typedef void StorageInfoUsageCallback(int currentUsageInBytes, int currentQuotaInBytes);

// BSD-style license that can be found in the LICENSE file.

@@ -23014,7 +22839,7 @@ typedef void _StorageInfoUsageCallback(int currentUsageInBytes, int currentQuota

// WARNING: Do not edit - generated code.

-typedef void _StringCallback(String data);

+typedef void StringCallback(String data);

// BSD-style license that can be found in the LICENSE file.

@@ -28729,29 +28554,13 @@ class Window extends EventTarget implements WindowBase {

@DocsEditable

@SupportedBrowser(SupportedBrowser.CHROME)

@Experimental

- void _requestFileSystem(int type, int size, _FileSystemCallback successCallback, [_ErrorCallback errorCallback]) native "DOMWindow_webkitRequestFileSystem_Callback";

- Future<FileSystem> requestFileSystem(int type, int size) {

- var completer = new Completer<FileSystem>();

- _requestFileSystem(type, size,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void requestFileSystem(int type, int size, FileSystemCallback successCallback, [ErrorCallback errorCallback]) native "DOMWindow_webkitRequestFileSystem_Callback";

@DomName('DOMWindow.webkitResolveLocalFileSystemURL')

@DocsEditable

@SupportedBrowser(SupportedBrowser.CHROME)

@Experimental

- void _resolveLocalFileSystemUrl(String url, _EntryCallback successCallback, [_ErrorCallback errorCallback]) native "DOMWindow_webkitResolveLocalFileSystemURL_Callback";

- Future<Entry> resolveLocalFileSystemUrl(String url) {

- var completer = new Completer<Entry>();

- _resolveLocalFileSystemUrl(url,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void resolveLocalFileSystemUrl(String url, EntryCallback successCallback, [ErrorCallback errorCallback]) native "DOMWindow_webkitResolveLocalFileSystemURL_Callback";

@DomName('DOMWindow.onDOMContentLoaded')

@DocsEditable

@@ -29109,7 +28918,7 @@ class WorkerContext extends EventTarget {

@DocsEditable

@SupportedBrowser(SupportedBrowser.CHROME)

@Experimental

- void requestFileSystem(int type, int size, [_FileSystemCallback successCallback, _ErrorCallback errorCallback]) native "WorkerContext_webkitRequestFileSystem_Callback";

+ void requestFileSystem(int type, int size, [FileSystemCallback successCallback, ErrorCallback errorCallback]) native "WorkerContext_webkitRequestFileSystem_Callback";

@DomName('WorkerContext.webkitRequestFileSystemSync')

@DocsEditable

@@ -29127,15 +28936,7 @@ class WorkerContext extends EventTarget {

@DocsEditable

@SupportedBrowser(SupportedBrowser.CHROME)

@Experimental

- void _resolveLocalFileSystemUrl(String url, _EntryCallback successCallback, [_ErrorCallback errorCallback]) native "WorkerContext_webkitResolveLocalFileSystemURL_Callback";

- Future<Entry> resolveLocalFileSystemUrl(String url) {

- var completer = new Completer<Entry>();

- _resolveLocalFileSystemUrl(url,

- (value) { completer.complete(value); },

- (error) { completer.completeError(error); });

- return completer.future;

- }

+ void resolveLocalFileSystemUrl(String url, EntryCallback successCallback, [ErrorCallback errorCallback]) native "WorkerContext_webkitResolveLocalFileSystemURL_Callback";

@DomName('WorkerContext.onerror')

@DocsEditable

« no previous file with comments | « sdk/lib/html/dart2js/html_dart2js.dart ('k') | tests/html/fileapi_test.dart » ('j') | no next file with comments »