Index: sdk/lib/web_sql/dart2js/web_sql_dart2js.dart |
diff --git a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart |
index 7af7f4511fe4ab3cc7da4bda53e1636fe23c0e73..433459d49090956e3a8ba375ba2a08beac550182 100644 |
--- a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart |
+++ b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart |
@@ -15,6 +15,7 @@ import 'dart:collection'; |
import 'dart:_internal'; |
import 'dart:html'; |
import 'dart:html_common'; |
+import 'dart:_js_helper' show convertDartClosureToJS, Creates, JSName, Native; |
import 'dart:_foreign_helper' show JS; |
import 'dart:_interceptors' show Interceptor; |
// DO NOT EDIT - unless you are editing documentation as per: |
@@ -22,8 +23,6 @@ import 'dart:_interceptors' show Interceptor; |
// Auto-generated dart:audio library. |
-import 'dart:_js_helper' show convertDartClosureToJS, Creates, JSName, Native, |
- JavaScriptIndexingBehavior; |
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
@@ -210,7 +209,7 @@ class SqlResultSet extends Interceptor { |
// http://www.w3.org/TR/webdatabase/#sqlresultsetrowlist |
@Experimental() // deprecated |
@Native("SQLResultSetRowList") |
-class SqlResultSetRowList extends Interceptor with ListMixin<Map>, ImmutableListMixin<Map> implements JavaScriptIndexingBehavior, List<Map> { |
+class SqlResultSetRowList extends Interceptor with ListMixin<Map>, ImmutableListMixin<Map> implements List<Map> { |
// To suppress missing implicit constructor warnings. |
factory SqlResultSetRowList._() { throw new UnsupportedError("Not supported"); } |
@@ -222,7 +221,7 @@ class SqlResultSetRowList extends Interceptor with ListMixin<Map>, ImmutableList |
if (JS("bool", "# >>> 0 !== # || # >= #", index, |
index, index, length)) |
throw new RangeError.index(index, this); |
- return JS("Map", "#[#]", this, index); |
+ return this.item(index); |
} |
void operator[]=(int index, Map value) { |
throw new UnsupportedError("Cannot assign element of immutable List."); |
@@ -265,7 +264,14 @@ class SqlResultSetRowList extends Interceptor with ListMixin<Map>, ImmutableList |
@DomName('SQLResultSetRowList.item') |
@DocsEditable() |
@Creates('=Object') |
- Object item(int index) native; |
+ Map item(int index) { |
+ return convertNativeToDart_Dictionary(_item_1(index)); |
+ } |
+ @JSName('item') |
+ @DomName('SQLResultSetRowList.item') |
+ @DocsEditable() |
+ @Creates('=Object') |
+ _item_1(index) native; |
} |
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
// for details. All rights reserved. Use of this source code is governed by a |
@@ -286,5 +292,5 @@ class SqlTransaction extends Interceptor { |
@DomName('SQLTransaction.executeSql') |
@DocsEditable() |
- void executeSql(String sqlStatement, [List arguments, SqlStatementCallback callback, SqlStatementErrorCallback errorCallback]) native; |
+ void executeSql(String sqlStatement, List<Object> arguments, [SqlStatementCallback callback, SqlStatementErrorCallback errorCallback]) native; |
} |