| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 | 205 |
| 206 {"name": "Program", "ts": 1032000, args: {}, "dur": 31999, "ph": "X"
, "tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeline" }
, | 206 {"name": "Program", "ts": 1032000, args: {}, "dur": 31999, "ph": "X"
, "tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeline" }
, |
| 207 {"name": "BeginMainThreadFrame", "ts": 1032001, args: {}, "ph": "I",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeline" }, | 207 {"name": "BeginMainThreadFrame", "ts": 1032001, args: {}, "ph": "I",
"tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeline" }, |
| 208 {"name": "FunctionCall", "ts": 1032002, args: {}, "dur": 10997, "ph"
: "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeli
ne" }, | 208 {"name": "FunctionCall", "ts": 1032002, args: {}, "dur": 10997, "ph"
: "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-default.devtools.timeli
ne" }, |
| 209 {"name": "CompositeLayers", "ts": 1043002, args: { "layerTreeId": 17
}, "dur": 19997, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-d
efault.devtools.timeline" }, | 209 {"name": "CompositeLayers", "ts": 1043002, args: { "layerTreeId": 17
}, "dur": 19997, "ph": "X", "tid": mainThread, "pid": 100, "cat":"disabled-by-d
efault.devtools.timeline" }, |
| 210 | 210 |
| 211 {"name": "DrawFrame", "ts": 1080001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default.devtools.time
line" }, | 211 {"name": "DrawFrame", "ts": 1080001, args: { "layerTreeId": 17 }, "p
h": "I", "tid": implThread, "pid": 100, "cat":"disabled-by-default.devtools.time
line" }, |
| 212 ] | 212 ] |
| 213 }; | 213 }; |
| 214 | 214 |
| 215 var frameModel = new WebInspector.TimelineFrameModel(WebInspector.targetMana
ger.activeTarget()); | 215 var frameModel = new WebInspector.TracingTimelineFrameModel(WebInspector.tar
getManager.activeTarget()); |
| 216 | 216 |
| 217 function loadEvents(events) | 217 function loadEvents(events) |
| 218 { | 218 { |
| 219 var tracingTimelineModel = InspectorTest.tracingTimelineModel; | 219 var tracingTimelineModel = InspectorTest.tracingTimelineModel; |
| 220 tracingTimelineModel.setEventsForTest(sessionId, events); | 220 tracingTimelineModel.setEventsForTest(sessionId, events); |
| 221 frameModel.reset(); | 221 frameModel.reset(); |
| 222 frameModel.addTraceEvents(tracingTimelineModel.inspectedTargetEvents()); | 222 frameModel.addTraceEvents(tracingTimelineModel.inspectedTargetEvents()); |
| 223 } | 223 } |
| 224 | 224 |
| 225 for (var testName in testData) { | 225 for (var testName in testData) { |
| 226 var data = testData[testName]; | 226 var data = testData[testName]; |
| 227 loadEvents(commonMetadata.concat(data)) | 227 loadEvents(commonMetadata.concat(data)) |
| 228 InspectorTest.addResult("Test: " + testName); | 228 InspectorTest.addResult("Test: " + testName); |
| 229 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest); | 229 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest); |
| 230 } | 230 } |
| 231 InspectorTest.completeTest(); | 231 InspectorTest.completeTest(); |
| 232 } | 232 } |
| 233 | 233 |
| 234 </script> | 234 </script> |
| 235 </head> | 235 </head> |
| 236 | 236 |
| 237 <body onload="runTest()"> | 237 <body onload="runTest()"> |
| 238 <p> | 238 <p> |
| 239 Test timeline records coalescing | 239 Test timeline records coalescing |
| 240 </p> | 240 </p> |
| 241 | 241 |
| 242 </body> | 242 </body> |
| 243 </html> | 243 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 320953002:
Timeline: split frame model into trace-specific and record-specific parts (Closed)
Base URL: svn://svn.chromium.org/blink/trunk