| OLD | NEW |
| 1 function initialize_TracingTest() | 1 function initialize_TracingTest() |
| 2 { | 2 { |
| 3 | 3 |
| 4 // FIXME: remove when tracing is out of experimental | 4 // FIXME: remove when tracing is out of experimental |
| 5 WebInspector.inspectorView.showPanel("timeline"); | 5 WebInspector.inspectorView.showPanel("timeline"); |
| 6 InspectorTest.tracingModel = new WebInspector.TracingModel(WebInspector.targetMa
nager.activeTarget()); | 6 InspectorTest.tracingModel = new WebInspector.TracingModel(WebInspector.targetMa
nager.activeTarget()); |
| 7 InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(Inspe
ctorTest.tracingModel, new WebInspector.TimelineRecordHiddenTypeFilter([])); | 7 InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(Inspe
ctorTest.tracingModel, new WebInspector.TimelineRecordHiddenTypeFilter([])); |
| 8 | 8 |
| 9 InspectorTest.invokeWithTracing = function(categoryFilter, functionName, callbac
k) | 9 InspectorTest.invokeWithTracing = function(functionName, callback, additionalCat
egories) |
| 10 { | 10 { |
| 11 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineMod
el.Events.RecordingStarted, onTracingStarted, this); | 11 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineMod
el.Events.RecordingStarted, onTracingStarted, this); |
| 12 InspectorTest.tracingTimelineModel._startRecordingWithCategories(categoryFil
ter); | 12 var categories = "-*,disabled-by-default-devtools.timeline*"; |
| 13 if (additionalCategories) |
| 14 categories += "," + additionalCategories; |
| 15 InspectorTest.tracingTimelineModel._startRecordingWithCategories(categories)
; |
| 13 | 16 |
| 14 function onTracingStarted(event) | 17 function onTracingStarted(event) |
| 15 { | 18 { |
| 16 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStarted, onTracingStarted, this); | 19 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStarted, onTracingStarted, this); |
| 17 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); | 20 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); |
| 18 } | 21 } |
| 19 | 22 |
| 20 function onPageActionsDone() | 23 function onPageActionsDone() |
| 21 { | 24 { |
| 22 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.Timelin
eModel.Events.RecordingStopped, onTracingComplete, this); | 25 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.Timelin
eModel.Events.RecordingStopped, onTracingComplete, this); |
| 23 InspectorTest.tracingTimelineModel.stopRecording(); | 26 InspectorTest.tracingTimelineModel.stopRecording(); |
| 24 } | 27 } |
| 25 | 28 |
| 26 function onTracingComplete(event) | 29 function onTracingComplete(event) |
| 27 { | 30 { |
| 28 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStopped, onTracingComplete, this); | 31 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStopped, onTracingComplete, this); |
| 29 callback(); | 32 callback(); |
| 30 } | 33 } |
| 31 } | 34 } |
| 32 | 35 |
| 33 } | 36 } |
| OLD | NEW |