Merge 201072 "DevTools: [timeline tree view] fix total time calc..."

Source/devtools/front_end/timeline/TimelineModel.js

Index: Source/devtools/front_end/timeline/TimelineModel.js
===================================================================
--- Source/devtools/front_end/timeline/TimelineModel.js	(revision 201157)
+++ Source/devtools/front_end/timeline/TimelineModel.js	(working copy)
@@ -1552,7 +1552,8 @@
     buRoot.name = WebInspector.UIString("Bottom-Up Chart");
     /** @type {!Map<string,!WebInspector.TimelineModel.ProfileTreeNode>} */
     buRoot.children = new Map();
-    processNode(topDownTree);
+    var nodesOnStack = /** @type {!Set<string>} */ (new Set());
+    topDownTree.children.forEach(processNode);
 
     /**
      * @param {!WebInspector.TimelineModel.ProfileTreeNode} tdNode
@@ -1559,12 +1560,15 @@
      */
     function processNode(tdNode)
     {
-        if (tdNode.selfTime > 0) {
-            var buParent = groupingCallback && groupingCallback(tdNode) || buRoot;
-            appendNode(tdNode, buParent);
-        }
+        var buParent = groupingCallback && groupingCallback(tdNode) || buRoot;
+        appendNode(tdNode, buParent);
+        var hadNode = nodesOnStack.has(tdNode.id);
+        if (!hadNode)
+            nodesOnStack.add(tdNode.id);
         if (tdNode.children)
             tdNode.children.forEach(processNode);
+        if (!hadNode)
+            nodesOnStack.delete(tdNode.id);
     }
 
     /**
@@ -1592,7 +1596,8 @@
                 buParent.children.set(id, buNode);
             } else {
                 buNode.selfTime += selfTime;
-                buNode.totalTime += totalTime;
+                if (!nodesOnStack.has(id))
+                    buNode.totalTime += totalTime;
             }
             tdNode = tdNode.parent;
             buParent = buNode;
@@ -1599,6 +1604,13 @@
         }
     }
 
+    // Purge zero self time nodes.
+    var rootChildren = buRoot.children;
+    for (var item of rootChildren.entries()) {
+        if (item[1].selfTime === 0)
+            rootChildren.delete(item[0]);
+    }
+
     return buRoot;
 }