Index: LayoutTests/inspector/timeline/timeline-filtering.html |
diff --git a/LayoutTests/inspector/timeline/timeline-filtering.html b/LayoutTests/inspector/timeline/timeline-filtering.html |
index 8867579114235dd8d337455416d84aedcfd40088..de4b226c17126f781c5531cde19de352853b150e 100644 |
--- a/LayoutTests/inspector/timeline/timeline-filtering.html |
+++ b/LayoutTests/inspector/timeline/timeline-filtering.html |
@@ -6,41 +6,57 @@ |
function test() |
{ |
- var records = [ |
- {"startTime":1000,"data":{},"endTime":1990,"type":"Program","children":[ |
- {"startTime":1010,"data":{"message":"bar01"},"endTime":1180,"type":"TimeStamp","children":[ |
- {"startTime":1020,"data":{"message":"bar02"},"endTime":1070,"type":"TimeStamp"}, |
- {"startTime":1120,"data":{"message":"bar03"},"endTime":1170,"type":"TimeStamp"} |
- ]}, |
- {"startTime":1210,"data":{"message":"bar04"},"endTime":1380,"type":"TimeStamp","children":[ |
- {"startTime":1220,"data":{"message":"foo05"},"endTime":1270,"type":"TimeStamp"}, |
- {"startTime":1320,"data":{"message":"bar06"},"endTime":1370,"type":"TimeStamp"} |
- ]}, |
- {"startTime":1410,"data":{"message":"bar07"},"endTime":1580,"type":"TimeStamp","children":[ |
- {"startTime":1420,"data":{"message":"foo08"},"endTime":1470,"type":"TimeStamp"}, |
- {"startTime":1520,"data":{"message":"foo09"},"endTime":1570,"type":"TimeStamp"} |
- ]} |
- ]}, |
- {"startTime":2000,"data":{},"endTime":2590,"type":"Program","children":[ |
- {"startTime":2010,"data":{"message":"foo10"},"endTime":2180,"type":"TimeStamp","children":[ |
- {"startTime":2020,"data":{"message":"bar11"},"endTime":2070,"type":"TimeStamp"}, |
- {"startTime":2120,"data":{"message":"bar12"},"endTime":2170,"type":"TimeStamp"} |
- ]}, |
- {"startTime":2210,"data":{"message":"foo13"},"endTime":2380,"type":"TimeStamp","children":[ |
- {"startTime":2220,"data":{"message":"foo14"},"endTime":2270,"type":"TimeStamp"}, |
- {"startTime":2320,"data":{"message":"bar15"},"endTime":2370,"type":"TimeStamp"} |
- ]}, |
- {"startTime":2410,"data":{"message":"foo16"},"endTime":2580,"type":"TimeStamp","children":[ |
- {"startTime":2420,"data":{"message":"foo17"},"endTime":2470,"type":"TimeStamp"}, |
- {"startTime":2520,"data":{"message":"foo18"},"endTime":2570,"type":"TimeStamp"} |
- ]} |
- ]} |
+ var sessionId = "4.20"; |
+ var mainThread = 1; |
+ var pid = 100; |
+ |
+ var testData = [ |
+ { |
+ "args": { "sessionId": sessionId }, |
+ "cat": "disabled-by-default-devtools.timeline", |
+ "name": "TracingStartedInPage", |
+ "ph": "I", |
+ "pid": pid, |
+ "tid": mainThread, |
+ "ts": 100, |
+ }, |
+ {"name": "Program", "ts": 1000000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 1010000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar01"}}}, |
+ {"name": "TimeStamp", "ts": 1020000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar02"}}}, |
+ {"name": "TimeStamp", "ts": 1120000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar03"}}}, |
+ {"name": "TimeStamp", "ts": 1180000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 1210000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar04"}}}, |
+ {"name": "TimeStamp", "ts": 1220000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo05"}}}, |
+ {"name": "TimeStamp", "ts": 1320000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar06"}}}, |
+ {"name": "TimeStamp", "ts": 1380000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 1410000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar07"}}}, |
+ {"name": "TimeStamp", "ts": 1420000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo08"}}}, |
+ {"name": "TimeStamp", "ts": 1520000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo09"}}}, |
+ {"name": "TimeStamp", "ts": 1580000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "Program", "ts": 1990000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "Program", "ts": 2000000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 2010000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo10"}}}, |
+ {"name": "TimeStamp", "ts": 2020000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar11"}}}, |
+ {"name": "TimeStamp", "ts": 2120000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar12"}}}, |
+ {"name": "TimeStamp", "ts": 2180000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 2210000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo13"}}}, |
+ {"name": "TimeStamp", "ts": 2220000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo14"}}}, |
+ {"name": "TimeStamp", "ts": 2320000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"bar15"}}}, |
+ {"name": "TimeStamp", "ts": 2380000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "TimeStamp", "ts": 2410000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo16"}}}, |
+ {"name": "TimeStamp", "ts": 2420000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo17"}}}, |
+ {"name": "TimeStamp", "ts": 2520000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {"data":{"message":"foo18"}}}, |
+ {"name": "TimeStamp", "ts": 2580000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}, |
+ {"name": "Program", "ts": 2590000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}} |
]; |
var panel = WebInspector.inspectorView.showPanel("timeline"); |
var view = panel._currentViews[0]; |
var model = view._presentationModel; |
+ // Reset filter to accept all records. |
+ InspectorTest.loadTimelineTraceEvents(sessionId, testData); |
+ |
function printRecord(record) |
{ |
var prefix = []; |
@@ -61,8 +77,6 @@ function test() |
InspectorTest.addResult(""); |
} |
- InspectorTest.loadTimelineRecords(records); |
- |
InspectorTest.addResult("Initial:"); |
dumpRecords(); |