Timeline: move eventStackFrame from TimelineTreeView to TimelineProfi…

…leTree This is a follow-up to https://codereview.chromium.org/1779053002 that fixes a layering violation that accidentally creeped into the original CL. [email protected],[email protected] Review URL: https://codereview.chromium.org/1778233003 Cr-Commit-Position: refs/heads/master@{#380337}
binaryage · Mar 10, 2016 · b4cc6f0 · b4cc6f0
1 parent f46adb2
commit b4cc6f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/front_end/timeline/TimelineProfileTree.js b/front_end/timeline/TimelineProfileTree.js
@@ -191,7 +191,7 @@ WebInspector.TimelineProfileTree.eventURL = function(event)
     var data = event.args["data"] || event.args["beginData"];
     if (data && data["url"])
         return data["url"];
-    var frame = WebInspector.TimelineTreeView.eventStackFrame(event);
+    var frame = WebInspector.TimelineProfileTree.eventStackFrame(event);
     while (frame) {
         var url = frame["url"];
         if (url)
@@ -201,6 +201,21 @@ WebInspector.TimelineProfileTree.eventURL = function(event)
     return null;
 }
 
+/**
+ * @param {!WebInspector.TracingModel.Event} event
+ * @return {?Object}
+ */
+WebInspector.TimelineProfileTree.eventStackFrame = function(event)
+{
+    if (event.name == WebInspector.TimelineModel.RecordType.JSFrame)
+        return event.args["data"];
+    var topFrame = event.stackTrace && event.stackTrace[0];
+    if (topFrame)
+        return topFrame;
+    var initiator = event.initiator;
+    return initiator && initiator.stackTrace && initiator.stackTrace[0] || null;
+}
+
 /**
  * @constructor
  * @param {function(!WebInspector.TracingModel.Event):string} categoryMapper

diff --git a/front_end/timeline/TimelineTreeView.js b/front_end/timeline/TimelineTreeView.js
@@ -290,21 +290,6 @@ WebInspector.TimelineTreeView.eventNameForSorting = function(event)
     return event.name + ":@" + WebInspector.TimelineProfileTree.eventURL(event);
 }
 
-/**
- * @param {!WebInspector.TracingModel.Event} event
- * @return {?Object}
- */
-WebInspector.TimelineTreeView.eventStackFrame = function(event)
-{
-    if (event.name == WebInspector.TimelineModel.RecordType.JSFrame)
-        return event.args["data"];
-    var topFrame = event.stackTrace && event.stackTrace[0];
-    if (topFrame)
-        return topFrame;
-    var initiator = event.initiator;
-    return initiator && initiator.stackTrace && initiator.stackTrace[0] || null;
-}
-
 /**
  * @constructor
  * @extends {WebInspector.SortableDataGridNode}
@@ -362,7 +347,7 @@ WebInspector.TimelineTreeView.GridNode.prototype = {
             name.textContent = event.name === WebInspector.TimelineModel.RecordType.JSFrame
                 ? WebInspector.beautifyFunctionName(event.args["data"]["functionName"])
                 : WebInspector.TimelineUIUtils.eventTitle(event);
-            var frame = WebInspector.TimelineTreeView.eventStackFrame(event);
+            var frame = WebInspector.TimelineProfileTree.eventStackFrame(event);
             if (frame && frame["url"]) {
                 var callFrame = /** @type {!RuntimeAgent.CallFrame} */ (frame);
                 container.createChild("div", "activity-link").appendChild(this._treeView.linkifyLocation(callFrame));