LayoutTests/inspector/timeline/tracing/frame-model.html - Issue 318343003: Move trace event based implementation parts of TimelineModel into TracingTimelineModel

Side by Side Diff: LayoutTests/inspector/timeline/tracing/frame-model.html

Issue 318343003: Move trace event based implementation parts of TimelineModel into TracingTimelineModel (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « LayoutTests/inspector/timeline/tracing/decode-resize.html ('k') | LayoutTests/inspector/tracing-test.js » ('j') | Source/devtools/front_end/timeline/TimelinePanel.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 tracingTimelineModel = new WebInspector.TracingTimelineModel(InspectorTe st.tracingModel);

216 var frameModel = new WebInspector.TimelineFrameModel(WebInspector.targetMana ger.activeTarget());	215 var frameModel = new WebInspector.TimelineFrameModel(WebInspector.targetMana ger.activeTarget());

217	216

218 function loadEvents(events)	217 function loadEvents(events)

219 {	218 {

220 tracingTimelineModel.willStartRecordingTraceEvents();	219 var tracingTimelineModel = InspectorTest.tracingTimelineModel;

221 InspectorTest.tracingModel.setEventsForTest(sessionId, events);	220 tracingTimelineModel.setEventsForTest(sessionId, events);

222 tracingTimelineModel.didStopRecordingTraceEvents();

223 frameModel.reset();	221 frameModel.reset();

224 frameModel.addTraceEvents(tracingTimelineModel.inspectedTargetEvents());	222 frameModel.addTraceEvents(tracingTimelineModel.inspectedTargetEvents());

225 }	223 }

226	224

227 for (var testName in testData) {	225 for (var testName in testData) {

228 var data = testData[testName];	226 var data = testData[testName];

229 loadEvents(commonMetadata.concat(data))	227 loadEvents(commonMetadata.concat(data))

230 InspectorTest.addResult("Test: " + testName);	228 InspectorTest.addResult("Test: " + testName);

231 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest);	229 frameModel.frames().forEach(InspectorTest.dumpFrame, InspectorTest);

232 }	230 }

233 InspectorTest.completeTest();	231 InspectorTest.completeTest();

234 }	232 }

235	233

236 </script>	234 </script>

237 </head>	235 </head>

238	236

239 <body onload="runTest()">	237 <body onload="runTest()">

240 <p>	238 <p>

241 Test timeline records coalescing	239 Test timeline records coalescing

242 </p>	240 </p>

243	241

244 </body>	242 </body>

245 </html>	243 </html>

OLD	NEW