- Revision
- 125272
- Author
- [email protected]
- Date
- 2012-08-10 06:24:50 -0700 (Fri, 10 Aug 2012)
Log Message
Web Inspector: console.timeStamp() marked are not shown in Timeline overview
https://bugs.webkit.org/show_bug.cgi?id=93697
Reviewed by Pavel Feldman.
Source/WebCore:
- ignore frameId on TimeStamp records, consider it's always an event divider.
* inspector/front-end/TimelinePresentationModel.js:
(WebInspector.TimelinePresentationModel.isEventDivider):
LayoutTests:
- add support for dumpting timestamp records to timeline test suite;
- dump timestamp records for TimeStamp tests;
* inspector/timeline/timeline-test.js:
(initialize_Timeline.InspectorTest.stopTimeline):
(initialize_Timeline.InspectorTest.performActionsAndPrint.step3):
(initialize_Timeline.InspectorTest.performActionsAndPrint):
(initialize_Timeline.InspectorTest.printTimelineRecords):
(initialize_Timeline.InspectorTest.printTimestampRecords):
(initialize_Timeline.InspectorTest.innerPrintTimelineRecords):
* inspector/timeline/timeline-time-stamp-expected.txt:
* inspector/timeline/timeline-time-stamp.html:
* platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (125271 => 125272)
--- trunk/LayoutTests/ChangeLog 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/LayoutTests/ChangeLog 2012-08-10 13:24:50 UTC (rev 125272)
@@ -1,3 +1,24 @@
+2012-08-10 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: console.timeStamp() marked are not shown in Timeline overview
+ https://bugs.webkit.org/show_bug.cgi?id=93697
+
+ Reviewed by Pavel Feldman.
+
+ - add support for dumpting timestamp records to timeline test suite;
+ - dump timestamp records for TimeStamp tests;
+
+ * inspector/timeline/timeline-test.js:
+ (initialize_Timeline.InspectorTest.stopTimeline):
+ (initialize_Timeline.InspectorTest.performActionsAndPrint.step3):
+ (initialize_Timeline.InspectorTest.performActionsAndPrint):
+ (initialize_Timeline.InspectorTest.printTimelineRecords):
+ (initialize_Timeline.InspectorTest.printTimestampRecords):
+ (initialize_Timeline.InspectorTest.innerPrintTimelineRecords):
+ * inspector/timeline/timeline-time-stamp-expected.txt:
+ * inspector/timeline/timeline-time-stamp.html:
+ * platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt: Removed.
+
2012-08-10 Mihnea Ovidenie <[email protected]>
[CSS Regions] region-overflow: break still renders the content that does not fit in the last region.
Modified: trunk/LayoutTests/inspector/timeline/timeline-test.js (125271 => 125272)
--- trunk/LayoutTests/inspector/timeline/timeline-test.js 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/LayoutTests/inspector/timeline/timeline-test.js 2012-08-10 13:24:50 UTC (rev 125272)
@@ -27,6 +27,7 @@
{
InspectorTest._timelineRecords = [];
WebInspector.panels.timeline.toggleTimelineButton.toggled = true;
+ WebInspector.panels.timeline._model._collectionEnabled = true;
TimelineAgent.start(callback);
function addRecord(record)
{
@@ -62,12 +63,13 @@
function didStop()
{
WebInspector.panels.timeline.toggleTimelineButton.toggled = false;
+ WebInspector.panels.timeline._model._collectionEnabled = false;
callback(InspectorTest._timelineRecords);
}
TimelineAgent.stop(didStop);
};
-InspectorTest.performActionsAndPrint = function(actions, typeName)
+InspectorTest.performActionsAndPrint = function(actions, typeName, includeTimeStamps)
{
InspectorTest.startTimeline(step1);
function step1()
@@ -83,18 +85,31 @@
function step3()
{
InspectorTest.printTimelineRecords(typeName);
+ if (includeTimeStamps) {
+ InspectorTest.addResult("Timestamp records: ");
+ InspectorTest.printTimestampRecords(typeName);
+ }
InspectorTest.completeTest();
}
};
InspectorTest.printTimelineRecords = function(typeName, formatter)
{
- for (var i = 0; i < InspectorTest._timelineRecords.length; ++i) {
- var record = InspectorTest._timelineRecords[i];
- if (typeName && record.type === WebInspector.TimelineModel.RecordType[typeName])
- InspectorTest.printTimelineRecordProperties(record);
+ InspectorTest.innerPrintTimelineRecords(InspectorTest._timelineRecords, typeName, formatter);
+};
+
+InspectorTest.printTimestampRecords = function(typeName, formatter)
+{
+ InspectorTest.innerPrintTimelineRecords(WebInspector.panels.timeline._timeStampRecords.select("_record"), typeName, formatter);
+};
+
+InspectorTest.innerPrintTimelineRecords = function(records, typeName, formatter)
+{
+ for (var i = 0; i < records.length; ++i) {
+ if (typeName && records[i].type === WebInspector.TimelineModel.RecordType[typeName])
+ InspectorTest.printTimelineRecordProperties(records[i]);
if (formatter)
- formatter(record);
+ formatter(records[i]);
}
};
Modified: trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt (125271 => 125272)
--- trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt 2012-08-10 13:24:50 UTC (rev 125272)
@@ -12,4 +12,17 @@
totalHeapSize : <number>
counters : <object>
}
+Timestamp records:
+TimeStamp Properties:
+{
+ startTime : <number>
+ stackTrace : <object>
+ data : {
+ message : "TIME STAMP"
+ }
+ type : "TimeStamp"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
Modified: trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html (125271 => 125272)
--- trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html 2012-08-10 13:24:50 UTC (rev 125272)
@@ -11,7 +11,7 @@
function test()
{
- InspectorTest.performActionsAndPrint("performActions()", "TimeStamp");
+ InspectorTest.performActionsAndPrint("performActions()", "TimeStamp", true);
}
</script>
Deleted: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt (125271 => 125272)
--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt 2012-08-10 13:24:50 UTC (rev 125272)
@@ -1,15 +0,0 @@
-Tests the Timeline API timeStamp feature
-
-TimeStamp Properties:
-{
- startTime : <number>
- stackTrace : <object>
- data : {
- message : "TIME STAMP"
- }
- type : "TimeStamp"
- usedHeapSize : <number>
- totalHeapSize : <number>
- counters : <object>
-}
-
Modified: trunk/Source/WebCore/ChangeLog (125271 => 125272)
--- trunk/Source/WebCore/ChangeLog 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/Source/WebCore/ChangeLog 2012-08-10 13:24:50 UTC (rev 125272)
@@ -1,3 +1,15 @@
+2012-08-10 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: console.timeStamp() marked are not shown in Timeline overview
+ https://bugs.webkit.org/show_bug.cgi?id=93697
+
+ Reviewed by Pavel Feldman.
+
+ - ignore frameId on TimeStamp records, consider it's always an event divider.
+
+ * inspector/front-end/TimelinePresentationModel.js:
+ (WebInspector.TimelinePresentationModel.isEventDivider):
+
2012-08-10 Mihnea Ovidenie <[email protected]>
[CSS Regions] region-overflow: break still renders the content that does not fit in the last region.
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js (125271 => 125272)
--- trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2012-08-10 11:46:01 UTC (rev 125271)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js 2012-08-10 13:24:50 UTC (rev 125272)
@@ -128,7 +128,9 @@
WebInspector.TimelinePresentationModel.isEventDivider = function(record)
{
var recordTypes = WebInspector.TimelineModel.RecordType;
- if (record.type === recordTypes.MarkDOMContent || record.type === recordTypes.MarkLoad || record.type === recordTypes.TimeStamp) {
+ if (record.type === recordTypes.TimeStamp)
+ return true;
+ if (record.type === recordTypes.MarkDOMContent || record.type === recordTypes.MarkLoad) {
var mainFrame = WebInspector.resourceTreeModel.mainFrame;
if (mainFrame && mainFrame.id === record.frameId)
return true;
