Web Inspector: timeline event details popup misses CPU time
authorcaseq@chromium.org <caseq@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jun 2012 16:46:28 +0000 (16:46 +0000)
committercaseq@chromium.org <caseq@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jun 2012 16:46:28 +0000 (16:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=89765

Reviewed by Pavel Feldman.

* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.Record.prototype.generatePopupContent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121030 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/English.lproj/localizedStrings.js
Source/WebCore/inspector/front-end/TimelinePresentationModel.js

index 1ca84f9..319074c 100644 (file)
@@ -1,3 +1,13 @@
+2012-06-22  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: timeline event details popup misses CPU time
+        https://bugs.webkit.org/show_bug.cgi?id=89765
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/TimelinePresentationModel.js:
+        (WebInspector.TimelinePresentationModel.Record.prototype.generatePopupContent):
+
 2012-06-22  Peter Beverloo  <peter@chromium.org>
 
         [Chromium] Disable c++0x compatibility warnings in JavaScriptCore.gyp when building for Android
index 236d44b..fafa4ef 100644 (file)
@@ -702,3 +702,4 @@ localizedStrings["Local modifications..."] = "Local modifications...";
 localizedStrings["apply original content"] = "apply original content";
 localizedStrings["apply revision content"] = "apply revision content";
 localizedStrings["revert"] = "revert";
+localizedStrings["CPU Time"] = "CPU Time";
index 7edaf65..9f7661c 100644 (file)
@@ -472,14 +472,15 @@ WebInspector.TimelinePresentationModel.Record.prototype = {
     {
         var contentHelper = new WebInspector.TimelinePresentationModel.PopupContentHelper(this.title);
 
+        contentHelper._appendTextRow(WebInspector.UIString("Duration"), text);
         if (this._children && this._children.length) {
             contentHelper._appendTextRow(WebInspector.UIString("Self Time"), Number.secondsToString(this._selfTime, true));
+            contentHelper._appendTextRow(WebInspector.UIString("CPU Time"), Number.secondsToString(this._cpuTime, true));
             contentHelper._appendElementRow(WebInspector.UIString("Aggregated Time"),
                 WebInspector.TimelinePresentationModel._generateAggregatedInfo(this._aggregatedStats));
         }
         var text = WebInspector.UIString("%s (at %s)", Number.secondsToString(this._lastChildEndTime - this.startTime, true),
             Number.secondsToString(this._startTimeOffset));
-        contentHelper._appendTextRow(WebInspector.UIString("Duration"), text);
 
         const recordTypes = WebInspector.TimelineModel.RecordType;