| Index: LayoutTests/inspector/timeline/category-filter.html
|
| diff --git a/LayoutTests/inspector/timeline/category-filter.html b/LayoutTests/inspector/timeline/category-filter.html
|
| index 656a68f4d804f623834de30f9d4fc2bb34bbd1c9..8e5694d2a65a72fb3ad815bb789e86274623c63a 100644
|
| --- a/LayoutTests/inspector/timeline/category-filter.html
|
| +++ b/LayoutTests/inspector/timeline/category-filter.html
|
| @@ -17,23 +17,43 @@ function initialize_CategoryFilterTest()
|
|
|
| function test()
|
| {
|
| - var records = [
|
| - {"startTime": 1000.000,"endTime":1099.999,"type":"Program","data":{},"children":[
|
| - {"startTime": 1000.001,"endTime":1099.999,"type":"FunctionCall","data":{},"children":[
|
| - {"startTime": 1000.002,"type":"ResourceSendRequest","data":{"requestId": 1, "url": "http://example.com", "requestMethod": "GET"},"children":[]},
|
| - {"startTime": 1000.003,"endTime":1010.999,"type":"RecalculateStyles","data":{},"children":[]},
|
| - {"startTime": 1010.000,"endTime":1020.999,"type":"Layout","data":{},"children":[]}
|
| - ]}
|
| - ]}
|
| + 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": "FunctionCall", "ts": 1000001, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args":{"data":{"frame":"0x2","scriptId":"3","scriptLine":5,"scriptName":"http://example.com"}}},
|
| +
|
| + {"name":"ResourceSendRequest","ts":1000002,"tid":mainThread,"pid":pid,"cat":"disabled-by-default-devtools.timeline","ph":"I","s":"g","args":{"data":{"frame":"0x2","requestId":"44.1","requestMethod":"GET","url":"http://example.com/foo.js"}}},
|
| +
|
| + {"name": "RecalculateStyles", "ts": 1000003, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args":{"frame":"0x2"} },
|
| + {"name": "RecalculateStyles", "ts": 1009999, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args":{"elementCount":3}},
|
| +
|
| + {"name": "Layout", "ts": 1010000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args":{"beginData":{"dirtyObjects":1,"frame":"0x2","partialLayout":false,"totalObjects":1}} },
|
| + {"name": "Layout", "ts": 1020999, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args":{"endData":{"root":[0,0,1570,0,1570,243,0,243],"rootNode":1}}},
|
| +
|
| + {"name": "FunctionCall", "ts": 1099999, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}},
|
| + {"name": "Program", "ts": 1099999, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default.devtools.timeline", "args": {}}
|
| ];
|
|
|
| - InspectorTest.loadTimelineRecords(records);
|
| + InspectorTest.loadTimelineTraceEvents(sessionId, testData);
|
|
|
| var rootRecord = InspectorTest.timelinePresentationModel().rootRecord();
|
| for (var i = 0; i < rootRecord.presentationChildren().length; ++i)
|
| rootRecord.presentationChildren()[i].setCollapsed(false);
|
|
|
| InspectorTest.addResult("Original records");
|
| + WebInspector.panels.timeline._categoryFilter.notifyFilterChanged();
|
| InspectorTest.dumpVisibleRecords();
|
|
|
| InspectorTest.addResult("Visible records when 'loading' is disabled");
|
|
|