Changeset 63757 in webkit

Timestamp:

Jul 20, 2010 10:53:44 AM (14 years ago)

Author:

loislo@chromium.org

Message:

2010-07-20 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

WebInspector: It is possible to show full call stack instead of top frame for Caller
and Call Site properties in Timeline panel.
​https://bugs.webkit.org/show_bug.cgi?id=42620

• English.lproj/localizedStrings.js:
• inspector/front-end/TimelinePanel.js: (WebInspector.TimelinePanel.FormattedRecord): (WebInspector.TimelinePanel.FormattedRecord.prototype._generatePopupContent): (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails): (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendElementRow): (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendLinkRow): (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendStackTrace):
• inspector/front-end/inspector.css: (.timeline-details): (.timeline-function-name): (.timeline-stacktrace-title):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/TimelinePanel.js (modified) (7 diffs)
• inspector/front-end/inspector.css (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        WebInspector: It is possible to show full call stack instead of top frame for Caller
+        and Call Site properties in Timeline panel.
+        https://bugs.webkit.org/show_bug.cgi?id=42620
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.FormattedRecord):
+        (WebInspector.TimelinePanel.FormattedRecord.prototype._generatePopupContent):
+        (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
+        (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendElementRow):
+        (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendLinkRow):
+        (WebInspector.TimelinePanel.PopupContentHelper.prototype._appendStackTrace):
+        * inspector/front-end/inspector.css:
+        (.timeline-details):
+        (.timeline-function-name):
+        (.timeline-stacktrace-title):
+
 2010-07-20  Leon Clarke  <leonclarke@google.com>
 

trunk/WebCore/inspector/front-end/TimelinePanel.js

@@ -842 +842 @@
     this._lastChildEndTime = this.endTime;
     this.originalRecordForTests = record;
-    if (record.stackTrace && record.stackTrace.length) {
-        this.callerScriptName = record.stackTrace[0].scriptName;
-        this.callerScriptLine = record.stackTrace[0].lineNumber;
-    }
+    if (record.stackTrace && record.stackTrace.length)
+        this.stackTrace = record.stackTrace;
     this.totalHeapSize = record.totalHeapSize;
     this.usedHeapSize = record.usedHeapSize;
@@ -878 +876 @@
         var timerInstalledRecord = panel._timerRecords[record.data.timerId];
         if (timerInstalledRecord) {
-            this.callSiteScriptName = timerInstalledRecord.callerScriptName;
-            this.callSiteScriptLine = timerInstalledRecord.callerScriptLine;
+            this.callSiteStackTrace = timerInstalledRecord.stackTrace;
             this.timeout = timerInstalledRecord.timeout;
             this.singleShot = timerInstalledRecord.singleShot;
@@ -941 +938 @@
                     contentHelper._appendTextRow(WebInspector.UIString("Repeats"), !this.singleShot);
                 }
-                if (typeof this.callSiteScriptLine === "number")
-                    contentHelper._appendLinkRow(WebInspector.UIString("Call Site"), this.callSiteScriptName, this.callSiteScriptLine);
                 break;
             case recordTypes.FunctionCall:
@@ -980 +975 @@
             contentHelper._appendLinkRow(WebInspector.UIString("Function Call"), this.data.scriptName, this.data.scriptLine);
 
-        if (this.callerScriptName && this.type !== recordTypes.GCEvent)
-            contentHelper._appendLinkRow(WebInspector.UIString("Caller"), this.callerScriptName, this.callerScriptLine);
-
         if (this.usedHeapSize)
             contentHelper._appendTextRow(WebInspector.UIString("Used Heap Size"), WebInspector.UIString("%s of %s", Number.bytesToString(this.usedHeapSize, WebInspector.UIString), Number.bytesToString(this.totalHeapSize, WebInspector.UIString)));
+
+        if (this.callSiteStackTrace && this.callSiteStackTrace.length)
+            contentHelper._appendStackTrace(WebInspector.UIString("Call Site stack"), this.callSiteStackTrace);
+
+        if (this.stackTrace)
+            contentHelper._appendStackTrace(WebInspector.UIString("Call Stack"), this.stackTrace);
 
         return contentHelper._contentTable;
@@ -1004 +1002 @@
             case WebInspector.TimelineAgent.RecordType.TimerInstall:
             case WebInspector.TimelineAgent.RecordType.TimerRemove:
-                return this.callerScriptName ? WebInspector.linkifyResourceAsNode(this.callerScriptName, "scripts", this.callerScriptLine, "", "") : record.data.timerId;
+                return this.stackTrace ? WebInspector.linkifyResourceAsNode(this.stackTrace[0].scriptName, "scripts", this.stackTrace[0].lineNumber, "", "") : record.data.timerId;
             case WebInspector.TimelineAgent.RecordType.ParseHTML:
             case WebInspector.TimelineAgent.RecordType.RecalculateStyles:
-                return this.callerScriptName ? WebInspector.linkifyResourceAsNode(this.callerScriptName, "scripts", this.callerScriptLine, "", "") : null;
+                return this.stackTrace ? WebInspector.linkifyResourceAsNode(this.stackTrace[0].scriptName, "scripts", this.stackTrace[0].lineNumber, "", "") : null;
             case WebInspector.TimelineAgent.RecordType.EvaluateScript:
                 return record.data.url ? WebInspector.linkifyResourceAsNode(record.data.url, "scripts", record.data.lineNumber, "", "") : null;
@@ -1076 +1074 @@
     },
 
-    _appendElementRow: function(title, content)
+    _appendElementRow: function(title, content, titleStyle)
     {
         var row = document.createElement("tr");
-        row.appendChild(this._createCell(title, "timeline-details-row-title"));
+        var titleCell = this._createCell(title, "timeline-details-row-title");
+        if (titleStyle)
+            titleCell.addStyleClass(titleStyle);
+        row.appendChild(titleCell);
         var cell = document.createElement("td");
+        cell.className = "timeline-details";
         cell.appendChild(content);
         row.appendChild(cell);
@@ -1090 +1092 @@
         var link = WebInspector.linkifyResourceAsNode(scriptName, "scripts", scriptLine, "timeline-details");
         this._appendElementRow(title, link);
+    },
+
+    _appendStackTrace: function(title, stackTrace)
+    {
+        this._appendTextRow("", "");
+        var framesTable = document.createElement("table");
+        for (var i = 0; i < stackTrace.length; ++i) {
+            var stackFrame = stackTrace[i];
+            var row = document.createElement("tr");
+            row.className = "timeline-details";
+            row.appendChild(this._createCell(stackFrame.functionName ? stackFrame.functionName : WebInspector.UIString("(anonymous function)"), "timeline-function-name"));
+            row.appendChild(this._createCell(" @ "));
+            var linkCell = document.createElement("td");
+            linkCell.appendChild(WebInspector.linkifyResourceAsNode(stackFrame.scriptName, "scripts", stackFrame.lineNumber, "timeline-details"));
+            row.appendChild(linkCell);
+            framesTable.appendChild(row);
+        }
+        this._appendElementRow(title, framesTable, "timeline-stacktrace-title");
     }
 }

trunk/WebCore/inspector/front-end/inspector.css

@@ -3694 +3694 @@
 .timeline-details {
     -webkit-user-select: text;
+    vertical-align: top;
+}
+
+.timeline-function-name {
+    text-align: right;
+}
+
+.timeline-stacktrace-title {
+    padding-top: 4px;
 }