| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 {"name": "FunctionCall", "ts": 1264002, args: {}, "dur": 23000, "ph"
: "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeli
ne" }, | 269 {"name": "FunctionCall", "ts": 1264002, args: {}, "dur": 23000, "ph"
: "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default-devtools.timeli
ne" }, |
| 270 {"name": "CompositeLayers", "ts": 1287003, args: { "layerTreeId": 17
}, "dur": 500, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-def
ault-devtools.timeline" }, | 270 {"name": "CompositeLayers", "ts": 1287003, args: { "layerTreeId": 17
}, "dur": 500, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-def
ault-devtools.timeline" }, |
| 271 {"name": "ActivateLayerTree", "ts": 1270000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, | 271 {"name": "ActivateLayerTree", "ts": 1270000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, |
| 272 {"name": "DrawFrame", "ts": 1270001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, | 272 {"name": "DrawFrame", "ts": 1270001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 273 {"name": "ActivateLayerTree", "ts": 1296000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, | 273 {"name": "ActivateLayerTree", "ts": 1296000, args: { "layerTreeId":
17 }, "ph": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devto
ols.timeline" }, |
| 274 {"name": "DrawFrame", "ts": 1296001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, | 274 {"name": "DrawFrame", "ts": 1296001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 275 {"name": "DrawFrame", "ts": 1312000, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, | 275 {"name": "DrawFrame", "ts": 1312000, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default-devtools.time
line" }, |
| 276 ], | 276 ], |
| 277 }; | 277 }; |
| 278 | 278 |
| 279 var frameModel = new WebInspector.TimelineFrameModel(event => WebInspector.T
imelineUIUtils.eventStyle(event).category.name); | 279 var frameModel = new TimelineModel.TimelineFrameModel(event => Timeline.Time
lineUIUtils.eventStyle(event).category.name); |
| 280 | 280 |
| 281 function loadEvents(events) | 281 function loadEvents(events) |
| 282 { | 282 { |
| 283 var tracingTimelineModel = InspectorTest.createTimelineModelWithEvents(e
vents); | 283 var tracingTimelineModel = InspectorTest.createTimelineModelWithEvents(e
vents); |
| 284 frameModel.reset(); | 284 frameModel.reset(); |
| 285 frameModel.addTraceEvents(WebInspector.targetManager.mainTarget(), traci
ngTimelineModel.inspectedTargetEvents(), sessionId); | 285 frameModel.addTraceEvents(SDK.targetManager.mainTarget(), tracingTimelin
eModel.inspectedTargetEvents(), sessionId); |
| 286 } | 286 } |
| 287 | 287 |
| 288 for (var testName in testData) { | 288 for (var testName in testData) { |
| 289 var data = testData[testName]; | 289 var data = testData[testName]; |
| 290 loadEvents(commonMetadata.concat(data)) | 290 loadEvents(commonMetadata.concat(data)) |
| 291 InspectorTest.addResult("Test: " + testName); | 291 InspectorTest.addResult("Test: " + testName); |
| 292 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest); | 292 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest); |
| 293 } | 293 } |
| 294 InspectorTest.completeTest(); | 294 InspectorTest.completeTest(); |
| 295 } | 295 } |
| 296 | 296 |
| 297 </script> | 297 </script> |
| 298 </head> | 298 </head> |
| 299 | 299 |
| 300 <body onload="runTest()"> | 300 <body onload="runTest()"> |
| 301 <p> | 301 <p> |
| 302 Test the frames are correctly built based on trace events | 302 Test the frames are correctly built based on trace events |
| 303 </p> | 303 </p> |
| 304 | 304 |
| 305 </body> | 305 </body> |
| 306 </html> | 306 </html> |
| OLD | NEW |