Title: [121030] trunk/Source/WebCore
- Revision
- 121030
- Author
- [email protected]
- Date
- 2012-06-22 09:46:28 -0700 (Fri, 22 Jun 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121029 => 121030)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 16:23:48 UTC (rev 121029)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 16:46:28 UTC (rev 121030)
@@ -1,3 +1,13 @@
+2012-06-22 Andrey Kosyakov <[email protected]>
+
+ 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 <[email protected]>
[Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (121029 => 121030)
--- trunk/Source/WebCore/English.lproj/localizedStrings.js 2012-06-22 16:23:48 UTC (rev 121029)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js 2012-06-22 16:46:28 UTC (rev 121030)
@@ -702,3 +702,4 @@
localizedStrings["apply original content"] = "apply original content";
localizedStrings["apply revision content"] = "apply revision content";
localizedStrings["revert"] = "revert";
+localizedStrings["CPU Time"] = "CPU Time";
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (121029 => 121030)
--- trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2012-06-22 16:23:48 UTC (rev 121029)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2012-06-22 16:46:28 UTC (rev 121030)
@@ -472,14 +472,15 @@
{
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
