Big merge from experimental to bleeding edge.

tools/dom/src/CssClassSet.dart

 // 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
 // BSD-style license that can be found in the LICENSE file.
 
 part of html;
 
 abstract class CssClassSet implements Set<String> {
 
   String toString() {
     return Strings.join(new List.from(readClasses()), ' ');
@@ skipping 16 matching lines @@
     return result;
   }
 
   /**
    * Returns [:true:] if classes cannot be added or removed from this
    * [:CssClassSet:].
    */
   bool get frozen => false;
 
   // interface Iterable - BEGIN
-  Iterator<String> iterator() => readClasses().iterator();
+  Iterator<String> get iterator => readClasses().iterator;
   // interface Iterable - END
 
   // interface Collection - BEGIN
   void forEach(void f(String element)) {
     readClasses().forEach(f);
   }
 
-  Collection map(f(String element)) => readClasses().map(f);
+  String join([String separator]) => readClasses().join(separator);
 
-  Collection<String> filter(bool f(String element)) => readClasses().filter(f);
+  Iterable mappedBy(f(String element)) => readClasses().mappedBy(f);
+
+  Iterable<String> where(bool f(String element)) => readClasses().where(f);
 
   bool every(bool f(String element)) => readClasses().every(f);
 
-  bool some(bool f(String element)) => readClasses().some(f);
+  bool any(bool f(String element)) => readClasses().any(f);
 
   bool get isEmpty => readClasses().isEmpty;
 
   int get length =>readClasses().length;
 
   dynamic reduce(dynamic initialValue,
       dynamic combine(dynamic previousValue, String element)) {
     return readClasses().reduce(initialValue, combine);
   }
   // interface Collection - END
 
   // interface Set - BEGIN
   bool contains(String value) => readClasses().contains(value);
 
   void add(String value) {
     // TODO - figure out if we need to do any validation here
     // or if the browser natively does enough
     _modify((s) => s.add(value));
   }
 
   bool remove(String value) {
     Set<String> s = readClasses();
     bool result = s.remove(value);
     writeClasses(s);
     return result;
   }
 
-  void addAll(Collection<String> collection) {
+  void addAll(Iterable<String> iterable) {
     // TODO - see comment above about validation
-    _modify((s) => s.addAll(collection));
+    _modify((s) => s.addAll(iterable));
   }
 
-  void removeAll(Collection<String> collection) {
-    _modify((s) => s.removeAll(collection));
+  void removeAll(Iterable<String> iterable) {
+    _modify((s) => s.removeAll(iterable));
   }
 
   bool isSubsetOf(Collection<String> collection) =>
     readClasses().isSubsetOf(collection);
 
   bool containsAll(Collection<String> collection) =>
     readClasses().containsAll(collection);
 
   Set<String> intersection(Collection<String> other) =>
     readClasses().intersection(other);
@@ skipping 25 matching lines @@
    */
   Set<String> readClasses();
 
   /**
    * Join all the elements of a set into one string and write
    * back to the element.
    * This is intended to be overridden by specific implementations.
    */
   void writeClasses(Set<String> s);
 }