Chromium Code Reviews| Index: third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| index f23b3e659ea2790fd2faa711303f6cda3e362df4..fb689fbbf1da243f8b73e6f2547c23722da03600 100644 |
| --- a/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| @@ -71,16 +71,16 @@ InspectorTest.timelineFrameModel = function() |
| return WebInspector.panels.timeline._frameModel; |
| } |
| -InspectorTest.startTimeline = function(callback) |
| +InspectorTest.startTimeline = function(callback, disableSampling) |
|
caseq
2016/01/26 01:22:04
callback should always be last.
alph
2016/01/26 02:04:51
Acknowledged.
|
| { |
| var panel = WebInspector.panels.timeline; |
| function onRecordingStarted() |
| { |
| - panel._model.removeEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted, this) |
| + panel._model.removeEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted, this); |
| callback(); |
| } |
| - panel._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted, this) |
| - panel._captureJSProfileSetting.set(false); |
| + panel._model.addEventListener(WebInspector.TimelineModel.Events.RecordingStarted, onRecordingStarted, this); |
| + panel._captureJSProfileSetting.set(!disableSampling); |
| panel._toggleRecording(); |
| }; |
| @@ -96,9 +96,9 @@ InspectorTest.stopTimeline = function(callback) |
| panel._toggleRecording(); |
| }; |
| -InspectorTest.evaluateWithTimeline = function(actions, doneCallback) |
| +InspectorTest.evaluateWithTimeline = function(actions, doneCallback, disableSampling) |
| { |
| - InspectorTest.startTimeline(step1); |
| + InspectorTest.startTimeline(step1, disableSampling); |
| function step1() |
| { |
| InspectorTest.evaluateInPage(actions, step2); |