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

Unified Diff: chrome/browser/resources/gpu_internals/tracing_controller_tests.js

Issue 7495036: about:gpu support for thread name metadata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More cleanup Created 9 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
« no previous file with comments | « chrome/browser/resources/gpu_internals/timeline_track.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/gpu_internals/tracing_controller_tests.js
diff --git a/chrome/browser/resources/gpu_internals/tracing_controller_tests.js b/chrome/browser/resources/gpu_internals/tracing_controller_tests.js
index b4ad5d2371850cd56c71939f800713ed0de71cdf..d8fcc377ea2e3f1a7623a0931b08b9198db31d9d 100644
--- a/chrome/browser/resources/gpu_internals/tracing_controller_tests.js
+++ b/chrome/browser/resources/gpu_internals/tracing_controller_tests.js
@@ -8,6 +8,19 @@ cr.define('gpu', function() {
events_url: "./tests/big_trace.json"
},
{
+ name: "trivial_trace",
+ events: [
+ {"name":"a","args":{},"pid":6052,"ts":3074899524,
+ "cat":"foo","tid":6053,"ph":"B"},
+ {"name":"a","args":{},"pid":6052,"ts":3074899560,
+ "cat":"foo","tid":6053,"ph":"E"},
+ {"name":"b","args":{},"pid":6052,"ts":3074899629,
+ "cat":"foo","tid":6053,"ph":"B"},
+ {"name":"b","args":{},"pid":6052,"ts":3074899631,
+ "cat":"foo","tid":6053,"ph":"E"},
+ ]
+ },
+ {
name: "simple_trace",
events: [
{"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B","name":"A","args":{}},
@@ -24,7 +37,14 @@ cr.define('gpu', function() {
{"cat":"PERF","pid":22630,"tid":22630,"ts":854,"ph":"E","name":"B","args":{}},
{"cat":"PERF","pid":22630,"tid":22631,"ts":827,"ph":"B","name":"A","args":{}},
- {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E","name":"A","args":{}}
+ {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E","name":"A","args":{}},
+
+ {"cat":"__metadata","pid":22630,"tid":22630,"ts":0,
+ "ph":"M","name":"thread_name","args":{"name": "threadA"}},
+ {"cat":"__metadata","pid":22630,"tid":22631,"ts":0,
+ "ph":"M","name":"thread_name","args":{"name": "threadB"}},
+ {"cat":"__metadata","pid":22630,"tid":22632,"ts":0,
+ "ph":"M","name":"thread_name","args":{"name": "threadC"}},
]
},
{
@@ -83,8 +103,8 @@ cr.define('gpu', function() {
{"cat":"PERF","pid":22630,"tid":22610,"ts":840,"ph":"B","name":"A","args":{}},
{"cat":"PERF","pid":22630,"tid":22610,"ts":848,"ph":"E","name":"A","args":{}},
- {"cat":"PERF","pid":22630,"tid":22611,"ts":840,"ph":"B","name":"A","args":{}},
- {"cat":"PERF","pid":22630,"tid":22611,"ts":848,"ph":"E","name":"A","args":{}},
+ {"cat":"PERF","pid":22631,"tid":22611,"ts":840,"ph":"B","name":"A","args":{}},
+ {"cat":"PERF","pid":22631,"tid":22611,"ts":848,"ph":"E","name":"A","args":{}},
{"cat":"PERF","pid":22630,"tid":22612,"ts":840,"ph":"B","name":"A","args":{}},
{"cat":"PERF","pid":22630,"tid":22612,"ts":848,"ph":"E","name":"A","args":{}},
@@ -96,7 +116,12 @@ cr.define('gpu', function() {
{"cat":"PERF","pid":22630,"tid":22614,"ts":848,"ph":"E","name":"A","args":{}},
{"cat":"PERF","pid":22630,"tid":22615,"ts":840,"ph":"B","name":"A","args":{}},
- {"cat":"PERF","pid":22630,"tid":22615,"ts":848,"ph":"E","name":"A","args":{}}
+ {"cat":"PERF","pid":22630,"tid":22615,"ts":848,"ph":"E","name":"A","args":{}},
+
+ {"cat":"__metadata","pid":22630,"tid":22614,"ts":0,
+ "ph":"M","name":"thread_name","args":{"name": "threadB"}},
+ {"cat":"__metadata","pid":22630,"tid":22615,"ts":0,
+ "ph":"M","name":"thread_name","args":{"name": "threadA"}},
]
},
{
« no previous file with comments | « chrome/browser/resources/gpu_internals/timeline_track.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698