Revert "Create IterableMixinWorkaround and move most of the Collections methods there."

sdk/lib/svg/dartium/svg_dartium.dart

 library svg;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:html';
 import 'dart:html_common';
 import 'dart:nativewrappers';
 // DO NOT EDIT
 // Auto-generated dart:svg library.
 
@@ skipping 3773 matching lines @@
   Iterator<Length> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<Length>(this);
   }
 
   // SVG Collections expose numberOfItems rather than length.
   int get length => numberOfItems;
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, Length)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(Length element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(Length element) => Collections.contains(this, element);
 
-  void forEach(void f(Length element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(Length element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(Length element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(Length element)) => new MappedList<Length, dynamic>(this, f);
 
-  Iterable<Length> where(bool f(Length element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<Length> where(bool f(Length element)) => new WhereIterable<Length>(this, f);
 
-  bool every(bool f(Length element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(Length element)) => Collections.every(this, f);
 
-  bool any(bool f(Length element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(Length element)) => Collections.any(this, f);
 
   List<Length> toList() => new List<Length>.from(this);
   Set<Length> toSet() => new Set<Length>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<Length> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<Length> take(int n) => new ListView<Length>(this, 0, n);
 
   Iterable<Length> takeWhile(bool test(Length value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<Length>(this, test);
   }
 
-  List<Length> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<Length> skip(int n) => new ListView<Length>(this, n, null);
 
   Iterable<Length> skipWhile(bool test(Length value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<Length>(this, test);
   }
 
   Length firstMatching(bool test(Length value), { Length orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   Length lastMatching(bool test(Length value), {Length orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   Length singleMatching(bool test(Length value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   Length elementAt(int index) {
     return this[index];
   }
 
   // From Collection<Length>:
 
   void add(Length value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 35 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   Length get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  Length min([int compare(Length a, Length b)]) => IterableMixinWorkaround.min(this, compare);
+  Length min([int compare(Length a, Length b)]) => Collections.min(this, compare);
 
-  Length max([int compare(Length a, Length b)]) => IterableMixinWorkaround.max(this, compare);
+  Length max([int compare(Length a, Length b)]) => Collections.max(this, compare);
 
   Length removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   Length removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<Length> from, [int startFrom]) {
@@ skipping 616 matching lines @@
   Iterator<Number> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<Number>(this);
   }
 
   // SVG Collections expose numberOfItems rather than length.
   int get length => numberOfItems;
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, Number)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(Number element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(Number element) => Collections.contains(this, element);
 
-  void forEach(void f(Number element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(Number element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(Number element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(Number element)) => new MappedList<Number, dynamic>(this, f);
 
-  Iterable<Number> where(bool f(Number element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<Number> where(bool f(Number element)) => new WhereIterable<Number>(this, f);
 
-  bool every(bool f(Number element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(Number element)) => Collections.every(this, f);
 
-  bool any(bool f(Number element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(Number element)) => Collections.any(this, f);
 
   List<Number> toList() => new List<Number>.from(this);
   Set<Number> toSet() => new Set<Number>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<Number> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<Number> take(int n) => new ListView<Number>(this, 0, n);
 
   Iterable<Number> takeWhile(bool test(Number value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<Number>(this, test);
   }
 
-  List<Number> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<Number> skip(int n) => new ListView<Number>(this, n, null);
 
   Iterable<Number> skipWhile(bool test(Number value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<Number>(this, test);
   }
 
   Number firstMatching(bool test(Number value), { Number orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   Number lastMatching(bool test(Number value), {Number orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   Number singleMatching(bool test(Number value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   Number elementAt(int index) {
     return this[index];
   }
 
   // From Collection<Number>:
 
   void add(Number value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 35 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   Number get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  Number min([int compare(Number a, Number b)]) => IterableMixinWorkaround.min(this, compare);
+  Number min([int compare(Number a, Number b)]) => Collections.min(this, compare);
 
-  Number max([int compare(Number a, Number b)]) => IterableMixinWorkaround.max(this, compare);
+  Number max([int compare(Number a, Number b)]) => Collections.max(this, compare);
 
   Number removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   Number removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<Number> from, [int startFrom]) {
@@ skipping 1034 matching lines @@
   Iterator<PathSeg> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<PathSeg>(this);
   }
 
   // SVG Collections expose numberOfItems rather than length.
   int get length => numberOfItems;
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, PathSeg)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(PathSeg element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(PathSeg element) => Collections.contains(this, element);
 
-  void forEach(void f(PathSeg element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(PathSeg element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(PathSeg element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(PathSeg element)) => new MappedList<PathSeg, dynamic>(this, f);
 
-  Iterable<PathSeg> where(bool f(PathSeg element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<PathSeg> where(bool f(PathSeg element)) => new WhereIterable<PathSeg>(this, f);
 
-  bool every(bool f(PathSeg element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(PathSeg element)) => Collections.every(this, f);
 
-  bool any(bool f(PathSeg element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(PathSeg element)) => Collections.any(this, f);
 
   List<PathSeg> toList() => new List<PathSeg>.from(this);
   Set<PathSeg> toSet() => new Set<PathSeg>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<PathSeg> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<PathSeg> take(int n) => new ListView<PathSeg>(this, 0, n);
 
   Iterable<PathSeg> takeWhile(bool test(PathSeg value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<PathSeg>(this, test);
   }
 
-  List<PathSeg> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<PathSeg> skip(int n) => new ListView<PathSeg>(this, n, null);
 
   Iterable<PathSeg> skipWhile(bool test(PathSeg value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<PathSeg>(this, test);
   }
 
   PathSeg firstMatching(bool test(PathSeg value), { PathSeg orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   PathSeg lastMatching(bool test(PathSeg value), {PathSeg orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   PathSeg singleMatching(bool test(PathSeg value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   PathSeg elementAt(int index) {
     return this[index];
   }
 
   // From Collection<PathSeg>:
 
   void add(PathSeg value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 35 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   PathSeg get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  PathSeg min([int compare(PathSeg a, PathSeg b)]) => IterableMixinWorkaround.min(this, compare);
+  PathSeg min([int compare(PathSeg a, PathSeg b)]) => Collections.min(this, compare);
 
-  PathSeg max([int compare(PathSeg a, PathSeg b)]) => IterableMixinWorkaround.max(this, compare);
+  PathSeg max([int compare(PathSeg a, PathSeg b)]) => Collections.max(this, compare);
 
   PathSeg removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   PathSeg removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<PathSeg> from, [int startFrom]) {
@@ skipping 874 matching lines @@
   Iterator<String> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<String>(this);
   }
 
   // SVG Collections expose numberOfItems rather than length.
   int get length => numberOfItems;
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, String)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(String element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(String element) => Collections.contains(this, element);
 
-  void forEach(void f(String element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(String element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(String element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(String element)) => new MappedList<String, dynamic>(this, f);
 
-  Iterable<String> where(bool f(String element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<String> where(bool f(String element)) => new WhereIterable<String>(this, f);
 
-  bool every(bool f(String element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(String element)) => Collections.every(this, f);
 
-  bool any(bool f(String element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(String element)) => Collections.any(this, f);
 
   List<String> toList() => new List<String>.from(this);
   Set<String> toSet() => new Set<String>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<String> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<String> take(int n) => new ListView<String>(this, 0, n);
 
   Iterable<String> takeWhile(bool test(String value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<String>(this, test);
   }
 
-  List<String> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<String> skip(int n) => new ListView<String>(this, n, null);
 
   Iterable<String> skipWhile(bool test(String value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<String>(this, test);
   }
 
   String firstMatching(bool test(String value), { String orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   String lastMatching(bool test(String value), {String orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   String singleMatching(bool test(String value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   String elementAt(int index) {
     return this[index];
   }
 
   // From Collection<String>:
 
   void add(String value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 35 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   String get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  String min([int compare(String a, String b)]) => IterableMixinWorkaround.min(this, compare);
+  String min([int compare(String a, String b)]) => Collections.min(this, compare);
 
-  String max([int compare(String a, String b)]) => IterableMixinWorkaround.max(this, compare);
+  String max([int compare(String a, String b)]) => Collections.max(this, compare);
 
   String removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   String removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<String> from, [int startFrom]) {
@@ skipping 1171 matching lines @@
   Iterator<Transform> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<Transform>(this);
   }
 
   // SVG Collections expose numberOfItems rather than length.
   int get length => numberOfItems;
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, Transform)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(Transform element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(Transform element) => Collections.contains(this, element);
 
-  void forEach(void f(Transform element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(Transform element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(Transform element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(Transform element)) => new MappedList<Transform, dynamic>(this, f);
 
-  Iterable<Transform> where(bool f(Transform element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<Transform> where(bool f(Transform element)) => new WhereIterable<Transform>(this, f);
 
-  bool every(bool f(Transform element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(Transform element)) => Collections.every(this, f);
 
-  bool any(bool f(Transform element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(Transform element)) => Collections.any(this, f);
 
   List<Transform> toList() => new List<Transform>.from(this);
   Set<Transform> toSet() => new Set<Transform>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<Transform> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<Transform> take(int n) => new ListView<Transform>(this, 0, n);
 
   Iterable<Transform> takeWhile(bool test(Transform value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<Transform>(this, test);
   }
 
-  List<Transform> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<Transform> skip(int n) => new ListView<Transform>(this, n, null);
 
   Iterable<Transform> skipWhile(bool test(Transform value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<Transform>(this, test);
   }
 
   Transform firstMatching(bool test(Transform value), { Transform orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   Transform lastMatching(bool test(Transform value), {Transform orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   Transform singleMatching(bool test(Transform value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   Transform elementAt(int index) {
     return this[index];
   }
 
   // From Collection<Transform>:
 
   void add(Transform value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 35 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   Transform get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  Transform min([int compare(Transform a, Transform b)]) => IterableMixinWorkaround.min(this, compare);
+  Transform min([int compare(Transform a, Transform b)]) => Collections.min(this, compare);
 
-  Transform max([int compare(Transform a, Transform b)]) => IterableMixinWorkaround.max(this, compare);
+  Transform max([int compare(Transform a, Transform b)]) => Collections.max(this, compare);
 
   Transform removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   Transform removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<Transform> from, [int startFrom]) {
@@ skipping 443 matching lines @@
   // From Iterable<ElementInstance>:
 
   Iterator<ElementInstance> get iterator {
     // Note: NodeLists are not fixed size. And most probably length shouldn't
     // be cached in both iterator _and_ forEach method. For now caching it
     // for consistency.
     return new FixedSizeListIterator<ElementInstance>(this);
   }
 
   dynamic reduce(dynamic initialValue, dynamic combine(dynamic, ElementInstance)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
-  bool contains(ElementInstance element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(ElementInstance element) => Collections.contains(this, element);
 
-  void forEach(void f(ElementInstance element)) => IterableMixinWorkaround.forEach(this, f);
+  void forEach(void f(ElementInstance element)) => Collections.forEach(this, f);
 
-  String join([String separator]) => IterableMixinWorkaround.joinList(this, separator);
+  String join([String separator]) => Collections.joinList(this, separator);
 
-  List mappedBy(f(ElementInstance element)) => IterableMixinWorkaround.mappedByList(this, f);
+  List mappedBy(f(ElementInstance element)) => new MappedList<ElementInstance, dynamic>(this, f);
 
-  Iterable<ElementInstance> where(bool f(ElementInstance element)) => IterableMixinWorkaround.where(this, f);
+  Iterable<ElementInstance> where(bool f(ElementInstance element)) => new WhereIterable<ElementInstance>(this, f);
 
-  bool every(bool f(ElementInstance element)) => IterableMixinWorkaround.every(this, f);
+  bool every(bool f(ElementInstance element)) => Collections.every(this, f);
 
-  bool any(bool f(ElementInstance element)) => IterableMixinWorkaround.any(this, f);
+  bool any(bool f(ElementInstance element)) => Collections.any(this, f);
 
   List<ElementInstance> toList() => new List<ElementInstance>.from(this);
   Set<ElementInstance> toSet() => new Set<ElementInstance>.from(this);
 
   bool get isEmpty => this.length == 0;
 
-  List<ElementInstance> take(int n) => IterableMixinWorkaround.takeList(this, n);
+  List<ElementInstance> take(int n) => new ListView<ElementInstance>(this, 0, n);
 
   Iterable<ElementInstance> takeWhile(bool test(ElementInstance value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<ElementInstance>(this, test);
   }
 
-  List<ElementInstance> skip(int n) => IterableMixinWorkaround.skipList(this, n);
+  List<ElementInstance> skip(int n) => new ListView<ElementInstance>(this, n, null);
 
   Iterable<ElementInstance> skipWhile(bool test(ElementInstance value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<ElementInstance>(this, test);
   }
 
   ElementInstance firstMatching(bool test(ElementInstance value), { ElementInstance orElse() }) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   ElementInstance lastMatching(bool test(ElementInstance value), {ElementInstance orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   ElementInstance singleMatching(bool test(ElementInstance value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   ElementInstance elementAt(int index) {
     return this[index];
   }
 
   // From Collection<ElementInstance>:
 
   void add(ElementInstance value) {
     throw new UnsupportedError("Cannot add to immutable List.");
@@ skipping 37 matching lines @@
     if (this.length > 0) return this[this.length - 1];
     throw new StateError("No elements");
   }
 
   ElementInstance get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  ElementInstance min([int compare(ElementInstance a, ElementInstance b)]) => IterableMixinWorkaround.min(this, compare);
+  ElementInstance min([int compare(ElementInstance a, ElementInstance b)]) => Collections.min(this, compare);
 
-  ElementInstance max([int compare(ElementInstance a, ElementInstance b)]) => IterableMixinWorkaround.max(this, compare);
+  ElementInstance max([int compare(ElementInstance a, ElementInstance b)]) => Collections.max(this, compare);
 
   ElementInstance removeAt(int pos) {
     throw new UnsupportedError("Cannot removeAt on immutable List.");
   }
 
   ElementInstance removeLast() {
     throw new UnsupportedError("Cannot removeLast on immutable List.");
   }
 
   void setRange(int start, int rangeLength, List<ElementInstance> from, [int startFrom]) {
@@ skipping 11 matching lines @@
   List<ElementInstance> getRange(int start, int rangeLength) =>
       Lists.getRange(this, start, rangeLength, <ElementInstance>[]);
 
   // -- end List<ElementInstance> mixins.
 
   @DocsEditable
   @DomName('SVGElementInstanceList.item')
   ElementInstance item(int index) native "SVGElementInstanceList_item_Callback";
 
 }