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

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

Issue 715803002: DevTools: merge TracingTimelineModel into TimelineModel (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 | « no previous file | LayoutTests/inspector/tracing-session-id.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 5109ad0ca11adfee240c20dc235027b603d53072..4c223bef132ce5fa83134d40c5718eb4c19d2902 100644
--- a/LayoutTests/http/tests/inspector/timeline-test.js
+++ b/LayoutTests/http/tests/inspector/timeline-test.js
@@ -266,7 +266,7 @@ InspectorTest.printTimelineRecordProperties = function(record)
}
if (record.children().length)
object["children"] = [];
- if (!record.data() && record instanceof WebInspector.TracingTimelineModel.TraceEventRecord)
+ if (!record.data())
object["data"] = record.traceEvent().args;
InspectorTest.addObject(object, InspectorTest.timelinePropertyFormatters);
};
« no previous file with comments | « no previous file | LayoutTests/inspector/tracing-session-id.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698