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

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

Issue 477153005: DevTools: adopt existing Timeline tests for tracing based Timeline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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
« no previous file with comments | « LayoutTests/TestExpectations ('k') | LayoutTests/http/tests/inspector/tracing/timeline-xhr-event.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3bf79a7c586155f31482f47b88250229e2ad6d8f..899850faa4e3f962f578962a17167e89afef6111 100644
--- a/LayoutTests/http/tests/inspector/timeline-test.js
+++ b/LayoutTests/http/tests/inspector/timeline-test.js
@@ -19,11 +19,14 @@ InspectorTest.timelinePropertyFormatters = {
lineNumber: "formatAsTypeName",
columnNumber: "formatAsTypeName",
frameId: "formatAsTypeName",
+ frame: "formatAsTypeName",
encodedDataLength: "formatAsTypeName",
identifier: "formatAsTypeName",
clip: "formatAsTypeName",
root: "formatAsTypeName",
backendNodeId: "formatAsTypeName",
+ nodeId: "formatAsTypeName",
+ rootNode: "formatAsTypeName",
networkTime: "formatAsTypeName",
thread: "formatAsTypeName"
};
@@ -251,6 +254,8 @@ InspectorTest.printTimelineRecordProperties = function(record)
}
if (record.children().length)
object["children"] = [];
+ if (!record.data() && record instanceof WebInspector.TracingTimelineModel.TraceEventRecord)
+ object["data"] = record.traceEvent().args;
InspectorTest.addObject(object, InspectorTest.timelinePropertyFormatters);
};
« no previous file with comments | « LayoutTests/TestExpectations ('k') | LayoutTests/http/tests/inspector/tracing/timeline-xhr-event.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698