| OLD | NEW | 
|    1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4 cr.define('gpu', function() { |    4 cr.define('gpu', function() { | 
|    5   var dataSets = [ |    5   var dataSets = [ | 
|    6     { |    6     { | 
|    7       name: "big_trace", |    7       name: "big_trace", | 
|    8       events_url: "./tests/big_trace.json" |    8       events_url: "./tests/big_trace.json" | 
|    9     }, |    9     }, | 
|   10     { |   10     { | 
 |   11       name: "trivial_trace", | 
 |   12       events: [ | 
 |   13         {"name":"a","args":{},"pid":6052,"ts":3074899524, | 
 |   14          "cat":"foo","tid":6053,"ph":"B"}, | 
 |   15         {"name":"a","args":{},"pid":6052,"ts":3074899560, | 
 |   16          "cat":"foo","tid":6053,"ph":"E"}, | 
 |   17         {"name":"b","args":{},"pid":6052,"ts":3074899629, | 
 |   18          "cat":"foo","tid":6053,"ph":"B"}, | 
 |   19         {"name":"b","args":{},"pid":6052,"ts":3074899631, | 
 |   20          "cat":"foo","tid":6053,"ph":"E"}, | 
 |   21       ] | 
 |   22     }, | 
 |   23     { | 
|   11       name: "simple_trace", |   24       name: "simple_trace", | 
|   12       events: [ |   25       events: [ | 
|   13         {"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B","name":"A","args
     ":{}}, |   26         {"cat":"PERF","pid":22630,"tid":22630,"ts":826,"ph":"B","name":"A","args
     ":{}}, | 
|   14         {"cat":"PERF","pid":22630,"tid":22630,"ts":827,"ph":"B","name":"Asub","a
     rgs":{}}, |   27         {"cat":"PERF","pid":22630,"tid":22630,"ts":827,"ph":"B","name":"Asub","a
     rgs":{}}, | 
|   15         {"cat":"PERF","pid":22630,"tid":22630,"ts":828,"ph":"E","name":"Asub","a
     rgs":{}}, |   28         {"cat":"PERF","pid":22630,"tid":22630,"ts":828,"ph":"E","name":"Asub","a
     rgs":{}}, | 
|   16         {"cat":"PERF","pid":22630,"tid":22630,"ts":829,"ph":"B","name":"Asub","a
     rgs":{}}, |   29         {"cat":"PERF","pid":22630,"tid":22630,"ts":829,"ph":"B","name":"Asub","a
     rgs":{}}, | 
|   17         {"cat":"PERF","pid":22630,"tid":22630,"ts":832,"ph":"E","name":"Asub","a
     rgs":{}}, |   30         {"cat":"PERF","pid":22630,"tid":22630,"ts":832,"ph":"E","name":"Asub","a
     rgs":{}}, | 
|   18         {"cat":"PERF","pid":22630,"tid":22630,"ts":833,"ph":"E","name":"","args"
     :{}}, |   31         {"cat":"PERF","pid":22630,"tid":22630,"ts":833,"ph":"E","name":"","args"
     :{}}, | 
|   19  |   32  | 
|   20         {"cat":"PERF","pid":22630,"tid":22630,"ts":840,"ph":"B","name":"A","args
     ":{}}, |   33         {"cat":"PERF","pid":22630,"tid":22630,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   21         {"cat":"PERF","pid":22630,"tid":22630,"ts":848,"ph":"E","name":"A","args
     ":{}}, |   34         {"cat":"PERF","pid":22630,"tid":22630,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   22  |   35  | 
|   23         {"cat":"PERF","pid":22630,"tid":22630,"ts":850,"ph":"B","name":"B","args
     ":{}}, |   36         {"cat":"PERF","pid":22630,"tid":22630,"ts":850,"ph":"B","name":"B","args
     ":{}}, | 
|   24         {"cat":"PERF","pid":22630,"tid":22630,"ts":854,"ph":"E","name":"B","args
     ":{}}, |   37         {"cat":"PERF","pid":22630,"tid":22630,"ts":854,"ph":"E","name":"B","args
     ":{}}, | 
|   25  |   38  | 
|   26         {"cat":"PERF","pid":22630,"tid":22631,"ts":827,"ph":"B","name":"A","args
     ":{}}, |   39         {"cat":"PERF","pid":22630,"tid":22631,"ts":827,"ph":"B","name":"A","args
     ":{}}, | 
|   27         {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E","name":"A","args
     ":{}} |   40         {"cat":"PERF","pid":22630,"tid":22631,"ts":854,"ph":"E","name":"A","args
     ":{}}, | 
 |   41  | 
 |   42         {"cat":"__metadata","pid":22630,"tid":22630,"ts":0, | 
 |   43          "ph":"M","name":"thread_name","args":{"name": "threadA"}}, | 
 |   44         {"cat":"__metadata","pid":22630,"tid":22631,"ts":0, | 
 |   45          "ph":"M","name":"thread_name","args":{"name": "threadB"}}, | 
 |   46         {"cat":"__metadata","pid":22630,"tid":22632,"ts":0, | 
 |   47          "ph":"M","name":"thread_name","args":{"name": "threadC"}}, | 
|   28       ] |   48       ] | 
|   29     }, |   49     }, | 
|   30     { |   50     { | 
|   31       name: "nonnested_trace", |   51       name: "nonnested_trace", | 
|   32       events: [ |   52       events: [ | 
|   33         {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B','name':'A','args
     ':{}}, |   53         {'cat':'PERF','pid':22630,'tid':22630,'ts':826,'ph':'B','name':'A','args
     ':{}}, | 
|   34         {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B','name':'Asub','a
     rgs':{}}, |   54         {'cat':'PERF','pid':22630,'tid':22630,'ts':827,'ph':'B','name':'Asub','a
     rgs':{}}, | 
|   35         {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B','name':'NonNest'
     ,'args':{'id':'1','ui-nest':'0'}}, |   55         {'cat':'PERF','pid':22630,'tid':22630,'ts':829,'ph':'B','name':'NonNest'
     ,'args':{'id':'1','ui-nest':'0'}}, | 
|   36         {'cat':'PERF','pid':22630,'tid':22630,'ts':830,'ph':'B','name':'NonNest'
     ,'args':{'id':'2','ui-nest':'0'}}, |   56         {'cat':'PERF','pid':22630,'tid':22630,'ts':830,'ph':'B','name':'NonNest'
     ,'args':{'id':'2','ui-nest':'0'}}, | 
|   37         {'cat':'PERF','pid':22630,'tid':22630,'ts':831,'ph':'E','name':'Asub','a
     rgs':{}}, |   57         {'cat':'PERF','pid':22630,'tid':22630,'ts':831,'ph':'E','name':'Asub','a
     rgs':{}}, | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   76  |   96  | 
|   77         {"cat":"PERF","pid":22630,"tid":22638,"ts":840,"ph":"B","name":"A","args
     ":{}}, |   97         {"cat":"PERF","pid":22630,"tid":22638,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   78         {"cat":"PERF","pid":22630,"tid":22638,"ts":848,"ph":"E","name":"A","args
     ":{}}, |   98         {"cat":"PERF","pid":22630,"tid":22638,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   79  |   99  | 
|   80         {"cat":"PERF","pid":22630,"tid":22639,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  100         {"cat":"PERF","pid":22630,"tid":22639,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   81         {"cat":"PERF","pid":22630,"tid":22639,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  101         {"cat":"PERF","pid":22630,"tid":22639,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   82  |  102  | 
|   83         {"cat":"PERF","pid":22630,"tid":22610,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  103         {"cat":"PERF","pid":22630,"tid":22610,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   84         {"cat":"PERF","pid":22630,"tid":22610,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  104         {"cat":"PERF","pid":22630,"tid":22610,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   85  |  105  | 
|   86         {"cat":"PERF","pid":22630,"tid":22611,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  106         {"cat":"PERF","pid":22631,"tid":22611,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   87         {"cat":"PERF","pid":22630,"tid":22611,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  107         {"cat":"PERF","pid":22631,"tid":22611,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   88  |  108  | 
|   89         {"cat":"PERF","pid":22630,"tid":22612,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  109         {"cat":"PERF","pid":22630,"tid":22612,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   90         {"cat":"PERF","pid":22630,"tid":22612,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  110         {"cat":"PERF","pid":22630,"tid":22612,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   91  |  111  | 
|   92         {"cat":"PERF","pid":22630,"tid":22613,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  112         {"cat":"PERF","pid":22630,"tid":22613,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   93         {"cat":"PERF","pid":22630,"tid":22613,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  113         {"cat":"PERF","pid":22630,"tid":22613,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   94  |  114  | 
|   95         {"cat":"PERF","pid":22630,"tid":22614,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  115         {"cat":"PERF","pid":22630,"tid":22614,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   96         {"cat":"PERF","pid":22630,"tid":22614,"ts":848,"ph":"E","name":"A","args
     ":{}}, |  116         {"cat":"PERF","pid":22630,"tid":22614,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
|   97  |  117  | 
|   98         {"cat":"PERF","pid":22630,"tid":22615,"ts":840,"ph":"B","name":"A","args
     ":{}}, |  118         {"cat":"PERF","pid":22630,"tid":22615,"ts":840,"ph":"B","name":"A","args
     ":{}}, | 
|   99         {"cat":"PERF","pid":22630,"tid":22615,"ts":848,"ph":"E","name":"A","args
     ":{}} |  119         {"cat":"PERF","pid":22630,"tid":22615,"ts":848,"ph":"E","name":"A","args
     ":{}}, | 
 |  120  | 
 |  121         {"cat":"__metadata","pid":22630,"tid":22614,"ts":0, | 
 |  122          "ph":"M","name":"thread_name","args":{"name": "threadB"}}, | 
 |  123         {"cat":"__metadata","pid":22630,"tid":22615,"ts":0, | 
 |  124          "ph":"M","name":"thread_name","args":{"name": "threadA"}}, | 
|  100       ] |  125       ] | 
|  101     }, |  126     }, | 
|  102     { |  127     { | 
|  103        name: "huge_trace", |  128        name: "huge_trace", | 
|  104        events_url: "./tests/huge_trace.json" |  129        events_url: "./tests/huge_trace.json" | 
|  105     } |  130     } | 
|  106   ]; |  131   ]; | 
|  107  |  132  | 
|  108   // Create UI for controlling the test harness |  133   // Create UI for controlling the test harness | 
|  109   var selectEl = document.createElement("select"); |  134   var selectEl = document.createElement("select"); | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  165           }; |  190           }; | 
|  166           req.send(null); |  191           req.send(null); | 
|  167         } |  192         } | 
|  168       }, |  193       }, | 
|  169  |  194  | 
|  170       endTracing: function() { |  195       endTracing: function() { | 
|  171       } |  196       } | 
|  172     } |  197     } | 
|  173   }; |  198   }; | 
|  174 }); |  199 }); | 
| OLD | NEW |