OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 RequestAnimationFrame: "RequestAnimationFrame", | 104 RequestAnimationFrame: "RequestAnimationFrame", |
105 CancelAnimationFrame: "CancelAnimationFrame", | 105 CancelAnimationFrame: "CancelAnimationFrame", |
106 FireAnimationFrame: "FireAnimationFrame", | 106 FireAnimationFrame: "FireAnimationFrame", |
107 | 107 |
108 WebSocketCreate : "WebSocketCreate", | 108 WebSocketCreate : "WebSocketCreate", |
109 WebSocketSendHandshakeRequest : "WebSocketSendHandshakeRequest", | 109 WebSocketSendHandshakeRequest : "WebSocketSendHandshakeRequest", |
110 WebSocketReceiveHandshakeResponse : "WebSocketReceiveHandshakeResponse", | 110 WebSocketReceiveHandshakeResponse : "WebSocketReceiveHandshakeResponse", |
111 WebSocketDestroy : "WebSocketDestroy", | 111 WebSocketDestroy : "WebSocketDestroy", |
112 | 112 |
113 EmbedderCallback : "EmbedderCallback", | 113 EmbedderCallback : "EmbedderCallback", |
114 | |
115 // Event types used in tracing based timeline only. | |
116 CallStack: "CallStack", | |
117 } | 114 } |
118 | 115 |
119 WebInspector.TimelineModel.Events = { | 116 WebInspector.TimelineModel.Events = { |
120 RecordAdded: "RecordAdded", | 117 RecordAdded: "RecordAdded", |
121 RecordsCleared: "RecordsCleared", | 118 RecordsCleared: "RecordsCleared", |
122 RecordingStarted: "RecordingStarted", | 119 RecordingStarted: "RecordingStarted", |
123 RecordingStopped: "RecordingStopped", | 120 RecordingStopped: "RecordingStopped", |
124 RecordingProgress: "RecordingProgress", | 121 RecordingProgress: "RecordingProgress", |
125 RecordFilterChanged: "RecordFilterChanged" | 122 RecordFilterChanged: "RecordFilterChanged" |
126 } | 123 } |
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1230 function recordTimestampComparator(a, b) | 1227 function recordTimestampComparator(a, b) |
1231 { | 1228 { |
1232 // Never return 0, as the merge function will squash identical entri
es. | 1229 // Never return 0, as the merge function will squash identical entri
es. |
1233 return a.startTime() < b.startTime() ? -1 : 1; | 1230 return a.startTime() < b.startTime() ? -1 : 1; |
1234 } | 1231 } |
1235 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); | 1232 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); |
1236 this._backgroundRecordsBuffer = []; | 1233 this._backgroundRecordsBuffer = []; |
1237 return result; | 1234 return result; |
1238 } | 1235 } |
1239 } | 1236 } |
OLD | NEW |