[polymer] Merge of master into polymer10-migration

tracing/tracing/model/device.html

Index: tracing/tracing/model/device.html
diff --git a/tracing/tracing/model/device.html b/tracing/tracing/model/device.html
index d47d684ce8e605ae9faa8468080392c0aa2c1145..cbb1b2aa91a8721507f27ef8e5470b21d7f6ef45 100644
--- a/tracing/tracing/model/device.html
+++ b/tracing/tracing/model/device.html
@@ -78,17 +78,16 @@ tr.exportTo('tr.model', function() {
 
     updateBounds: function() {
       this.bounds.reset();
-
-      this.iterateAllChildEventContainers(function(child) {
+      for (var child of this.childEventContainers()) {
         child.updateBounds();
         this.bounds.addRange(child.bounds);
-      }, this);
+      }
     },
 
     shiftTimestampsForward: function(amount) {
-      this.iterateAllChildEventContainers(function(child) {
+      for (var child of this.childEventContainers()) {
         child.shiftTimestampsForward(amount);
-      });
+      }
 
       for (var i = 0; i < this.vSyncTimestamps_.length; i++)
         this.vSyncTimestamps_[i] += amount;
@@ -97,13 +96,6 @@ tr.exportTo('tr.model', function() {
     addCategoriesToDict: function(categoriesDict) {
     },
 
-    findTopmostSlicesInThisContainer: function(eventPredicate, callback,
-                                               opt_this) {
-    },
-
-    childEvents: function*(eventTypePredicate, opt_this) {
-    },
-
     childEventContainers: function*() {
       if (this.powerSeries_)
         yield this.powerSeries_;