[polymer] Merge of master into polymer10-migration

tracing/tracing/model/slice_group.html

Index: tracing/tracing/model/slice_group.html
diff --git a/tracing/tracing/model/slice_group.html b/tracing/tracing/model/slice_group.html
index 34e0d68c27d845ade908438ea8909905c248ec6b..3b15c48fae1cd2d340dfcca2415b0f7a8c6dbbf4 100644
--- a/tracing/tracing/model/slice_group.html
+++ b/tracing/tracing/model/slice_group.html
@@ -275,20 +275,16 @@ tr.exportTo('tr.model', function() {
       return newSlice;
     },
 
-    findTopmostSlicesInThisContainer: function(eventPredicate, callback,
-                                              opt_this) {
+    findTopmostSlicesInThisContainer: function*(eventPredicate, opt_this) {
       if (!this.haveTopLevelSlicesBeenBuilt)
         throw new Error('Nope');
 
-      this.topLevelSlices.forEach(function(s) {
-        s.findTopmostSlicesRelativeToThisSlice(eventPredicate, callback,
-                                               opt_this);
-      });
+      for (var s of this.topLevelSlices)
+        yield * s.findTopmostSlicesRelativeToThisSlice(eventPredicate);
     },
 
-    childEvents: function*(eventTypePredicate, opt_this) {
-      if (eventTypePredicate.call(opt_this, this.sliceConstructor))
-        yield * this.slices;
+    childEvents: function*() {
+      yield * this.slices;
     },
 
     childEventContainers: function*() {
@@ -314,7 +310,8 @@ tr.exportTo('tr.model', function() {
         end,
         function(topLevelSlice) {
           callback(topLevelSlice);
-          topLevelSlice.iterateAllDescendents(callback);
+          for (var slice of topLevelSlice.enumerateAllDescendents())
+            callback(slice);
         });
       return ret;
     },