Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10375026: Start GenerateDispatch refactoring. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 7 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:
Download patch
« lib/dom/scripts/generator.py ('K') | « lib/dom/scripts/systemwrapping.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/html/dartium/html_dartium.dart
diff --git a/lib/html/dartium/html_dartium.dart b/lib/html/dartium/html_dartium.dart
index 677b7706232467ba05b480190dbb4ba87ea6247d..df5db1b9dd2e505d55126289a163a29f4dfb0488 100644
--- a/lib/html/dartium/html_dartium.dart
+++ b/lib/html/dartium/html_dartium.dart
@@ -1091,13 +1091,8 @@ class _AudioContextImpl extends _EventTargetImpl implements AudioContext {
}
void decodeAudioData(ArrayBuffer audioData, AudioBufferCallback successCallback, [AudioBufferCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.decodeAudioData(_unwrap(audioData), _unwrap(successCallback));
- return;
- } else {
- _ptr.decodeAudioData(_unwrap(audioData), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.decodeAudioData(_unwrap(audioData), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
void startRendering() {
@@ -1915,13 +1910,8 @@ class _CSSStyleDeclarationImpl extends _DOMTypeBase implements CSSStyleDeclarati
}
void setProperty(String propertyName, String value, [String priority = null]) {
- if (priority === null) {
- _ptr.setProperty(_unwrap(propertyName), _unwrap(value));
- return;
- } else {
- _ptr.setProperty(_unwrap(propertyName), _unwrap(value), _unwrap(priority));
- return;
- }
+ _ptr.setProperty(_unwrap(propertyName), _unwrap(value), _unwrap(priority));
+ return;
}
@@ -6285,23 +6275,13 @@ class _DataTransferItemImpl extends _DOMTypeBase implements DataTransferItem {
}
void getAsString([StringCallback callback = null]) {
- if (callback === null) {
- _ptr.getAsString();
- return;
- } else {
- _ptr.getAsString(_unwrap(callback));
- return;
- }
+ _ptr.getAsString(_unwrap(callback));
+ return;
}
void webkitGetAsEntry([EntryCallback callback = null]) {
- if (callback === null) {
- _ptr.webkitGetAsEntry();
- return;
- } else {
- _ptr.webkitGetAsEntry(_unwrap(callback));
- return;
- }
+ _ptr.webkitGetAsEntry(_unwrap(callback));
+ return;
}
}
@@ -6471,66 +6451,18 @@ class _DatabaseImpl extends _DOMTypeBase implements Database {
String get version() => _wrap(_ptr.version);
void changeVersion(String oldVersion, String newVersion, [SQLTransactionCallback callback = null, SQLTransactionErrorCallback errorCallback = null, VoidCallback successCallback = null]) {
- if (callback === null) {
- if (errorCallback === null) {
- if (successCallback === null) {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion));
- return;
- }
- }
- } else {
- if (errorCallback === null) {
- if (successCallback === null) {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback));
- return;
- }
- } else {
- if (successCallback === null) {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback), _unwrap(errorCallback));
- return;
- } else {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
- return;
- }
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
+ return;
}
void readTransaction(SQLTransactionCallback callback, [SQLTransactionErrorCallback errorCallback = null, VoidCallback successCallback = null]) {
- if (errorCallback === null) {
- if (successCallback === null) {
- _ptr.readTransaction(_unwrap(callback));
- return;
- }
- } else {
- if (successCallback === null) {
- _ptr.readTransaction(_unwrap(callback), _unwrap(errorCallback));
- return;
- } else {
- _ptr.readTransaction(_unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.readTransaction(_unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
+ return;
}
void transaction(SQLTransactionCallback callback, [SQLTransactionErrorCallback errorCallback = null, VoidCallback successCallback = null]) {
- if (errorCallback === null) {
- if (successCallback === null) {
- _ptr.transaction(_unwrap(callback));
- return;
- }
- } else {
- if (successCallback === null) {
- _ptr.transaction(_unwrap(callback), _unwrap(errorCallback));
- return;
- } else {
- _ptr.transaction(_unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.transaction(_unwrap(callback), _unwrap(errorCallback), _unwrap(successCallback));
+ return;
}
}
@@ -6542,13 +6474,8 @@ class _DatabaseSyncImpl extends _DOMTypeBase implements DatabaseSync {
String get version() => _wrap(_ptr.version);
void changeVersion(String oldVersion, String newVersion, [SQLTransactionSyncCallback callback = null]) {
- if (callback === null) {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion));
- return;
- } else {
- _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback));
- return;
- }
+ _ptr.changeVersion(_unwrap(oldVersion), _unwrap(newVersion), _unwrap(callback));
+ return;
}
void readTransaction(SQLTransactionSyncCallback callback) {
@@ -6738,20 +6665,8 @@ class _DirectoryEntryImpl extends _EntryImpl implements DirectoryEntry {
}
}
} else {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.getDirectory(_unwrap(path), _unwrap(flags));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.getDirectory(_unwrap(path), _unwrap(flags), _unwrap(successCallback));
- return;
- } else {
- _ptr.getDirectory(_unwrap(path), _unwrap(flags), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
+ _ptr.getDirectory(_unwrap(path), _unwrap(flags), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
throw "Incorrect number or type of arguments";
}
@@ -6765,32 +6680,15 @@ class _DirectoryEntryImpl extends _EntryImpl implements DirectoryEntry {
}
}
} else {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.getFile(_unwrap(path), _unwrap(flags));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.getFile(_unwrap(path), _unwrap(flags), _unwrap(successCallback));
- return;
- } else {
- _ptr.getFile(_unwrap(path), _unwrap(flags), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
+ _ptr.getFile(_unwrap(path), _unwrap(flags), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
throw "Incorrect number or type of arguments";
}
void removeRecursively(VoidCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.removeRecursively(_unwrap(successCallback));
- return;
- } else {
- _ptr.removeRecursively(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.removeRecursively(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -6819,13 +6717,8 @@ class _DirectoryReaderImpl extends _DOMTypeBase implements DirectoryReader {
_DirectoryReaderImpl._wrap(ptr) : super._wrap(ptr);
void readEntries(EntriesCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.readEntries(_unwrap(successCallback));
- return;
- } else {
- _ptr.readEntries(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.readEntries(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -8750,50 +8643,20 @@ class _EntryImpl extends _DOMTypeBase implements Entry {
}
}
} else {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.copyTo(_unwrap(parent), _unwrap(name));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.copyTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback));
- return;
- } else {
- _ptr.copyTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
+ _ptr.copyTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
throw "Incorrect number or type of arguments";
}
void getMetadata(MetadataCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.getMetadata(_unwrap(successCallback));
- return;
- } else {
- _ptr.getMetadata(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.getMetadata(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
void getParent([EntryCallback successCallback = null, ErrorCallback errorCallback = null]) {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.getParent();
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.getParent(_unwrap(successCallback));
- return;
- } else {
- _ptr.getParent(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.getParent(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
void moveTo(DirectoryEntry parent, [String name = null, EntryCallback successCallback = null, ErrorCallback errorCallback = null]) {
@@ -8805,32 +8668,15 @@ class _EntryImpl extends _DOMTypeBase implements Entry {
}
}
} else {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.moveTo(_unwrap(parent), _unwrap(name));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.moveTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback));
- return;
- } else {
- _ptr.moveTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
+ _ptr.moveTo(_unwrap(parent), _unwrap(name), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
throw "Incorrect number or type of arguments";
}
void remove(VoidCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.remove(_unwrap(successCallback));
- return;
- } else {
- _ptr.remove(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.remove(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
String toURL() {
@@ -9212,23 +9058,13 @@ class _FileEntryImpl extends _EntryImpl implements FileEntry {
_FileEntryImpl._wrap(ptr) : super._wrap(ptr);
void createWriter(FileWriterCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.createWriter(_unwrap(successCallback));
- return;
- } else {
- _ptr.createWriter(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.createWriter(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
void file(FileCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.file(_unwrap(successCallback));
- return;
- } else {
- _ptr.file(_unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.file(_unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -10235,18 +10071,10 @@ class _IDBDatabaseImpl extends _EventTargetImpl implements IDBDatabase {
IDBTransaction transaction(storeName_OR_storeNames, [int mode = null]) {
if (storeName_OR_storeNames is List<String>) {
- if (mode === null) {
- return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames)));
- } else {
- return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames), _unwrap(mode)));
- }
+ return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames), _unwrap(mode)));
} else {
if (storeName_OR_storeNames is String) {
- if (mode === null) {
- return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames)));
- } else {
- return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames), _unwrap(mode)));
- }
+ return _wrap(_ptr.transaction(_unwrap(storeName_OR_storeNames), _unwrap(mode)));
}
}
throw "Incorrect number or type of arguments";
@@ -12663,13 +12491,8 @@ class _NavigatorImpl extends _DOMTypeBase implements Navigator {
}
void webkitGetUserMedia(Map options, NavigatorUserMediaSuccessCallback successCallback, [NavigatorUserMediaErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.webkitGetUserMedia(_unwrap(options), _unwrap(successCallback));
- return;
- } else {
- _ptr.webkitGetUserMedia(_unwrap(options), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.webkitGetUserMedia(_unwrap(options), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -13682,21 +13505,8 @@ class _PointerLockImpl extends _DOMTypeBase implements PointerLock {
bool get isLocked() => _wrap(_ptr.isLocked);
void lock(Element target, [VoidCallback successCallback = null, VoidCallback failureCallback = null]) {
- if (successCallback === null) {
- if (failureCallback === null) {
- _ptr.lock(_unwrap(target));
- return;
- }
- } else {
- if (failureCallback === null) {
- _ptr.lock(_unwrap(target), _unwrap(successCallback));
- return;
- } else {
- _ptr.lock(_unwrap(target), _unwrap(successCallback), _unwrap(failureCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.lock(_unwrap(target), _unwrap(successCallback), _unwrap(failureCallback));
+ return;
}
void unlock() {
@@ -18768,39 +18578,13 @@ class _StorageInfoImpl extends _DOMTypeBase implements StorageInfo {
_StorageInfoImpl._wrap(ptr) : super._wrap(ptr);
void queryUsageAndQuota(int storageType, [StorageInfoUsageCallback usageCallback = null, StorageInfoErrorCallback errorCallback = null]) {
- if (usageCallback === null) {
- if (errorCallback === null) {
- _ptr.queryUsageAndQuota(_unwrap(storageType));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.queryUsageAndQuota(_unwrap(storageType), _unwrap(usageCallback));
- return;
- } else {
- _ptr.queryUsageAndQuota(_unwrap(storageType), _unwrap(usageCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.queryUsageAndQuota(_unwrap(storageType), _unwrap(usageCallback), _unwrap(errorCallback));
+ return;
}
void requestQuota(int storageType, int newQuotaInBytes, [StorageInfoQuotaCallback quotaCallback = null, StorageInfoErrorCallback errorCallback = null]) {
- if (quotaCallback === null) {
- if (errorCallback === null) {
- _ptr.requestQuota(_unwrap(storageType), _unwrap(newQuotaInBytes));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.requestQuota(_unwrap(storageType), _unwrap(newQuotaInBytes), _unwrap(quotaCallback));
- return;
- } else {
- _ptr.requestQuota(_unwrap(storageType), _unwrap(newQuotaInBytes), _unwrap(quotaCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.requestQuota(_unwrap(storageType), _unwrap(newQuotaInBytes), _unwrap(quotaCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -21626,11 +21410,7 @@ class _WindowImpl extends _EventTargetImpl implements Window {
}
Database openDatabase(String name, String version, String displayName, int estimatedSize, [DatabaseCallback creationCallback = null]) {
- if (creationCallback === null) {
- return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize)));
- } else {
- return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
- }
+ return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
}
void postMessage(/*SerializedScriptValue*/ message, String targetOrigin, [List messagePorts = null]) {
@@ -21753,31 +21533,13 @@ class _WindowImpl extends _EventTargetImpl implements Window {
}
void webkitRequestFileSystem(int type, int size, FileSystemCallback successCallback, [ErrorCallback errorCallback = null]) {
- if (errorCallback === null) {
- _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback));
- return;
- } else {
- _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
+ _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
void webkitResolveLocalFileSystemURL(String url, [EntryCallback successCallback = null, ErrorCallback errorCallback = null]) {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback));
- return;
- } else {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
@@ -22027,19 +21789,11 @@ class _WorkerContextImpl extends _EventTargetImpl implements WorkerContext {
}
Database openDatabase(String name, String version, String displayName, int estimatedSize, [DatabaseCallback creationCallback = null]) {
- if (creationCallback === null) {
- return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize)));
- } else {
- return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
- }
+ return _wrap(_ptr.openDatabase(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
}
DatabaseSync openDatabaseSync(String name, String version, String displayName, int estimatedSize, [DatabaseCallback creationCallback = null]) {
- if (creationCallback === null) {
- return _wrap(_ptr.openDatabaseSync(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize)));
- } else {
- return _wrap(_ptr.openDatabaseSync(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
- }
+ return _wrap(_ptr.openDatabaseSync(_unwrap(name), _unwrap(version), _unwrap(displayName), _unwrap(estimatedSize), _unwrap(creationCallback)));
}
void $dom_removeEventListener(String type, EventListener listener, [bool useCapture = null]) {
@@ -22061,21 +21815,8 @@ class _WorkerContextImpl extends _EventTargetImpl implements WorkerContext {
}
void webkitRequestFileSystem(int type, int size, [FileSystemCallback successCallback = null, ErrorCallback errorCallback = null]) {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback));
- return;
- } else {
- _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.webkitRequestFileSystem(_unwrap(type), _unwrap(size), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
DOMFileSystemSync webkitRequestFileSystemSync(int type, int size) {
@@ -22087,21 +21828,8 @@ class _WorkerContextImpl extends _EventTargetImpl implements WorkerContext {
}
void webkitResolveLocalFileSystemURL(String url, [EntryCallback successCallback = null, ErrorCallback errorCallback = null]) {
- if (successCallback === null) {
- if (errorCallback === null) {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url));
- return;
- }
- } else {
- if (errorCallback === null) {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback));
- return;
- } else {
- _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback), _unwrap(errorCallback));
- return;
- }
- }
- throw "Incorrect number or type of arguments";
+ _ptr.webkitResolveLocalFileSystemURL(_unwrap(url), _unwrap(successCallback), _unwrap(errorCallback));
+ return;
}
}
« lib/dom/scripts/generator.py ('K') | « lib/dom/scripts/systemwrapping.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698