Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Intel Inc. All rights reserved. | 3 * Copyright (C) 2012 Intel Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 250 break; | 250 break; |
| 251 case recordType.TimerInstall: | 251 case recordType.TimerInstall: |
| 252 case recordType.TimerRemove: | 252 case recordType.TimerRemove: |
| 253 detailsText = linkifyTopCallFrameAsText() || eventData["timerId"]; | 253 detailsText = linkifyTopCallFrameAsText() || eventData["timerId"]; |
| 254 break; | 254 break; |
| 255 case recordType.RequestAnimationFrame: | 255 case recordType.RequestAnimationFrame: |
| 256 case recordType.CancelAnimationFrame: | 256 case recordType.CancelAnimationFrame: |
| 257 detailsText = linkifyTopCallFrameAsText() || eventData["id"]; | 257 detailsText = linkifyTopCallFrameAsText() || eventData["id"]; |
| 258 break; | 258 break; |
| 259 case recordType.ParseHTML: | 259 case recordType.ParseHTML: |
| 260 var endLine = event.args["endLine"]; | |
|
alph
2015/04/27 10:04:34
It should be placed into args["data"]["endLine"] ?
pfeldman
2015/04/27 11:52:51
Done.
| |
| 261 var url = event.args["beginData"]["url"]; | |
| 262 if (endLine) | |
| 263 detailsText = WebInspector.UIString("%s [%d:%d]", url, event.args["b eginData"]["startLine"] + 1, endLine); | |
|
alph
2015/04/27 10:04:34
Use ?: please.
pfeldman
2015/04/27 11:52:51
Done.
| |
| 264 else | |
| 265 detailsText = url; | |
| 266 break; | |
| 260 case recordType.RecalculateStyles: | 267 case recordType.RecalculateStyles: |
| 261 detailsText = linkifyTopCallFrameAsText(); | 268 detailsText = linkifyTopCallFrameAsText(); |
| 262 break; | 269 break; |
| 263 case recordType.EvaluateScript: | 270 case recordType.EvaluateScript: |
| 264 var url = eventData["url"]; | 271 var url = eventData["url"]; |
| 265 if (url) | 272 if (url) |
| 266 detailsText = url + ":" + eventData["lineNumber"]; | 273 detailsText = url + ":" + eventData["lineNumber"]; |
| 267 break; | 274 break; |
| 268 case recordType.XHRReadyStateChange: | 275 case recordType.XHRReadyStateChange: |
| 269 case recordType.XHRLoad: | 276 case recordType.XHRLoad: |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 366 case recordType.ResizeImage: | 373 case recordType.ResizeImage: |
| 367 case recordType.DecodeLazyPixelRef: | 374 case recordType.DecodeLazyPixelRef: |
| 368 case recordType.Animation: | 375 case recordType.Animation: |
| 369 case recordType.XHRReadyStateChange: | 376 case recordType.XHRReadyStateChange: |
| 370 case recordType.XHRLoad: | 377 case recordType.XHRLoad: |
| 371 case recordType.ResourceSendRequest: | 378 case recordType.ResourceSendRequest: |
| 372 case recordType.ResourceReceivedData: | 379 case recordType.ResourceReceivedData: |
| 373 case recordType.ResourceReceiveResponse: | 380 case recordType.ResourceReceiveResponse: |
| 374 case recordType.ResourceFinish: | 381 case recordType.ResourceFinish: |
| 375 case recordType.EmbedderCallback: | 382 case recordType.EmbedderCallback: |
| 383 case recordType.ParseHTML: | |
| 376 detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTraceEvent (event, target); | 384 detailsText = WebInspector.TimelineUIUtils.buildDetailsTextForTraceEvent (event, target); |
| 377 break; | 385 break; |
| 378 case recordType.FunctionCall: | 386 case recordType.FunctionCall: |
| 379 details = linkifyLocation(eventData["scriptId"], eventData["scriptName"] , eventData["scriptLine"], 0); | 387 details = linkifyLocation(eventData["scriptId"], eventData["scriptName"] , eventData["scriptLine"], 0); |
| 380 break; | 388 break; |
| 381 case recordType.JSFrame: | 389 case recordType.JSFrame: |
| 382 details = createElement("span"); | 390 details = createElement("span"); |
| 383 details.createTextChild(WebInspector.beautifyFunctionName(eventData["fun ctionName"])); | 391 details.createTextChild(WebInspector.beautifyFunctionName(eventData["fun ctionName"])); |
| 384 var location = linkifyLocation(eventData["scriptId"], eventData["url"], eventData["lineNumber"], eventData["columnNumber"]); | 392 var location = linkifyLocation(eventData["scriptId"], eventData["url"], eventData["lineNumber"], eventData["columnNumber"]); |
| 385 if (location) { | 393 if (location) { |
| 386 details.createTextChild(" @ "); | 394 details.createTextChild(" @ "); |
| 387 details.appendChild(location); | 395 details.appendChild(location); |
| 388 } | 396 } |
| 389 break; | 397 break; |
| 390 case recordType.TimerInstall: | 398 case recordType.TimerInstall: |
| 391 case recordType.TimerRemove: | 399 case recordType.TimerRemove: |
| 392 details = linkifyTopCallFrame(); | 400 details = linkifyTopCallFrame(); |
| 393 detailsText = eventData["timerId"]; | 401 detailsText = eventData["timerId"]; |
| 394 break; | 402 break; |
| 395 case recordType.RequestAnimationFrame: | 403 case recordType.RequestAnimationFrame: |
| 396 case recordType.CancelAnimationFrame: | 404 case recordType.CancelAnimationFrame: |
| 397 details = linkifyTopCallFrame(); | 405 details = linkifyTopCallFrame(); |
| 398 detailsText = eventData["id"]; | 406 detailsText = eventData["id"]; |
| 399 break; | 407 break; |
| 400 case recordType.ParseHTML: | |
| 401 case recordType.RecalculateStyles: | 408 case recordType.RecalculateStyles: |
| 402 details = linkifyTopCallFrame(); | 409 details = linkifyTopCallFrame(); |
| 403 break; | 410 break; |
| 404 case recordType.EvaluateScript: | 411 case recordType.EvaluateScript: |
| 405 var url = eventData["url"]; | 412 var url = eventData["url"]; |
| 406 if (url) | 413 if (url) |
| 407 details = linkifyLocation("", url, eventData["lineNumber"], 0); | 414 details = linkifyLocation("", url, eventData["lineNumber"], 0); |
| 408 break; | 415 break; |
| 409 default: | 416 default: |
| 410 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) | 417 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 if (typeof eventData["message"] !== "undefined") | 633 if (typeof eventData["message"] !== "undefined") |
| 627 contentHelper.appendTextRow(WebInspector.UIString("Message"), eventD ata["message"]); | 634 contentHelper.appendTextRow(WebInspector.UIString("Message"), eventD ata["message"]); |
| 628 break; | 635 break; |
| 629 case recordTypes.EmbedderCallback: | 636 case recordTypes.EmbedderCallback: |
| 630 contentHelper.appendTextRow(WebInspector.UIString("Callback Function"), eventData["callbackName"]); | 637 contentHelper.appendTextRow(WebInspector.UIString("Callback Function"), eventData["callbackName"]); |
| 631 break; | 638 break; |
| 632 case recordTypes.Animation: | 639 case recordTypes.Animation: |
| 633 if (event.phase === WebInspector.TracingModel.Phase.NestableAsyncInstant ) | 640 if (event.phase === WebInspector.TracingModel.Phase.NestableAsyncInstant ) |
| 634 contentHelper.appendTextRow(WebInspector.UIString("State"), eventDat a["state"]); | 641 contentHelper.appendTextRow(WebInspector.UIString("State"), eventDat a["state"]); |
| 635 break; | 642 break; |
| 643 case recordTypes.ParseHTML: | |
| 644 var beginData = event.args["beginData"]; | |
| 645 var url = beginData["url"]; | |
| 646 if (url) | |
| 647 contentHelper.appendTextRow(WebInspector.UIString("URL"), url); | |
| 648 var startLine = beginData["startLine"] + 1; | |
|
alph
2015/04/27 10:04:34
Why startLine needs +1, but endLine does not? Coul
pfeldman
2015/04/27 11:52:51
Done.
| |
| 649 var endLine = event.args["endLine"]; | |
| 650 if (endLine) | |
| 651 contentHelper.appendTextRow(WebInspector.UIString("Range"), WebInspe ctor.UIString("%d \u2014 %d", startLine, endLine)); | |
| 652 break; | |
| 636 default: | 653 default: |
| 637 var detailsNode = WebInspector.TimelineUIUtils.buildDetailsNodeForTraceE vent(event, model.target(), linkifier); | 654 var detailsNode = WebInspector.TimelineUIUtils.buildDetailsNodeForTraceE vent(event, model.target(), linkifier); |
| 638 if (detailsNode) | 655 if (detailsNode) |
| 639 contentHelper.appendElementRow(WebInspector.UIString("Details"), det ailsNode); | 656 contentHelper.appendElementRow(WebInspector.UIString("Details"), det ailsNode); |
| 640 break; | 657 break; |
| 641 } | 658 } |
| 642 | 659 |
| 643 var relatedNode = contentHelper.nodeForBackendId(event.backendNodeId); | 660 var relatedNode = contentHelper.nodeForBackendId(event.backendNodeId); |
| 644 if (relatedNode) | 661 if (relatedNode) |
| 645 contentHelper.appendElementRow(relatedNodeLabel || WebInspector.UIString ("Related node"), WebInspector.DOMPresentationUtils.linkifyNodeReference(related Node)); | 662 contentHelper.appendElementRow(relatedNodeLabel || WebInspector.UIString ("Related node"), WebInspector.DOMPresentationUtils.linkifyNodeReference(related Node)); |
| (...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1863 return; | 1880 return; |
| 1864 | 1881 |
| 1865 var stackTraceElement = parentElement.createChild("div", "timeline-detai ls-view-row-value timeline-details-view-row-stack-trace monospace"); | 1882 var stackTraceElement = parentElement.createChild("div", "timeline-detai ls-view-row-value timeline-details-view-row-stack-trace monospace"); |
| 1866 | 1883 |
| 1867 var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePre viewContents(this._target, this._linkifier, stackTrace); | 1884 var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePre viewContents(this._target, this._linkifier, stackTrace); |
| 1868 | 1885 |
| 1869 stackTraceElement.appendChild(callFrameElem); | 1886 stackTraceElement.appendChild(callFrameElem); |
| 1870 } | 1887 } |
| 1871 | 1888 |
| 1872 } | 1889 } |
| OLD | NEW |