Fixed bad indent not flushing emitted files.
Removed Dartium code emission.
TBR: alanknight@google.com,vsm@google.com
Change-Id: Ib027f542b238c90311f6838e67b4b8d27815374c
Reviewed-on: https://dart-review.googlesource.com/3280
Reviewed-by: Vijay Menon <vsm@google.com>
Commit-Queue: Terry Lucas <terry@google.com>
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 88e3782..929bf9b 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -38987,8 +38987,7 @@
const _BeforeUnloadEventStreamProvider(this._eventType);
Stream<BeforeUnloadEvent> forTarget(EventTarget e, {bool useCapture: false}) {
- // Specify the generic type for EventStream only in dart2js to avoid
- // checked mode errors in dartium.
+ // Specify the generic type for EventStream only in dart2js.
var stream = new _EventStream<BeforeUnloadEvent>(e, _eventType, useCapture);
var controller = new StreamController<BeforeUnloadEvent>(sync: true);
@@ -39006,16 +39005,14 @@
ElementStream<BeforeUnloadEvent> forElement(Element e,
{bool useCapture: false}) {
- // Specify the generic type for _ElementEventStreamImpl only in dart2js to
- // avoid checked mode errors in dartium.
+ // Specify the generic type for _ElementEventStreamImpl only in dart2js.
return new _ElementEventStreamImpl<BeforeUnloadEvent>(
e, _eventType, useCapture);
}
ElementStream<BeforeUnloadEvent> _forElementList(ElementList e,
{bool useCapture: false}) {
- // Specify the generic type for _ElementEventStreamImpl only in dart2js to
- // avoid checked mode errors in dartium.
+ // Specify the generic type for _ElementEventStreamImpl only in dart2js.
return new _ElementListEventStreamImpl<BeforeUnloadEvent>(
e, _eventType, useCapture);
}
diff --git a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
index c540bb0..021a302 100644
--- a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
+++ b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart
@@ -114,9 +114,8 @@
return _cachedClass = _uncachedClass();
}
- static _uncachedClass() => JS(
- 'var',
- '''window.webkitIDBKeyRange || window.mozIDBKeyRange ||
+ static _uncachedClass() =>
+ JS('var', '''window.webkitIDBKeyRange || window.mozIDBKeyRange ||
window.msIDBKeyRange || window.IDBKeyRange''');
static _translateKey(idbkey) => idbkey; // TODO: fixme.
diff --git a/tools/dom/scripts/dartdomgenerator.py b/tools/dom/scripts/dartdomgenerator.py
index a68bdca..2a07584 100755
--- a/tools/dom/scripts/dartdomgenerator.py
+++ b/tools/dom/scripts/dartdomgenerator.py
@@ -203,7 +203,8 @@
template_loader.Load('cpp_resolver.template'), dartium_output_dir)
cpp_library_emitter.EmitClassIdTable(
webkit_database, dartium_output_dir, type_registry, renamer)
- emitters.Flush()
+
+ emitters.Flush()
if blink_output_dir:
print '\nGenerating _blink:\n'
diff --git a/tools/dom/templates/immutable_list_mixin.darttemplate b/tools/dom/templates/immutable_list_mixin.darttemplate
index 68d938f..950cae8 100644
--- a/tools/dom/templates/immutable_list_mixin.darttemplate
+++ b/tools/dom/templates/immutable_list_mixin.darttemplate
@@ -15,11 +15,6 @@
$E get first {
if (this.length > 0) {
return JS('$EJS', '#[0]', this);
-$if USE_NATIVE_INDEXED_GETTER
- return $GETTER(0);
-$else
- return this[0];
-$endif
}
throw new StateError("No elements");
}
@@ -28,11 +23,6 @@
int len = this.length;
if (len > 0) {
return JS('$EJS', '#[#]', this, len - 1);
-$if USE_NATIVE_INDEXED_GETTER
- return $GETTER(len - 1);
-$else
- return this[len - 1];
-$endif
}
throw new StateError("No elements");
}
@@ -41,11 +31,6 @@
int len = this.length;
if (len == 1) {
return JS('$EJS', '#[0]', this);
-$if USE_NATIVE_INDEXED_GETTER
- return $GETTER(0);
-$else
- return this[0];
-$endif
}
if (len == 0) throw new StateError("No elements");
throw new StateError("More than one element");