Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: LayoutTests/http/tests/inspector/timeline-test.js

Issue 399043002: DevTools: switch Timeline frontend into buffered mode and remove the corresponding experiment. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: minor changes Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: LayoutTests/http/tests/inspector/timeline-test.js
diff --git a/LayoutTests/http/tests/inspector/timeline-test.js b/LayoutTests/http/tests/inspector/timeline-test.js
index 9a891477c796bfc9fc03f64ef305037e77159398..ae9f8d142f05b6f4f0f51edc82d074f31a3be891 100644
--- a/LayoutTests/http/tests/inspector/timeline-test.js
+++ b/LayoutTests/http/tests/inspector/timeline-test.js
@@ -41,9 +41,10 @@ InspectorTest.timelineModel = function()
InspectorTest.startTimeline = function(callback)
{
InspectorTest._timelineRecords = [];
- WebInspector.inspectorView.panel("timeline").toggleTimelineButton.toggled = true;
- WebInspector.inspectorView.panel("timeline")._model._collectionEnabled = true;
- TimelineAgent.start(5, false, undefined, true, false, callback);
+ var panel = WebInspector.inspectorView.panel("timeline");
+ panel.toggleTimelineButton.toggled = true;
+ panel._userInitiatedRecording = true;
+ TimelineAgent.start(5, undefined, true, false, callback);
function addRecord(record)
{
InspectorTest._timelineRecords.push(record);
@@ -57,34 +58,16 @@ InspectorTest.startTimeline = function(callback)
WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, InspectorTest._addTimelineEvent);
};
-
-InspectorTest.waitForRecordType = function(recordType, callback)
-{
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, addEvent);
-
- function addEvent(event)
- {
- addRecord(event.data);
- }
- function addRecord(record)
- {
- if (record.type !== WebInspector.TimelineModel.RecordType[recordType]) {
- for (var i = 0; record.children && i < record.children.length; ++i)
- addRecord(record.children[i]);
- return;
- }
- WebInspector.timelineManager.removeEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, addEvent);
- callback(record);
- }
-}
-
InspectorTest.stopTimeline = function(callback)
{
- function didStop()
+ function didStop(error)
{
+ if (error)
+ testRunner.logToStderr("error: " + error);
WebInspector.timelineManager.removeEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, InspectorTest._addTimelineEvent);
- WebInspector.inspectorView.panel("timeline").toggleTimelineButton.toggled = false;
- WebInspector.inspectorView.panel("timeline")._model._collectionEnabled = false;
+ var panel = WebInspector.inspectorView.panel("timeline");
+ panel.toggleTimelineButton.toggled = false;
+ panel._userInitiatedRecording = false;
callback(InspectorTest._timelineRecords);
}
TimelineAgent.stop(didStop);
@@ -139,6 +122,30 @@ InspectorTest.performActionsAndPrint = function(actions, typeName, includeTimeSt
InspectorTest.evaluateWithTimeline(actions, callback);
};
+InspectorTest.filterTimelineRecords = function(typeName, firstOnly)
+{
+ var filteredRecords = [];
+ filterRecords(typeName, InspectorTest._timelineRecords);
+ return filteredRecords;
+
+ function filterRecords(typeName, records)
+ {
+ if (!records)
+ return false;
+ for (var i = 0; i < records.length; ++i) {
+ var recordTypeName = (typeof records[i].type === "string") ? records[i].type : records[i].type();
yurys 2014/07/17 10:42:24 This must always be type(), can we fix this?
+ if (typeName && recordTypeName === WebInspector.TimelineModel.RecordType[typeName]) {
+ filteredRecords.push(records[i]);
+ if (firstOnly)
+ return true;
+ }
+ if (filterRecords(typeName, records[i].children))
+ return true;
+ }
+ return false;
+ }
+}
+
InspectorTest.printTimelineRecords = function(typeName, formatter)
{
InspectorTest.innerPrintTimelineRecords(InspectorTest._timelineRecords, typeName, formatter);

Powered by Google App Engine
This is Rietveld 408576698