DevTools: [timeline tree view] fix total time calculation for recursive case.

Source/devtools/front_end/timeline/TimelineModel.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1534 matching lines @@
  * @return {!WebInspector.TimelineModel.ProfileTreeNode}
  */
 WebInspector.TimelineModel.buildBottomUpTree = function(topDownTree, groupingCallback)
 {
     var buRoot = new WebInspector.TimelineModel.ProfileTreeNode();
     buRoot.selfTime = 0;
     buRoot.totalTime = 0;
     buRoot.name = WebInspector.UIString("Bottom-Up Chart");
     /** @type {!Map<string,!WebInspector.TimelineModel.ProfileTreeNode>} */
     buRoot.children = new Map();
-    processNode(topDownTree);
+    var nodesStack = /** @type {!Set<string>} */ (new Set());

[yurys, 2015/08/24 18:14:36]

nodesOnStack

[alph, 2015/08/24 18:19:05]

Done.

+    topDownTree.children.forEach(processNode);
 
     /**
      * @param {!WebInspector.TimelineModel.ProfileTreeNode} tdNode
      */
     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 = nodesStack.has(tdNode.id);
+        if (!hadNode)
+            nodesStack.add(tdNode.id);
         if (tdNode.children)
             tdNode.children.forEach(processNode);
+        if (!hadNode)
+            nodesStack.delete(tdNode.id);
     }
 
     /**
      * @param {!WebInspector.TimelineModel.ProfileTreeNode} tdNode
      * @param {!WebInspector.TimelineModel.ProfileTreeNode} buParent
      */
     function appendNode(tdNode, buParent)
     {
         var selfTime = tdNode.selfTime;
         var totalTime = tdNode.totalTime;
         buParent.selfTime += selfTime;
         buParent.totalTime += selfTime;
         while (tdNode.parent) {
             if (!buParent.children)
                 buParent.children = /** @type {!Map<string,!WebInspector.TimelineModel.ProfileTreeNode>} */ (new Map());
             var id = tdNode.id;
             var buNode = buParent.children.get(id);
             if (!buNode) {
                 buNode = new WebInspector.TimelineModel.ProfileTreeNode();
                 buNode.selfTime = selfTime;
                 buNode.totalTime = totalTime;
                 buNode.name = tdNode.name;
                 buNode.event = tdNode.event;
                 buNode.id = id;
                 buParent.children.set(id, buNode);
             } else {
                 buNode.selfTime += selfTime;
-                buNode.totalTime += totalTime;
+                if (!nodesStack.has(id))
+                    buNode.totalTime += totalTime;
             }
             tdNode = tdNode.parent;
             buParent = buNode;
         }
     }
 
+    // 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;
 }
 
 /**
  * @constructor
  * @param {!WebInspector.TracingModel.Event} event
  */
 WebInspector.TimelineModel.NetworkRequest = function(event)
 {
     this.startTime = event.name === WebInspector.TimelineModel.RecordType.ResourceSendRequest ? event.startTime : 0;
@@ skipping 738 matching lines @@
         /** @type {!Object.<string, !Array.<!WebInspector.InvalidationTrackingEvent>>} */
         this._invalidations = {};
         /** @type {!Object.<number, !Array.<!WebInspector.InvalidationTrackingEvent>>} */
         this._invalidationsByNodeId = {};
 
         this._lastRecalcStyle = undefined;
         this._lastPaintWithLayer = undefined;
         this._didPaint = false;
     }
 }