| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script src="../../http/tests/inspector/inspector-test.js"></script> | 3 <script src="../../http/tests/inspector/inspector-test.js"></script> |
| 4 <script src="../../http/tests/inspector/timeline-test.js"></script> | 4 <script src="../../http/tests/inspector/timeline-test.js"></script> |
| 5 <script src="../tracing-test.js"></script> | 5 <script src="../tracing-test.js"></script> |
| 6 <script> | 6 <script> |
| 7 function test() | 7 function test() |
| 8 { | 8 { |
| 9 var sessionId = "4.20"; | 9 var sessionId = "4.20"; |
| 10 var mainThread = 1; | 10 var mainThread = 1; |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 {"name": "RequestMainThreadFrame", "ts": 1032001, args: { "layerTree
Id": 17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-
devtools.timeline" }, | 233 {"name": "RequestMainThreadFrame", "ts": 1032001, args: { "layerTree
Id": 17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-
devtools.timeline" }, |
| 234 {"name": "DrawFrame", "ts": 1046001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, | 234 {"name": "DrawFrame", "ts": 1046001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 235 | 235 |
| 236 {"name": "Program", "ts": 1033000, args: {}, "dur": 12999, "ph": "X"
, "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }
, | 236 {"name": "Program", "ts": 1033000, args: {}, "dur": 12999, "ph": "X"
, "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }
, |
| 237 {"name": "BeginMainThreadFrame", "ts": 1033001, args: {}, "ph": "I",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }, | 237 {"name": "BeginMainThreadFrame", "ts": 1033001, args: {}, "ph": "I",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }, |
| 238 {"name": "CompositeLayers", "ts": 1033002, args: { "layerTreeId": 17
}, "dur": 7999, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-de
fault-devtools.timeline" }, | 238 {"name": "CompositeLayers", "ts": 1033002, args: { "layerTreeId": 17
}, "dur": 7999, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-de
fault-devtools.timeline" }, |
| 239 {"name": "FunctionCall", "ts": 1041002, args: {}, "dur": 4997, "ph":
"X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timelin
e" }, | 239 {"name": "FunctionCall", "ts": 1041002, args: {}, "dur": 4997, "ph":
"X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timelin
e" }, |
| 240 | 240 |
| 241 {"name": "BeginFrame", "ts": 1048000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, | 241 {"name": "BeginFrame", "ts": 1048000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, |
| 242 {"name": "Program", "ts": 1049000, args: {}, "dur": 999, "ph": "X",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }, | 242 {"name": "Program", "ts": 1049000, args: {}, "dur": 999, "ph": "X",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }, |
| 243 ] | 243 ], |
| 244 "Idle frames": [ |
| 245 {"name": "BeginFrame", "ts": 1000000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, |
| 246 {"name": "ActivateLayerTree", "ts": 1014000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, |
| 247 {"name": "DrawFrame", "ts": 1014001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 248 {"name": "NeedsBeginFrameChanged", "ts": 1015000, args: { "layerTree
Id": 17, "data": { "needsBeginFrame": false } }, "ph": "I", "tid": implThread, "
pid": 100, "cat":"disabled-by-default-devtools.timeline" }, |
| 249 {"name": "NeedsBeginFrameChanged", "ts": 1215000, args: { "layerTree
Id": 17, "data": { "needsBeginFrame": true } }, "ph": "I", "tid": implThread, "p
id": 100, "cat":"disabled-by-default-devtools.timeline" }, |
| 250 {"name": "BeginFrame", "ts": 1231000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, |
| 251 {"name": "BeginFrame", "ts": 1247000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, |
| 252 {"name": "BeginFrame", "ts": 1263000, args: { "layerTreeId": 17 }, "
ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.tim
eline" }, |
| 253 {"name": "RequestMainThreadFrame", "ts": 1263001, args: { "layerTree
Id": 17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-
devtools.timeline" }, |
| 254 |
| 255 {"name": "Program", "ts": 1264000, args: {}, "dur": 24000, "ph": "X"
, "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }
, |
| 256 {"name": "BeginMainThreadFrame", "ts": 1264001, args: {}, "ph": "I",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeline" }, |
| 257 {"name": "FunctionCall", "ts": 1264002, args: {}, "dur": 23000, "ph"
: "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeli
ne" }, |
| 258 {"name": "CompositeLayers", "ts": 1287003, args: { "layerTreeId": 17
}, "dur": 500, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-def
ault-devtools.timeline" }, |
| 259 {"name": "ActivateLayerTree", "ts": 1270000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, |
| 260 {"name": "DrawFrame", "ts": 1270001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 261 {"name": "ActivateLayerTree", "ts": 1296000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, |
| 262 {"name": "DrawFrame", "ts": 1296001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 263 {"name": "DrawFrame", "ts": 1312000, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 264 ], |
| 244 }; | 265 }; |
| 245 | 266 |
| 246 var frameModel = new WebInspector.TracingTimelineFrameModel(); | 267 var frameModel = new WebInspector.TracingTimelineFrameModel(); |
| 247 | 268 |
| 248 function loadEvents(events) | 269 function loadEvents(events) |
| 249 { | 270 { |
| 250 var tracingTimelineModel = InspectorTest.tracingTimelineModel(); | 271 var tracingTimelineModel = InspectorTest.tracingTimelineModel(); |
| 251 tracingTimelineModel.setEventsForTest(events); | 272 tracingTimelineModel.setEventsForTest(events); |
| 252 frameModel.reset(); | 273 frameModel.reset(); |
| 253 frameModel.addTraceEvents(WebInspector.targetManager.mainTarget(), traci
ngTimelineModel.inspectedTargetEvents(), sessionId); | 274 frameModel.addTraceEvents(WebInspector.targetManager.mainTarget(), traci
ngTimelineModel.inspectedTargetEvents(), sessionId); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 265 </script> | 286 </script> |
| 266 </head> | 287 </head> |
| 267 | 288 |
| 268 <body onload="runTest()"> | 289 <body onload="runTest()"> |
| 269 <p> | 290 <p> |
| 270 Test the frames are correctly built based on trace events | 291 Test the frames are correctly built based on trace events |
| 271 </p> | 292 </p> |
| 272 | 293 |
| 273 </body> | 294 </body> |
| 274 </html> | 295 </html> |
| OLD | NEW |