| Index: sdk/lib/web_sql/dartium/web_sql_dartium.dart
|
| diff --git a/sdk/lib/web_sql/dartium/web_sql_dartium.dart b/sdk/lib/web_sql/dartium/web_sql_dartium.dart
|
| index ee79e22e3c7b00cda832750423e3e32f9b658bbb..4a310374ca21ac3d1aadeabf02c813bc60d43d9d 100644
|
| --- a/sdk/lib/web_sql/dartium/web_sql_dartium.dart
|
| +++ b/sdk/lib/web_sql/dartium/web_sql_dartium.dart
|
| @@ -121,56 +121,53 @@ class SqlDatabase extends DartHtmlDomObject {
|
| @Deprecated("Internal Use Only")
|
| SqlDatabase.internal_() { }
|
|
|
| - bool operator ==(other) => unwrap_jso(other) == unwrap_jso(this) || identical(this, other);
|
| - int get hashCode => unwrap_jso(this).hashCode;
|
| -
|
| /// Checks if this type is supported on the current platform.
|
| static bool get supported => true;
|
|
|
| @DomName('Database.version')
|
| @DocsEditable()
|
| - String get version => _blink.BlinkDatabase.instance.version_Getter_(unwrap_jso(this));
|
| + String get version => _blink.BlinkDatabase.instance.version_Getter_(this);
|
|
|
| void changeVersion(String oldVersion, String newVersion, [SqlTransactionCallback callback, SqlTransactionErrorCallback errorCallback, VoidCallback successCallback]) {
|
| if (successCallback != null) {
|
| - _blink.BlinkDatabase.instance.changeVersion_Callback_5_(unwrap_jso(this), oldVersion, newVersion, unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))), unwrap_jso(() => successCallback()));
|
| + _blink.BlinkDatabase.instance.changeVersion_Callback_5_(this, oldVersion, newVersion, callback, errorCallback, successCallback);
|
| return;
|
| }
|
| if (errorCallback != null) {
|
| - _blink.BlinkDatabase.instance.changeVersion_Callback_4_(unwrap_jso(this), oldVersion, newVersion, unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))));
|
| + _blink.BlinkDatabase.instance.changeVersion_Callback_4_(this, oldVersion, newVersion, callback, errorCallback);
|
| return;
|
| }
|
| if (callback != null) {
|
| - _blink.BlinkDatabase.instance.changeVersion_Callback_3_(unwrap_jso(this), oldVersion, newVersion, unwrap_jso((transaction) => callback(wrap_jso(transaction))));
|
| + _blink.BlinkDatabase.instance.changeVersion_Callback_3_(this, oldVersion, newVersion, callback);
|
| return;
|
| }
|
| - _blink.BlinkDatabase.instance.changeVersion_Callback_2_(unwrap_jso(this), oldVersion, newVersion);
|
| + _blink.BlinkDatabase.instance.changeVersion_Callback_2_(this, oldVersion, newVersion);
|
| return;
|
| }
|
|
|
| void readTransaction(SqlTransactionCallback callback, [SqlTransactionErrorCallback errorCallback, VoidCallback successCallback]) {
|
| if (successCallback != null) {
|
| - _blink.BlinkDatabase.instance.readTransaction_Callback_3_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))), unwrap_jso(() => successCallback()));
|
| + _blink.BlinkDatabase.instance.readTransaction_Callback_3_(this, callback, errorCallback, successCallback);
|
| return;
|
| }
|
| if (errorCallback != null) {
|
| - _blink.BlinkDatabase.instance.readTransaction_Callback_2_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))));
|
| + _blink.BlinkDatabase.instance.readTransaction_Callback_2_(this, callback, errorCallback);
|
| return;
|
| }
|
| - _blink.BlinkDatabase.instance.readTransaction_Callback_1_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))));
|
| + _blink.BlinkDatabase.instance.readTransaction_Callback_1_(this, callback);
|
| return;
|
| }
|
|
|
| void transaction(SqlTransactionCallback callback, [SqlTransactionErrorCallback errorCallback, VoidCallback successCallback]) {
|
| if (successCallback != null) {
|
| - _blink.BlinkDatabase.instance.transaction_Callback_3_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))), unwrap_jso(() => successCallback()));
|
| + _blink.BlinkDatabase.instance.transaction_Callback_3_(this, callback, errorCallback, successCallback);
|
| return;
|
| }
|
| if (errorCallback != null) {
|
| - _blink.BlinkDatabase.instance.transaction_Callback_2_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))), unwrap_jso((error) => errorCallback(wrap_jso(error))));
|
| + _blink.BlinkDatabase.instance.transaction_Callback_2_(this, callback, errorCallback);
|
| return;
|
| }
|
| - _blink.BlinkDatabase.instance.transaction_Callback_1_(unwrap_jso(this), unwrap_jso((transaction) => callback(wrap_jso(transaction))));
|
| + _blink.BlinkDatabase.instance.transaction_Callback_1_(this, callback);
|
| return;
|
| }
|
|
|
| @@ -202,9 +199,6 @@ class SqlError extends DartHtmlDomObject {
|
| @Deprecated("Internal Use Only")
|
| SqlError.internal_() { }
|
|
|
| - bool operator ==(other) => unwrap_jso(other) == unwrap_jso(this) || identical(this, other);
|
| - int get hashCode => unwrap_jso(this).hashCode;
|
| -
|
| @DomName('SQLError.CONSTRAINT_ERR')
|
| @DocsEditable()
|
| static const int CONSTRAINT_ERR = 6;
|
| @@ -239,11 +233,11 @@ class SqlError extends DartHtmlDomObject {
|
|
|
| @DomName('SQLError.code')
|
| @DocsEditable()
|
| - int get code => _blink.BlinkSQLError.instance.code_Getter_(unwrap_jso(this));
|
| + int get code => _blink.BlinkSQLError.instance.code_Getter_(this);
|
|
|
| @DomName('SQLError.message')
|
| @DocsEditable()
|
| - String get message => _blink.BlinkSQLError.instance.message_Getter_(unwrap_jso(this));
|
| + String get message => _blink.BlinkSQLError.instance.message_Getter_(this);
|
|
|
| }
|
| // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
| @@ -273,20 +267,17 @@ class SqlResultSet extends DartHtmlDomObject {
|
| @Deprecated("Internal Use Only")
|
| SqlResultSet.internal_() { }
|
|
|
| - bool operator ==(other) => unwrap_jso(other) == unwrap_jso(this) || identical(this, other);
|
| - int get hashCode => unwrap_jso(this).hashCode;
|
| -
|
| @DomName('SQLResultSet.insertId')
|
| @DocsEditable()
|
| - int get insertId => _blink.BlinkSQLResultSet.instance.insertId_Getter_(unwrap_jso(this));
|
| + int get insertId => _blink.BlinkSQLResultSet.instance.insertId_Getter_(this);
|
|
|
| @DomName('SQLResultSet.rows')
|
| @DocsEditable()
|
| - SqlResultSetRowList get rows => wrap_jso(_blink.BlinkSQLResultSet.instance.rows_Getter_(unwrap_jso(this)));
|
| + SqlResultSetRowList get rows => _blink.BlinkSQLResultSet.instance.rows_Getter_(this);
|
|
|
| @DomName('SQLResultSet.rowsAffected')
|
| @DocsEditable()
|
| - int get rowsAffected => _blink.BlinkSQLResultSet.instance.rowsAffected_Getter_(unwrap_jso(this));
|
| + int get rowsAffected => _blink.BlinkSQLResultSet.instance.rowsAffected_Getter_(this);
|
|
|
| }
|
| // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
| @@ -316,20 +307,17 @@ class SqlResultSetRowList extends DartHtmlDomObject with ListMixin<Map>, Immutab
|
| @Deprecated("Internal Use Only")
|
| SqlResultSetRowList.internal_() { }
|
|
|
| - bool operator ==(other) => unwrap_jso(other) == unwrap_jso(this) || identical(this, other);
|
| - int get hashCode => unwrap_jso(this).hashCode;
|
| -
|
| @DomName('SQLResultSetRowList.length')
|
| @DocsEditable()
|
| - int get length => _blink.BlinkSQLResultSetRowList.instance.length_Getter_(unwrap_jso(this));
|
| + int get length => _blink.BlinkSQLResultSetRowList.instance.length_Getter_(this);
|
|
|
| Map operator[](int index) {
|
| if (index < 0 || index >= length)
|
| throw new RangeError.index(index, this);
|
| - return wrap_jso(_blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(unwrap_jso(this), index));
|
| + return _blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(this, index);
|
| }
|
|
|
| - Map _nativeIndexedGetter(int index) => wrap_jso(_blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(unwrap_jso(this), index));
|
| + Map _nativeIndexedGetter(int index) => _blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(this, index);
|
|
|
| void operator[]=(int index, Map value) {
|
| throw new UnsupportedError("Cannot assign element of immutable List.");
|
| @@ -371,7 +359,7 @@ class SqlResultSetRowList extends DartHtmlDomObject with ListMixin<Map>, Immutab
|
|
|
| @DomName('SQLResultSetRowList.item')
|
| @DocsEditable()
|
| - Object item(int index) => wrap_jso(_blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(unwrap_jso(this), index));
|
| + Object item(int index) => (_blink.BlinkSQLResultSetRowList.instance.item_Callback_1_(this, index));
|
|
|
| }
|
| // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
| @@ -404,23 +392,20 @@ class SqlTransaction extends DartHtmlDomObject {
|
| @Deprecated("Internal Use Only")
|
| SqlTransaction.internal_() { }
|
|
|
| - bool operator ==(other) => unwrap_jso(other) == unwrap_jso(this) || identical(this, other);
|
| - int get hashCode => unwrap_jso(this).hashCode;
|
| -
|
| void executeSql(String sqlStatement, [List arguments, SqlStatementCallback callback, SqlStatementErrorCallback errorCallback]) {
|
| if (errorCallback != null) {
|
| - _blink.BlinkSQLTransaction.instance.executeSql_Callback_4_(unwrap_jso(this), sqlStatement, arguments, unwrap_jso((transaction, resultSet) => callback(wrap_jso(transaction), wrap_jso(resultSet))), unwrap_jso((transaction, error) => errorCallback(wrap_jso(transaction), wrap_jso(error))));
|
| + _blink.BlinkSQLTransaction.instance.executeSql_Callback_4_(this, sqlStatement, arguments, callback, errorCallback);
|
| return;
|
| }
|
| if (callback != null) {
|
| - _blink.BlinkSQLTransaction.instance.executeSql_Callback_3_(unwrap_jso(this), sqlStatement, arguments, unwrap_jso((transaction, resultSet) => callback(wrap_jso(transaction), wrap_jso(resultSet))));
|
| + _blink.BlinkSQLTransaction.instance.executeSql_Callback_3_(this, sqlStatement, arguments, callback);
|
| return;
|
| }
|
| if (arguments != null) {
|
| - _blink.BlinkSQLTransaction.instance.executeSql_Callback_2_(unwrap_jso(this), sqlStatement, arguments);
|
| + _blink.BlinkSQLTransaction.instance.executeSql_Callback_2_(this, sqlStatement, arguments);
|
| return;
|
| }
|
| - _blink.BlinkSQLTransaction.instance.executeSql_Callback_1_(unwrap_jso(this), sqlStatement);
|
| + _blink.BlinkSQLTransaction.instance.executeSql_Callback_1_(this, sqlStatement);
|
| return;
|
| }
|
|
|
|
|