| 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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 this._lastChildEndTime = this.endTime; | 535 this._lastChildEndTime = this.endTime; |
| 536 this._startTimeOffset = this.startTime - model.minimumRecordTime(); | 536 this._startTimeOffset = this.startTime - model.minimumRecordTime(); |
| 537 | 537 |
| 538 if (record.data) { | 538 if (record.data) { |
| 539 if (record.data["url"]) | 539 if (record.data["url"]) |
| 540 this.url = record.data["url"]; | 540 this.url = record.data["url"]; |
| 541 if (record.data["rootNode"]) | 541 if (record.data["rootNode"]) |
| 542 this._relatedBackendNodeId = record.data["rootNode"]; | 542 this._relatedBackendNodeId = record.data["rootNode"]; |
| 543 else if (record.data["elementId"]) | 543 else if (record.data["elementId"]) |
| 544 this._relatedBackendNodeId = record.data["elementId"]; | 544 this._relatedBackendNodeId = record.data["elementId"]; |
| 545 if (record.data["scriptName"]) { | 545 if (record.data["scriptName"] || record.data["scriptId"]) { |
| 546 this.scriptId = record.data["scriptId"]; |
| 546 this.scriptName = record.data["scriptName"]; | 547 this.scriptName = record.data["scriptName"]; |
| 547 this.scriptLine = record.data["scriptLine"]; | 548 this.scriptLine = record.data["scriptLine"]; |
| 548 } | 549 } |
| 549 } | 550 } |
| 550 | 551 |
| 551 if (parentRecord && parentRecord.callSiteStackTrace) | 552 if (parentRecord && parentRecord.callSiteStackTrace) |
| 552 this.callSiteStackTrace = parentRecord.callSiteStackTrace; | 553 this.callSiteStackTrace = parentRecord.callSiteStackTrace; |
| 553 | 554 |
| 554 var recordTypes = WebInspector.TimelineModel.RecordType; | 555 var recordTypes = WebInspector.TimelineModel.RecordType; |
| 555 switch (record.type) { | 556 switch (record.type) { |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1167 WebInspector.TimelineModel._quadFromRectData = function(data) | 1168 WebInspector.TimelineModel._quadFromRectData = function(data) |
| 1168 { | 1169 { |
| 1169 if (typeof data["x"] === "undefined" || typeof data["y"] === "undefined") | 1170 if (typeof data["x"] === "undefined" || typeof data["y"] === "undefined") |
| 1170 return null; | 1171 return null; |
| 1171 var x0 = data["x"]; | 1172 var x0 = data["x"]; |
| 1172 var x1 = data["x"] + data["width"]; | 1173 var x1 = data["x"] + data["width"]; |
| 1173 var y0 = data["y"]; | 1174 var y0 = data["y"]; |
| 1174 var y1 = data["y"] + data["height"]; | 1175 var y1 = data["y"] + data["height"]; |
| 1175 return [x0, y0, x1, y0, x1, y1, x0, y1]; | 1176 return [x0, y0, x1, y0, x1, y1, x0, y1]; |
| 1176 } | 1177 } |
| OLD | NEW |