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

LayoutTests/inspector/tracing/timeline-js-callstacks.html

Index: LayoutTests/inspector/tracing/timeline-js-callstacks.html
===================================================================
--- LayoutTests/inspector/tracing/timeline-js-callstacks.html	(revision 201157)
+++ LayoutTests/inspector/tracing/timeline-js-callstacks.html	(working copy)
@@ -323,7 +323,7 @@
         "pid": 17851,
         "tid": 23,
         "ts": 251000,
-        "dur": 8000
+        "dur": 1000
     },
     {
         "args": {
@@ -412,6 +412,131 @@
         "ts": 251400,
     },
     {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_b", "scriptId": 1 },
+                    { "functionName": "recursive_a", "scriptId": 1 },
+                    { "functionName": "recursive_b", "scriptId": 1 },
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253000,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_a", "scriptId": 1 },
+                    { "functionName": "recursive_b", "scriptId": 1 },
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253008,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_b", "scriptId": 1 },
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253012,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253014,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253015,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_b", "scriptId": 1 },
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253100,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "recursive_a", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253200,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 253300,
+    },
+    {
         "args": {},
         "cat": "disabled-by-default-devtools.timeline",
         "name": "Program",