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

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

Issue 2422643003: Prepare for new EvaluateScript event coming from V8. (Closed)
Patch Set: Created 4 years, 2 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 | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698