| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 this._addBackgroundTraceEvent(event); | 398 this._addBackgroundTraceEvent(event); |
| 399 } | 399 } |
| 400 }, | 400 }, |
| 401 | 401 |
| 402 /** | 402 /** |
| 403 * @param {!WebInspector.TracingModel.Event} event | 403 * @param {!WebInspector.TracingModel.Event} event |
| 404 */ | 404 */ |
| 405 _addBackgroundTraceEvent: function(event) | 405 _addBackgroundTraceEvent: function(event) |
| 406 { | 406 { |
| 407 var eventNames = WebInspector.TimelineModel.RecordType; | 407 var eventNames = WebInspector.TimelineModel.RecordType; |
| 408 if (this._lastFrame && event.selfTime) | 408 if (this._lastFrame && event.selfTime && !WebInspector.TracingModel.isTo
pLevelEvent(event)) |
| 409 this._lastFrame._addTimeForCategory(WebInspector.TimelineUIUtils.eve
ntStyle(event).category.name, event.selfTime); | 409 this._lastFrame._addTimeForCategory(WebInspector.TimelineUIUtils.eve
ntStyle(event).category.name, event.selfTime); |
| 410 | 410 |
| 411 if (event.args["layerTreeId"] !== this._layerTreeId) | 411 if (event.args["layerTreeId"] !== this._layerTreeId) |
| 412 return; | 412 return; |
| 413 | 413 |
| 414 var timestamp = event.startTime; | 414 var timestamp = event.startTime; |
| 415 if (event.name === eventNames.BeginFrame) | 415 if (event.name === eventNames.BeginFrame) |
| 416 this.handleBeginFrame(timestamp); | 416 this.handleBeginFrame(timestamp); |
| 417 else if (event.name === eventNames.DrawFrame) | 417 else if (event.name === eventNames.DrawFrame) |
| 418 this.handleDrawFrame(timestamp); | 418 this.handleDrawFrame(timestamp); |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 */ | 652 */ |
| 653 WebInspector.PendingFrame = function(timeByCategory) | 653 WebInspector.PendingFrame = function(timeByCategory) |
| 654 { | 654 { |
| 655 /** @type {!Object.<string, number>} */ | 655 /** @type {!Object.<string, number>} */ |
| 656 this.timeByCategory = timeByCategory; | 656 this.timeByCategory = timeByCategory; |
| 657 /** @type {!Array.<!WebInspector.LayerPaintEvent>} */ | 657 /** @type {!Array.<!WebInspector.LayerPaintEvent>} */ |
| 658 this.paints = []; | 658 this.paints = []; |
| 659 /** @type {number|undefined} */ | 659 /** @type {number|undefined} */ |
| 660 this.mainFrameId = undefined; | 660 this.mainFrameId = undefined; |
| 661 } | 661 } |
| OLD | NEW |