| 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.mainTarget()); | 6 InspectorTest.tracingManager = WebInspector.panels.timeline._tracingManager || n
ew WebInspector.TracingManager(); |
| 7 InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(Inspe
ctorTest.tracingModel, new WebInspector.TimelineRecordHiddenTypeFilter([])); | 7 InspectorTest.tracingModel = new WebInspector.TracingModel(); |
| 8 InspectorTest.tracingTimelineModel = new WebInspector.TracingTimelineModel(Inspe
ctorTest.tracingManager, InspectorTest.tracingModel, new WebInspector.TimelineRe
cordHiddenTypeFilter([])); |
| 8 | 9 |
| 9 InspectorTest.invokeWithTracing = function(functionName, callback, additionalCat
egories) | 10 InspectorTest.invokeWithTracing = function(functionName, callback, additionalCat
egories) |
| 10 { | 11 { |
| 11 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineMod
el.Events.RecordingStarted, onTracingStarted, this); | 12 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.TimelineMod
el.Events.RecordingStarted, onTracingStarted, this); |
| 12 var categories = "-*,disabled-by-default-devtools.timeline*"; | 13 var categories = "-*,disabled-by-default-devtools.timeline*"; |
| 13 if (additionalCategories) | 14 if (additionalCategories) |
| 14 categories += "," + additionalCategories; | 15 categories += "," + additionalCategories; |
| 15 InspectorTest.tracingTimelineModel._startRecordingWithCategories(categories)
; | 16 InspectorTest.tracingTimelineModel._startRecordingWithCategories(categories)
; |
| 16 | 17 |
| 17 function onTracingStarted(event) | 18 function onTracingStarted(event) |
| 18 { | 19 { |
| 19 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStarted, onTracingStarted, this); | 20 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStarted, onTracingStarted, this); |
| 20 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); | 21 InspectorTest.invokePageFunctionAsync(functionName, onPageActionsDone); |
| 21 } | 22 } |
| 22 | 23 |
| 23 function onPageActionsDone() | 24 function onPageActionsDone() |
| 24 { | 25 { |
| 25 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.Timelin
eModel.Events.RecordingStopped, onTracingComplete, this); | 26 InspectorTest.tracingTimelineModel.addEventListener(WebInspector.Timelin
eModel.Events.RecordingStopped, onTracingComplete, this); |
| 26 InspectorTest.tracingTimelineModel.stopRecording(); | 27 InspectorTest.tracingTimelineModel.stopRecording(); |
| 27 } | 28 } |
| 28 | 29 |
| 29 function onTracingComplete(event) | 30 function onTracingComplete(event) |
| 30 { | 31 { |
| 31 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStopped, onTracingComplete, this); | 32 InspectorTest.tracingTimelineModel.removeEventListener(WebInspector.Time
lineModel.Events.RecordingStopped, onTracingComplete, this); |
| 32 callback(); | 33 callback(); |
| 33 } | 34 } |
| 34 } | 35 } |
| 35 | 36 |
| 36 } | 37 } |
| OLD | NEW |