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

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

Issue 1666563005: DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 ffd10d8e6488e32dbdfc29d1e10ac9f2951afbf9..bbcf100372384411ec468aa8402f2eb223eeef0d 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js
@@ -107,7 +107,7 @@ WebInspector.TimelineTreeView.prototype = {
_onHover: function(node) { },
/**
- * @param {!ConsoleAgent.CallFrame} frame
+ * @param {!RuntimeAgent.CallFrame} frame
* @return {!Element}
*/
linkifyLocation: function(frame)
@@ -394,7 +394,7 @@ WebInspector.TimelineTreeView.eventStackFrame = function(event)
if (topFrame)
return topFrame;
var initiator = event.initiator;
- return initiator && initiator.stackTrace && initiator.stackTrace[0] || null;
+ return initiator && initiator.stack && initiator.stack.callFrames[0] || null;
dgozman 2016/02/04 01:43:06 Double-check.
pfeldman 2016/02/04 03:15:59 Done.
}
/**
@@ -461,7 +461,7 @@ WebInspector.TimelineTreeView.GridNode.prototype = {
: WebInspector.TimelineUIUtils.eventTitle(event);
var frame = WebInspector.TimelineTreeView.eventStackFrame(event);
if (frame && frame["url"]) {
- var callFrame = /** @type {!ConsoleAgent.CallFrame} */ (frame);
+ var callFrame = /** @type {!RuntimeAgent.CallFrame} */ (frame);
container.createChild("div", "activity-link").appendChild(this._treeView.linkifyLocation(callFrame));
}
icon.style.backgroundColor = WebInspector.TimelineUIUtils.eventColor(event);

Powered by Google App Engine
This is Rietveld 408576698