OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 The Chromium Authors. All rights reserved. | 2 * Copyright 2014 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 /** | 7 /** |
8 * @constructor | 8 * @constructor |
9 * @extends {WebInspector.Object} | 9 * @extends {WebInspector.Object} |
10 * @implements {WebInspector.TargetManager.Observer} | 10 * @implements {WebInspector.TargetManager.Observer} |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 if (!this._devtoolsPageMetadataEvents.length) { | 288 if (!this._devtoolsPageMetadataEvents.length) { |
289 WebInspector.console.error(WebInspector.TracingModel.DevToolsMetadat
aEvent.TracingStartedInPage + " event not found."); | 289 WebInspector.console.error(WebInspector.TracingModel.DevToolsMetadat
aEvent.TracingStartedInPage + " event not found."); |
290 return; | 290 return; |
291 } | 291 } |
292 var sessionId = this._devtoolsPageMetadataEvents[0].args["sessionId"]; | 292 var sessionId = this._devtoolsPageMetadataEvents[0].args["sessionId"]; |
293 this._sessionId = sessionId; | 293 this._sessionId = sessionId; |
294 | 294 |
295 var mismatchingIds = {}; | 295 var mismatchingIds = {}; |
296 function checkSessionId(event) | 296 function checkSessionId(event) |
297 { | 297 { |
298 var id = event.args["sessionId"]; | 298 var args = event.args; |
| 299 // FIXME: put sessionId into args["data"] for TracingStartedInPage e
vent. |
| 300 if (args["data"]) |
| 301 args = args["data"]; |
| 302 var id = args["sessionId"]; |
299 if (id === sessionId) | 303 if (id === sessionId) |
300 return true; | 304 return true; |
301 mismatchingIds[id] = true; | 305 mismatchingIds[id] = true; |
302 return false; | 306 return false; |
303 } | 307 } |
304 this._devtoolsPageMetadataEvents = this._devtoolsPageMetadataEvents.filt
er(checkSessionId); | 308 this._devtoolsPageMetadataEvents = this._devtoolsPageMetadataEvents.filt
er(checkSessionId); |
305 this._devtoolsWorkerMetadataEvents = this._devtoolsWorkerMetadataEvents.
filter(checkSessionId); | 309 this._devtoolsWorkerMetadataEvents = this._devtoolsWorkerMetadataEvents.
filter(checkSessionId); |
306 | 310 |
307 var idList = Object.keys(mismatchingIds); | 311 var idList = Object.keys(mismatchingIds); |
308 if (idList.length) | 312 if (idList.length) |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 * @param {!WebInspector.TracingModel.Process} process | 694 * @param {!WebInspector.TracingModel.Process} process |
691 * @param {number} id | 695 * @param {number} id |
692 */ | 696 */ |
693 WebInspector.TracingModel.Thread = function(process, id) | 697 WebInspector.TracingModel.Thread = function(process, id) |
694 { | 698 { |
695 WebInspector.TracingModel.NamedObject.call(this); | 699 WebInspector.TracingModel.NamedObject.call(this); |
696 this._process = process; | 700 this._process = process; |
697 this._setName("Thread " + id); | 701 this._setName("Thread " + id); |
698 this._events = []; | 702 this._events = []; |
699 this._asyncEvents = []; | 703 this._asyncEvents = []; |
| 704 this._id = id; |
700 | 705 |
701 this._stack = []; | 706 this._stack = []; |
702 } | 707 } |
703 | 708 |
704 WebInspector.TracingModel.Thread.prototype = { | 709 WebInspector.TracingModel.Thread.prototype = { |
705 | 710 |
706 /** | 711 /** |
707 * @return {?WebInspector.Target} | 712 * @return {?WebInspector.Target} |
708 */ | 713 */ |
709 target: function() | 714 target: function() |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
741 | 746 |
742 /** | 747 /** |
743 * @param {!Array.<!WebInspector.TracingModel.Event>} eventSteps | 748 * @param {!Array.<!WebInspector.TracingModel.Event>} eventSteps |
744 */ | 749 */ |
745 _addAsyncEventSteps: function(eventSteps) | 750 _addAsyncEventSteps: function(eventSteps) |
746 { | 751 { |
747 this._asyncEvents.push(eventSteps); | 752 this._asyncEvents.push(eventSteps); |
748 }, | 753 }, |
749 | 754 |
750 /** | 755 /** |
| 756 * @return {number} |
| 757 */ |
| 758 id: function() |
| 759 { |
| 760 return this._id; |
| 761 }, |
| 762 |
| 763 /** |
751 * @return {!WebInspector.TracingModel.Process} | 764 * @return {!WebInspector.TracingModel.Process} |
752 */ | 765 */ |
753 process: function() | 766 process: function() |
754 { | 767 { |
755 return this._process; | 768 return this._process; |
756 }, | 769 }, |
757 | 770 |
758 /** | 771 /** |
759 * @return {!Array.<!WebInspector.TracingModel.Event>} | 772 * @return {!Array.<!WebInspector.TracingModel.Event>} |
760 */ | 773 */ |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
805 tracingComplete: function() | 818 tracingComplete: function() |
806 { | 819 { |
807 this._tracingModel._tracingComplete(); | 820 this._tracingModel._tracingComplete(); |
808 }, | 821 }, |
809 | 822 |
810 started: function() | 823 started: function() |
811 { | 824 { |
812 this._tracingModel._tracingStarted(); | 825 this._tracingModel._tracingStarted(); |
813 } | 826 } |
814 } | 827 } |
OLD | NEW |