Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js

Issue 2161253002: DevTools: Use proper target when processing worker thread events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
index 20683a89828aa6f364eb6561559a0a662ee00a1b..5fac89fd4a16acccb0a359b9fb01ee8d6c3203d3 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
@@ -81,21 +81,20 @@ WebInspector.TimelineTreeView.prototype = {
_onHover: function(node) { },
/**
- * @param {!RuntimeAgent.CallFrame} frame
- * @return {?Element}
- */
- _linkifyLocationForTracing: function(frame)
- {
- return this._linkifier.maybeLinkifyConsoleCallFrameForTracing(this._model.target(), frame);
- },
-
- /**
- * @param {!RuntimeAgent.CallFrame} frame
+ * @param {!WebInspector.TracingModel.Event} event
* @return {?Element}
*/
- linkifyLocation: function(frame)
+ _linkifyLocation: function(event)
{
- return this._linkifier.maybeLinkifyConsoleCallFrame(this._model.target(), frame);
+ var target = this._model.targetByEvent(event);
+ if (!target)
+ return null;
+ var frame = WebInspector.TimelineProfileTree.eventStackFrame(event);
+ if (!frame)
+ return null;
+ return event.name === WebInspector.TimelineModel.RecordType.JSFrame
+ ? this._linkifier.maybeLinkifyConsoleCallFrame(target, frame)
+ : this._linkifier.maybeLinkifyConsoleCallFrameForTracing(target, frame);
},
/**
@@ -353,15 +352,9 @@ 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.TimelineProfileTree.eventStackFrame(event);
- if (frame && frame["url"]) {
- var callFrame = /** @type {!RuntimeAgent.CallFrame} */ (frame);
- var link = event.name === WebInspector.TimelineModel.RecordType.JSFrame
- ? this._treeView.linkifyLocation(callFrame)
- : this._treeView._linkifyLocationForTracing(callFrame);
- if (link)
- container.createChild("div", "activity-link").appendChild(link);
- }
+ var link = this._treeView._linkifyLocation(event);
+ if (link)
+ container.createChild("div", "activity-link").appendChild(link);
icon.style.backgroundColor = WebInspector.TimelineUIUtils.eventColor(event);
}
return cell;

Powered by Google App Engine
This is Rietveld 408576698