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 43075d747c8162edac27d9d44f9a6a16d8f9170a..f3ff76409478effd47e5e9cac8be4b6f962206bd 100644 |
| --- a/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/timeline-test.js |
| @@ -333,10 +333,10 @@ InspectorTest.printTraceEventPropertiesIfNameMatches = function(set, traceEvent) |
| InspectorTest.printTraceEventProperties = function(traceEvent) |
| { |
| InspectorTest.addResult(traceEvent.name + " Properties:"); |
| - var data = traceEvent.args["beginData"] || traceEvent.args["data"]; |
| + var data = traceEvent.args && (traceEvent.args["beginData"] || traceEvent.args["data"]); |
|
caseq
2016/10/14 18:08:44
This check shouldn't be necessary, we've always go
|
| var frameId = data && data["frame"]; |
| var object = { |
| - data: traceEvent.args["data"] || traceEvent.args, |
| + data: traceEvent.args && traceEvent.args["data"] || traceEvent.args, |
| endTime: traceEvent.endTime || traceEvent.startTime, |
| frameId: frameId, |
| stackTrace: traceEvent.stackTrace, |