Chromium Code Reviews| Index: LayoutTests/http/tests/inspector/timeline-test.js |
| diff --git a/LayoutTests/http/tests/inspector/timeline-test.js b/LayoutTests/http/tests/inspector/timeline-test.js |
| index 3bf79a7c586155f31482f47b88250229e2ad6d8f..c4cd7ab686ac2ecb8391a5ccf50005c811619dc2 100644 |
| --- a/LayoutTests/http/tests/inspector/timeline-test.js |
| +++ b/LayoutTests/http/tests/inspector/timeline-test.js |
| @@ -19,11 +19,14 @@ InspectorTest.timelinePropertyFormatters = { |
| lineNumber: "formatAsTypeName", |
| columnNumber: "formatAsTypeName", |
| frameId: "formatAsTypeName", |
| + frame: "formatAsTypeName", |
| encodedDataLength: "formatAsTypeName", |
| identifier: "formatAsTypeName", |
| clip: "formatAsTypeName", |
| root: "formatAsTypeName", |
| backendNodeId: "formatAsTypeName", |
| + nodeId: "formatAsTypeName", |
| + rootNode: "formatAsTypeName", |
| networkTime: "formatAsTypeName", |
| thread: "formatAsTypeName" |
| }; |
| @@ -102,6 +105,14 @@ InspectorTest.loadTimelineRecords = function(records) |
| records.forEach(model._addRecord, model); |
| } |
| +InspectorTest.loadTimelineTraceEvents = function(sessionId, events) |
| +{ |
| + var tracingModel = WebInspector.inspectorView.showPanel("timeline")._tracingModel; |
| + tracingModel._tracingStarted(sessionId); |
|
caseq
2014/08/22 11:11:30
use WebInspector.inspectorView.showPanel("timeline
yurys
2014/08/22 11:28:08
It doesn't send started/complete events.
yurys
2014/08/22 12:15:57
Replaced it with InspectorTest.timelineModel().set
|
| + tracingModel._eventsCollected(events); |
| + tracingModel._tracingComplete(); |
| +} |
| + |
| InspectorTest.performActionsAndPrint = function(actions, typeName, includeTimeStamps) |
| { |
| function callback() |
| @@ -251,6 +262,8 @@ InspectorTest.printTimelineRecordProperties = function(record) |
| } |
| if (record.children().length) |
| object["children"] = []; |
| + if (!record.data() && record instanceof WebInspector.TracingTimelineModel.TraceEventRecord) |
| + object["data"] = record.traceEvent().args; |
| InspectorTest.addObject(object, InspectorTest.timelinePropertyFormatters); |
| }; |