DevTools: Tweak id calculation for JSFrames

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

Index: LayoutTests/inspector/tracing/timeline-js-callstacks.html
diff --git a/LayoutTests/inspector/tracing/timeline-js-callstacks.html b/LayoutTests/inspector/tracing/timeline-js-callstacks.html
index 4559d41fb902f9b3e5a3fc705a3372b37468017d..f20da5f759de8bfbffc093dccc198a2287264f32 100644
--- a/LayoutTests/inspector/tracing/timeline-js-callstacks.html
+++ b/LayoutTests/inspector/tracing/timeline-js-callstacks.html
@@ -362,6 +362,56 @@ function test()
         "ts": 251100,
     },
     {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "w", "scriptId": 1 },
+                    { "functionName": "y", "callUID": "y", "scriptId": 1 },
+                    { "functionName": "x", "callUID": "x", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 251200,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "w", "scriptId": 1 },
+                    { "functionName": "y", "callUID": "y", "scriptId": 1 },
+                    { "functionName": "x", "callUID": "x", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 251300,
+    },
+    {
+        "args": {
+            "data": {
+                "stackTrace": [
+                    { "functionName": "y", "callUID": "y", "scriptId": 1 },
+                    { "functionName": "x", "callUID": "x", "scriptId": 1 }
+                ]
+            }
+        },
+        "cat": "disabled-by-default-devtools.timeline",
+        "name": "JSSample",
+        "ph": "I",
+        "pid": 17851,
+        "tid": 23,
+        "ts": 251400,
+    },
+    {
         "args": {},
         "cat": "disabled-by-default-devtools.timeline",
         "name": "Program",
@@ -387,17 +437,11 @@ function test()
         WebInspector.TimelineUIUtils.hiddenEventsFilter(),
         new WebInspector.ExcludeTopLevelFilter()
     ];
-    var treeTopDown = WebInspector.TimelineModel.buildTopDownTree(events, 0, Infinity, filters, eventId);
+    var treeTopDown = WebInspector.TimelineModel.buildTopDownTree(events, 0, Infinity, filters, WebInspector.TimelineTreeView.eventId);
     printProfileTree(0, treeTopDown);
     var treeBottomUp = WebInspector.TimelineModel.buildBottomUpTree(treeTopDown);
     printProfileTree(0, treeBottomUp);
 
-    function eventId(event)
-    {
-        var data = event.args.data;
-        return data && (data.callUID || data.functionNode);
-    }
-
     function printProfileTree(padding, node)
     {
         InspectorTest.addResult("  ".repeat(padding) + node.name + ": " + [node.selfTime, node.totalTime].map(function (t) { return t.toFixed(3); }).join("  "));