| OLD | NEW |
| 1 function initialize_TracingTest() | 1 function initialize_TracingTest() |
| 2 { | 2 { |
| 3 | 3 |
| 4 InspectorTest.preloadPanel("timeline"); | 4 InspectorTest.preloadPanel("timeline"); |
| 5 WebInspector.TempFile = InspectorTest.TempFileMock; | 5 WebInspector.TempFile = InspectorTest.TempFileMock; |
| 6 | 6 |
| 7 InspectorTest.createTracingModel = function() | 7 InspectorTest.createTracingModel = function() |
| 8 { | 8 { |
| 9 return new WebInspector.TracingModel(new WebInspector.TempFileBackingStorage
("tracing")); | 9 return new WebInspector.TracingModel(new WebInspector.TempFileBackingStorage
("tracing")); |
| 10 } | 10 } |
| 11 | 11 |
| 12 InspectorTest.tracingModel = function() | 12 InspectorTest.tracingModel = function() |
| 13 { | 13 { |
| 14 return WebInspector.panels.timeline._tracingModel; | 14 return WebInspector.panels.timeline._tracingModel; |
| 15 } | 15 } |
| 16 | 16 |
| 17 InspectorTest.tracingTimelineModel = function() | 17 InspectorTest.tracingTimelineModel = function() |
| 18 { | 18 { |
| 19 return WebInspector.panels.timeline._model; | 19 return WebInspector.panels.timeline._model; |
| 20 } | 20 } |
| 21 | 21 |
| 22 InspectorTest.invokeWithTracing = function(functionName, callback, additionalCat
egories, enableJSSampling) | 22 InspectorTest.invokeWithTracing = function(functionName, callback, additionalCat
egories, enableJSSampling) |
| 23 { | 23 { |
| 24 InspectorTest.tracingTimelineModel().addEventListener(WebInspector.TimelineM
odel.Events.RecordingStarted, onTracingStarted, this); | |
| 25 var categories = "-*,disabled-by-default-devtools.timeline*"; | 24 var categories = "-*,disabled-by-default-devtools.timeline*"; |
| 26 if (additionalCategories) | 25 if (additionalCategories) |
| 27 categories += "," + additionalCategories; | 26 categories += "," + additionalCategories; |
| 28 InspectorTest.tracingTimelineModel()._startRecordingWithCategories(categorie
s, enableJSSampling); | 27 InspectorTest.tracingTimelineModel()._startRecordingWithCategories(categorie
s, enableJSSampling, tracingStarted); |
| 29 | 28 |
| 30 function onTracingStarted(event) | 29 function tracingStarted() |
| 31 { | 30 { |
| 32 InspectorTest.tracingTimelineModel().removeEventListener(WebInspector.Ti
melineModel.Events.RecordingStarted, onTracingStarted, this); | |
| 33 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); | 31 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); |
| 34 } | 32 } |
| 35 | 33 |
| 36 function onPageActionsDone() | 34 function onPageActionsDone() |
| 37 { | 35 { |
| 38 InspectorTest.tracingTimelineModel().addEventListener(WebInspector.Timel
ineModel.Events.RecordingStopped, onTracingComplete, this); | 36 InspectorTest.tracingTimelineModel().addEventListener(WebInspector.Timel
ineModel.Events.RecordingStopped, onTracingComplete, this); |
| 39 InspectorTest.tracingTimelineModel().stopRecording(); | 37 InspectorTest.tracingTimelineModel().stopRecording(); |
| 40 } | 38 } |
| 41 | 39 |
| 42 function onTracingComplete(event) | 40 function onTracingComplete(event) |
| 43 { | 41 { |
| 44 InspectorTest.tracingTimelineModel().removeEventListener(WebInspector.Ti
melineModel.Events.RecordingStopped, onTracingComplete, this); | 42 InspectorTest.tracingTimelineModel().removeEventListener(WebInspector.Ti
melineModel.Events.RecordingStopped, onTracingComplete, this); |
| 45 callback(); | 43 callback(); |
| 46 } | 44 } |
| 47 } | 45 } |
| 48 | 46 |
| 49 } | 47 } |
| OLD | NEW |