OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> | 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> |
4 * Copyright (C) 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2011 Google Inc. All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * | 9 * |
10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 function updateRowHeight() { | 64 function updateRowHeight() { |
65 /** @type {number} */ | 65 /** @type {number} */ |
66 this._rawRowHeight = !!this._networkLogLargeRowsSetting.get() ? 41 : 21; | 66 this._rawRowHeight = !!this._networkLogLargeRowsSetting.get() ? 41 : 21; |
67 this._updateRowHeight(); | 67 this._updateRowHeight(); |
68 } | 68 } |
69 updateRowHeight.call(this); | 69 updateRowHeight.call(this); |
70 | 70 |
71 this._columns = new Network.NetworkLogViewColumns( | 71 this._columns = new Network.NetworkLogViewColumns( |
72 this, this._timeCalculator, this._durationCalculator, networkLogLargeRow sSetting); | 72 this, this._timeCalculator, this._durationCalculator, networkLogLargeRow sSetting); |
73 | 73 |
74 /** @type {!Map.<string, !Network.NetworkRequestNode>} */ | 74 /** @type {!Set<!SDK.NetworkRequest>} */ |
75 this._nodesByRequestId = new Map(); | 75 this._staleRequests = new Set(); |
76 /** @type {!Object.<string, boolean>} */ | |
77 this._staleRequestIds = {}; | |
78 /** @type {number} */ | 76 /** @type {number} */ |
79 this._mainRequestLoadTime = -1; | 77 this._mainRequestLoadTime = -1; |
80 /** @type {number} */ | 78 /** @type {number} */ |
81 this._mainRequestDOMContentLoadedTime = -1; | 79 this._mainRequestDOMContentLoadedTime = -1; |
82 this._matchedRequestCount = 0; | 80 this._matchedRequestCount = 0; |
83 this._highlightedSubstringChanges = []; | 81 this._highlightedSubstringChanges = []; |
84 | 82 |
85 /** @type {!Array.<!Network.NetworkLogView.Filter>} */ | 83 /** @type {!Array.<!Network.NetworkLogView.Filter>} */ |
86 this._filters = []; | 84 this._filters = []; |
87 /** @type {?Network.NetworkLogView.Filter} */ | 85 /** @type {?Network.NetworkLogView.Filter} */ |
(...skipping 19 matching lines...) Expand all Loading... | |
107 this._activeGroupLookup = null; | 105 this._activeGroupLookup = null; |
108 | 106 |
109 this._addFilters(); | 107 this._addFilters(); |
110 this._resetSuggestionBuilder(); | 108 this._resetSuggestionBuilder(); |
111 this._initializeView(); | 109 this._initializeView(); |
112 | 110 |
113 Common.moduleSetting('networkColorCodeResourceTypes') | 111 Common.moduleSetting('networkColorCodeResourceTypes') |
114 .addChangeListener(this._invalidateAllItems.bind(this, false), this); | 112 .addChangeListener(this._invalidateAllItems.bind(this, false), this); |
115 | 113 |
116 SDK.targetManager.observeModels(SDK.NetworkManager, this); | 114 SDK.targetManager.observeModels(SDK.NetworkManager, this); |
117 SDK.targetManager.addModelListener( | 115 NetworkLog.networkLog.addEventListener(NetworkLog.NetworkLog.Events.RequestA dded, this._onRequestUpdated, this); |
118 SDK.NetworkManager, SDK.NetworkManager.Events.RequestStarted, this._onRe questStarted, this); | 116 NetworkLog.networkLog.addEventListener(NetworkLog.NetworkLog.Events.RequestU pdated, this._onRequestUpdated, this); |
119 SDK.targetManager.addModelListener( | 117 NetworkLog.networkLog.addEventListener(NetworkLog.NetworkLog.Events.Reset, t his._reset, this); |
120 SDK.NetworkManager, SDK.NetworkManager.Events.RequestUpdated, this._onRe questUpdated, this); | 118 NetworkLog.networkLog.addEventListener(NetworkLog.NetworkLog.Events.RequestR emoved, this._onRequestRemoved, this); |
121 SDK.targetManager.addModelListener( | |
122 SDK.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onR equestUpdated, this); | |
123 | 119 |
124 this._updateGroupByFrame(); | 120 this._updateGroupByFrame(); |
125 Common.moduleSetting('network.group-by-frame').addChangeListener(() => this. _updateGroupByFrame()); | 121 Common.moduleSetting('network.group-by-frame').addChangeListener(() => this. _updateGroupByFrame()); |
126 } | 122 } |
127 | 123 |
128 _updateGroupByFrame() { | 124 _updateGroupByFrame() { |
129 var value = Common.moduleSetting('network.group-by-frame').get(); | 125 var value = Common.moduleSetting('network.group-by-frame').get(); |
130 this._setGrouping(value ? 'Frame' : null); | 126 this._setGrouping(value ? 'Frame' : null); |
131 } | 127 } |
132 | 128 |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
372 | 368 |
373 _updateRowHeight() { | 369 _updateRowHeight() { |
374 this._rowHeight = Math.floor(this._rawRowHeight * window.devicePixelRatio) / window.devicePixelRatio; | 370 this._rowHeight = Math.floor(this._rawRowHeight * window.devicePixelRatio) / window.devicePixelRatio; |
375 } | 371 } |
376 | 372 |
377 /** | 373 /** |
378 * @param {!SDK.NetworkRequest} request | 374 * @param {!SDK.NetworkRequest} request |
379 * @return {?Network.NetworkRequestNode} | 375 * @return {?Network.NetworkRequestNode} |
380 */ | 376 */ |
381 nodeForRequest(request) { | 377 nodeForRequest(request) { |
382 return this._nodesByRequestId.get(request.requestId()); | 378 return request[Network.NetworkLogView._networkNodeSymbol] || null; |
383 } | 379 } |
384 | 380 |
385 /** | 381 /** |
386 * @return {number} | 382 * @return {number} |
387 */ | 383 */ |
388 headerHeight() { | 384 headerHeight() { |
389 return this._headerHeight; | 385 return this._headerHeight; |
390 } | 386 } |
391 | 387 |
392 /** | 388 /** |
393 * @param {boolean} recording | 389 * @param {boolean} recording |
394 */ | 390 */ |
395 setRecording(recording) { | 391 setRecording(recording) { |
396 this._recording = recording; | 392 this._recording = recording; |
397 this._updateSummaryBar(); | 393 this._updateSummaryBar(); |
398 } | 394 } |
399 | 395 |
400 /** | 396 /** |
401 * @override | 397 * @override |
402 * @param {!SDK.NetworkManager} networkManager | 398 * @param {!SDK.NetworkManager} networkManager |
403 */ | 399 */ |
404 modelAdded(networkManager) { | 400 modelAdded(networkManager) { |
405 if (!networkManager.target().parentTarget()) { | 401 // TODO(allada) Remove dependency on networkManager and instead use NetworkL og and PageLoad for needed data. |
406 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode l); | 402 if (networkManager.target().parentTarget()) |
407 if (resourceTreeModel) { | 403 return; |
408 resourceTreeModel.addEventListener( | 404 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel) ; |
409 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this); | 405 if (resourceTreeModel) { |
410 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th is._loadEventFired, this); | 406 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, this ._loadEventFired, this); |
411 resourceTreeModel.addEventListener( | 407 resourceTreeModel.addEventListener( |
412 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); | 408 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoadedE ventFired, this); |
413 } | |
414 } | 409 } |
415 NetworkLog.networkLog.requestsForManager(networkManager).forEach(this._appen dRequest.bind(this)); | |
416 } | 410 } |
417 | 411 |
418 /** | 412 /** |
419 * @override | 413 * @override |
420 * @param {!SDK.NetworkManager} networkManager | 414 * @param {!SDK.NetworkManager} networkManager |
421 */ | 415 */ |
422 modelRemoved(networkManager) { | 416 modelRemoved(networkManager) { |
423 if (!networkManager.target().parentTarget()) { | 417 if (!networkManager.target().parentTarget()) { |
424 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode l); | 418 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode l); |
425 if (resourceTreeModel) { | 419 if (resourceTreeModel) { |
426 resourceTreeModel.removeEventListener( | |
427 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this); | |
428 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this); | 420 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this); |
429 resourceTreeModel.removeEventListener( | 421 resourceTreeModel.removeEventListener( |
430 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); | 422 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); |
431 } | 423 } |
432 } | 424 } |
433 } | 425 } |
434 | 426 |
435 /** | 427 /** |
436 * @param {number} start | 428 * @param {number} start |
437 * @param {number} end | 429 * @param {number} end |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
513 reloadShortcutNode.textContent = UI.shortcutRegistry.shortcutDescriptorsForA ction('main.reload')[0].name; | 505 reloadShortcutNode.textContent = UI.shortcutRegistry.shortcutDescriptorsForA ction('main.reload')[0].name; |
514 | 506 |
515 if (this._recording) { | 507 if (this._recording) { |
516 var recordingText = hintText.createChild('span'); | 508 var recordingText = hintText.createChild('span'); |
517 recordingText.textContent = Common.UIString('Recording network activity\u2 026'); | 509 recordingText.textContent = Common.UIString('Recording network activity\u2 026'); |
518 hintText.createChild('br'); | 510 hintText.createChild('br'); |
519 hintText.appendChild( | 511 hintText.appendChild( |
520 UI.formatLocalized('Perform a request or hit %s to record the reload.' , [reloadShortcutNode])); | 512 UI.formatLocalized('Perform a request or hit %s to record the reload.' , [reloadShortcutNode])); |
521 } else { | 513 } else { |
522 var recordNode = hintText.createChild('b'); | 514 var recordNode = hintText.createChild('b'); |
523 recordNode.textContent = UI.shortcutRegistry.shortcutTitleForAction('netwo rk.toggle-recording'); | 515 recordNode.textContent = UI.shortcutRegistry.shortcutTitleForAction('netwo rk_log.toggle-recording'); |
524 hintText.appendChild(UI.formatLocalized( | 516 hintText.appendChild(UI.formatLocalized( |
525 'Record (%s) or reload (%s) to display network activity.', [recordNode , reloadShortcutNode])); | 517 'Record (%s) or reload (%s) to display network activity.', [recordNode , reloadShortcutNode])); |
526 } | 518 } |
527 } | 519 } |
528 | 520 |
529 _hideRecordingHint() { | 521 _hideRecordingHint() { |
530 if (this._recordingHint) | 522 if (this._recordingHint) |
531 this._recordingHint.remove(); | 523 this._recordingHint.remove(); |
532 delete this._recordingHint; | 524 delete this._recordingHint; |
533 } | 525 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
593 | 585 |
594 /** | 586 /** |
595 * @param {!Event} event | 587 * @param {!Event} event |
596 */ | 588 */ |
597 _dataGridMouseDown(event) { | 589 _dataGridMouseDown(event) { |
598 if (!this._dataGrid.selectedNode && event.button) | 590 if (!this._dataGrid.selectedNode && event.button) |
599 event.consume(); | 591 event.consume(); |
600 } | 592 } |
601 | 593 |
602 _updateSummaryBar() { | 594 _updateSummaryBar() { |
603 var requestsNumber = this._nodesByRequestId.size; | |
604 | |
605 if (!requestsNumber) { | |
606 this._showRecordingHint(); | |
607 return; | |
608 } | |
609 this._hideRecordingHint(); | 595 this._hideRecordingHint(); |
610 | 596 |
611 var transferSize = 0; | 597 var transferSize = 0; |
612 var selectedRequestsNumber = 0; | 598 var selectedNodeNumber = 0; |
613 var selectedTransferSize = 0; | 599 var selectedTransferSize = 0; |
614 var baseTime = -1; | 600 var baseTime = -1; |
615 var maxTime = -1; | 601 var maxTime = -1; |
616 var nodes = this._nodesByRequestId.valuesArray(); | 602 |
617 for (var i = 0; i < nodes.length; ++i) { | 603 var nodeCount = 0; |
618 var request = nodes[i].request(); | 604 for (var request of NetworkLog.networkLog.requests()) { |
605 var node = request[Network.NetworkLogView._networkNodeSymbol]; | |
606 if (!node) | |
607 continue; | |
608 nodeCount++; | |
619 var requestTransferSize = request.transferSize; | 609 var requestTransferSize = request.transferSize; |
620 transferSize += requestTransferSize; | 610 transferSize += requestTransferSize; |
621 if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) { | 611 if (!node[Network.NetworkLogView._isFilteredOutSymbol]) { |
622 selectedRequestsNumber++; | 612 selectedNodeNumber++; |
623 selectedTransferSize += requestTransferSize; | 613 selectedTransferSize += requestTransferSize; |
624 } | 614 } |
625 if (request.url() === request.networkManager().target().inspectedURL() && | 615 if (request.url() === request.networkManager().target().inspectedURL() && |
626 request.resourceType() === Common.resourceTypes.Document) | 616 request.resourceType() === Common.resourceTypes.Document) |
627 baseTime = request.startTime; | 617 baseTime = request.startTime; |
628 if (request.endTime > maxTime) | 618 if (request.endTime > maxTime) |
629 maxTime = request.endTime; | 619 maxTime = request.endTime; |
630 } | 620 } |
631 | 621 |
622 if (!nodeCount) { | |
623 this._showRecordingHint(); | |
624 return; | |
625 } | |
626 | |
632 var summaryBar = this._summaryBarElement; | 627 var summaryBar = this._summaryBarElement; |
633 summaryBar.removeChildren(); | 628 summaryBar.removeChildren(); |
634 var separator = '\u2002\u2758\u2002'; | 629 var separator = '\u2002\u2758\u2002'; |
635 var text = ''; | 630 var text = ''; |
636 /** | 631 /** |
637 * @param {string} chunk | 632 * @param {string} chunk |
638 * @return {!Element} | 633 * @return {!Element} |
639 */ | 634 */ |
640 function appendChunk(chunk) { | 635 function appendChunk(chunk) { |
641 var span = summaryBar.createChild('span'); | 636 var span = summaryBar.createChild('span'); |
642 span.textContent = chunk; | 637 span.textContent = chunk; |
643 text += chunk; | 638 text += chunk; |
644 return span; | 639 return span; |
645 } | 640 } |
646 | 641 |
647 if (selectedRequestsNumber !== requestsNumber) { | 642 if (selectedNodeNumber !== nodeCount) { |
648 appendChunk(Common.UIString('%d / %d requests', selectedRequestsNumber, re questsNumber)); | 643 appendChunk(Common.UIString('%d / %d requests', selectedNodeNumber, nodeCo unt)); |
649 appendChunk(separator); | 644 appendChunk(separator); |
650 appendChunk(Common.UIString( | 645 appendChunk(Common.UIString( |
651 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize))); | 646 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize))); |
652 } else { | 647 } else { |
653 appendChunk(Common.UIString('%d requests', requestsNumber)); | 648 appendChunk(Common.UIString('%d requests', nodeCount)); |
654 appendChunk(separator); | 649 appendChunk(separator); |
655 appendChunk(Common.UIString('%s transferred', Number.bytesToString(transfe rSize))); | 650 appendChunk(Common.UIString('%s transferred', Number.bytesToString(transfe rSize))); |
656 } | 651 } |
657 if (baseTime !== -1 && maxTime !== -1) { | 652 if (baseTime !== -1 && maxTime !== -1) { |
658 appendChunk(separator); | 653 appendChunk(separator); |
659 appendChunk(Common.UIString('Finish: %s', Number.secondsToString(maxTime - baseTime))); | 654 appendChunk(Common.UIString('Finish: %s', Number.secondsToString(maxTime - baseTime))); |
660 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) { | 655 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) { |
661 appendChunk(separator); | 656 appendChunk(separator); |
662 var domContentLoadedText = Common.UIString( | 657 var domContentLoadedText = Common.UIString( |
663 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime)); | 658 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime)); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
702 | 697 |
703 _refreshIfNeeded() { | 698 _refreshIfNeeded() { |
704 if (this._needsRefresh) | 699 if (this._needsRefresh) |
705 this._refresh(); | 700 this._refresh(); |
706 } | 701 } |
707 | 702 |
708 /** | 703 /** |
709 * @param {boolean=} deferUpdate | 704 * @param {boolean=} deferUpdate |
710 */ | 705 */ |
711 _invalidateAllItems(deferUpdate) { | 706 _invalidateAllItems(deferUpdate) { |
712 var requestIds = this._nodesByRequestId.keysArray(); | 707 this._staleRequests = new Set(NetworkLog.networkLog.requests()); |
713 for (var i = 0; i < requestIds.length; ++i) | |
714 this._staleRequestIds[requestIds[i]] = true; | |
715 if (deferUpdate) | 708 if (deferUpdate) |
716 this.scheduleRefresh(); | 709 this.scheduleRefresh(); |
717 else | 710 else |
718 this._refresh(); | 711 this._refresh(); |
719 } | 712 } |
720 | 713 |
721 /** | 714 /** |
722 * @return {!Network.NetworkTimeCalculator} | 715 * @return {!Network.NetworkTimeCalculator} |
723 */ | 716 */ |
724 timeCalculator() { | 717 timeCalculator() { |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
825 | 818 |
826 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ; | 819 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ; |
827 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime); | 820 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime); |
828 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime); | 821 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime); |
829 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime); | 822 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime); |
830 | 823 |
831 /** @type {!Map<!Network.NetworkNode, !Network.NetworkNode>} */ | 824 /** @type {!Map<!Network.NetworkNode, !Network.NetworkNode>} */ |
832 var nodesToInsert = new Map(); | 825 var nodesToInsert = new Map(); |
833 /** @type {!Array<!Network.NetworkNode>} */ | 826 /** @type {!Array<!Network.NetworkNode>} */ |
834 var nodesToRefresh = []; | 827 var nodesToRefresh = []; |
835 for (var requestId in this._staleRequestIds) { | 828 |
836 var node = this._nodesByRequestId.get(requestId); | 829 /** @type {!Set<!Network.NetworkRequestNode>} */ |
830 var staleNodes = new Set(); | |
831 | |
832 // While creating nodes it may add more entries into _staleRequests because redirect request nodes update the parent | |
833 // node so we loop until we have no more stale requests. | |
834 while (this._staleRequests.size) { | |
835 var request = this._staleRequests.firstValue(); | |
836 this._staleRequests.delete(request); | |
837 var node = request[Network.NetworkLogView._networkNodeSymbol]; | |
837 if (!node) | 838 if (!node) |
838 continue; | 839 node = this._createNodeForRequest(request); |
840 staleNodes.add(node); | |
841 } | |
842 | |
843 for (var node of staleNodes) { | |
839 var isFilteredOut = !this._applyFilter(node); | 844 var isFilteredOut = !this._applyFilter(node); |
840 if (isFilteredOut && node === this._hoveredNode) | 845 if (isFilteredOut && node === this._hoveredNode) |
841 this._setHoveredNode(null); | 846 this._setHoveredNode(null); |
842 | 847 |
843 if (!isFilteredOut) | 848 if (!isFilteredOut) |
844 nodesToRefresh.push(node); | 849 nodesToRefresh.push(node); |
845 var request = node.request(); | 850 var request = node.request(); |
846 this._timeCalculator.updateBoundaries(request); | 851 this._timeCalculator.updateBoundaries(request); |
847 this._durationCalculator.updateBoundaries(request); | 852 this._durationCalculator.updateBoundaries(request); |
848 var newParent = this._parentNodeForInsert(node); | 853 var newParent = this._parentNodeForInsert(node); |
(...skipping 28 matching lines...) Expand all Loading... | |
877 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchR equest(request); | 882 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchR equest(request); |
878 parent.appendChild(node); | 883 parent.appendChild(node); |
879 } | 884 } |
880 | 885 |
881 for (var node of nodesToRefresh) | 886 for (var node of nodesToRefresh) |
882 node.refresh(); | 887 node.refresh(); |
883 | 888 |
884 this._highlightNthMatchedRequestForSearch( | 889 this._highlightNthMatchedRequestForSearch( |
885 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false); | 890 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false); |
886 | 891 |
887 this._staleRequestIds = {}; | |
888 this._updateSummaryBar(); | 892 this._updateSummaryBar(); |
889 | 893 |
890 if (nodesToInsert.size) | 894 if (nodesToInsert.size) |
891 this._columns.sortByCurrentColumn(); | 895 this._columns.sortByCurrentColumn(); |
892 | 896 |
893 this._dataGrid.updateInstantly(); | 897 this._dataGrid.updateInstantly(); |
898 this._didRefreshForTest(); | |
899 } | |
900 | |
901 _didRefreshForTest() { | |
894 } | 902 } |
895 | 903 |
896 /** | 904 /** |
897 * @param {!Network.NetworkRequestNode} node | 905 * @param {!Network.NetworkRequestNode} node |
898 * @return {?Network.NetworkNode} | 906 * @return {?Network.NetworkNode} |
899 */ | 907 */ |
900 _parentNodeForInsert(node) { | 908 _parentNodeForInsert(node) { |
901 if (!this._activeGroupLookup) | 909 if (!this._activeGroupLookup) |
902 return this._dataGrid.rootNode(); | 910 return this._dataGrid.rootNode(); |
903 | 911 |
904 var groupNode = this._activeGroupLookup.groupNodeForRequest(node.request()); | 912 var groupNode = this._activeGroupLookup.groupNodeForRequest(node.request()); |
905 if (!groupNode) | 913 if (!groupNode) |
906 return this._dataGrid.rootNode(); | 914 return this._dataGrid.rootNode(); |
907 return groupNode; | 915 return groupNode; |
908 } | 916 } |
909 | 917 |
910 reset() { | 918 _reset() { |
911 this._requestWithHighlightedInitiators = null; | 919 this._requestWithHighlightedInitiators = null; |
912 this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null); | 920 this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null); |
913 | 921 |
914 this._clearSearchMatchedList(); | 922 this._clearSearchMatchedList(); |
915 | 923 |
916 this._setHoveredNode(null); | 924 this._setHoveredNode(null); |
917 this._columns.reset(); | 925 this._columns.reset(); |
918 | 926 |
919 this._timeFilter = null; | 927 this._timeFilter = null; |
920 this._calculator.reset(); | 928 this._calculator.reset(); |
921 | 929 |
922 this._timeCalculator.setWindow(null); | 930 this._timeCalculator.setWindow(null); |
923 this.linkifier.reset(); | 931 this.linkifier.reset(); |
924 this.badgePool.reset(); | 932 this.badgePool.reset(); |
925 | 933 |
926 if (this._activeGroupLookup) | 934 if (this._activeGroupLookup) |
927 this._activeGroupLookup.reset(); | 935 this._activeGroupLookup.reset(); |
928 this._nodesByRequestId.clear(); | 936 this._staleRequests.clear(); |
929 this._staleRequestIds = {}; | |
930 this._resetSuggestionBuilder(); | 937 this._resetSuggestionBuilder(); |
931 | 938 |
932 this._mainRequestLoadTime = -1; | 939 this._mainRequestLoadTime = -1; |
933 this._mainRequestDOMContentLoadedTime = -1; | 940 this._mainRequestDOMContentLoadedTime = -1; |
934 | 941 |
935 this._dataGrid.rootNode().removeChildren(); | 942 this._dataGrid.rootNode().removeChildren(); |
936 this._updateSummaryBar(); | 943 this._updateSummaryBar(); |
937 this._dataGrid.setStickToBottom(true); | 944 this._dataGrid.setStickToBottom(true); |
938 } | 945 } |
939 | 946 |
940 /** | 947 /** |
941 * @param {string} filterString | 948 * @param {string} filterString |
942 */ | 949 */ |
943 setTextFilterValue(filterString) { | 950 setTextFilterValue(filterString) { |
944 this._textFilterUI.setValue(filterString); | 951 this._textFilterUI.setValue(filterString); |
945 this._textFilterUI.setRegexChecked(false); | 952 this._textFilterUI.setRegexChecked(false); |
946 this._dataURLFilterUI.setChecked(false); | 953 this._dataURLFilterUI.setChecked(false); |
947 this._resourceCategoryFilterUI.reset(); | 954 this._resourceCategoryFilterUI.reset(); |
948 } | 955 } |
949 | 956 |
950 /** | 957 /** |
958 * @param {!SDK.NetworkRequest} request | |
959 */ | |
960 _createNodeForRequest(request) { | |
961 var node = new Network.NetworkRequestNode(this, request); | |
962 request[Network.NetworkLogView._networkNodeSymbol] = node; | |
963 node[Network.NetworkLogView._isFilteredOutSymbol] = true; | |
964 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false; | |
965 | |
966 if (request.redirects) | |
967 request.redirects.forEach(this._refreshRequest.bind(this)); | |
968 return node; | |
969 } | |
970 | |
971 /** | |
951 * @param {!Common.Event} event | 972 * @param {!Common.Event} event |
952 */ | 973 */ |
953 _onRequestStarted(event) { | 974 _onRequestRemoved(event) { |
954 if (!this._recording) | |
955 return; | |
956 var request = /** @type {!SDK.NetworkRequest} */ (event.data); | 975 var request = /** @type {!SDK.NetworkRequest} */ (event.data); |
957 this._appendRequest(request); | 976 var node = request[Network.NetworkLogView._networkNodeSymbol]; |
977 while (node && node.parent) { | |
978 var parent = node.parent; | |
979 parent.removeChild(node); | |
dgozman
2017/06/02 21:13:37
I think this will be slow on navigation, since we
allada
2017/06/03 00:27:41
Done.
| |
980 if (parent.hasChildren()) | |
981 break; | |
982 node = parent; | |
983 } | |
984 this._staleRequests.delete(request); | |
985 delete request[Network.NetworkLogView._networkNodeSymbol]; | |
958 } | 986 } |
959 | 987 |
960 /** | 988 /** |
961 * @param {!SDK.NetworkRequest} request | |
962 */ | |
963 _appendRequest(request) { | |
964 var node = new Network.NetworkRequestNode(this, request); | |
965 node[Network.NetworkLogView._isFilteredOutSymbol] = true; | |
966 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false; | |
967 | |
968 // In case of redirect request id is reassigned to a redirected | |
969 // request and we need to update _nodesByRequestId and search results. | |
970 var originalRequestNode = this._nodesByRequestId.get(request.requestId()); | |
971 if (originalRequestNode) | |
972 this._nodesByRequestId.set(originalRequestNode.request().requestId(), orig inalRequestNode); | |
973 this._nodesByRequestId.set(request.requestId(), node); | |
974 | |
975 // Pull all the redirects of the main request upon commit load. | |
976 if (request.redirects) { | |
977 for (var i = 0; i < request.redirects.length; ++i) | |
978 this._refreshRequest(request.redirects[i]); | |
979 } | |
980 | |
981 this._refreshRequest(request); | |
982 } | |
983 | |
984 /** | |
985 * @param {!Common.Event} event | 989 * @param {!Common.Event} event |
986 */ | 990 */ |
987 _onRequestUpdated(event) { | 991 _onRequestUpdated(event) { |
988 var request = /** @type {!SDK.NetworkRequest} */ (event.data); | 992 var request = /** @type {!SDK.NetworkRequest} */ (event.data); |
989 this._refreshRequest(request); | 993 this._refreshRequest(request); |
990 } | 994 } |
991 | 995 |
992 /** | 996 /** |
993 * @param {!SDK.NetworkRequest} request | 997 * @param {!SDK.NetworkRequest} request |
994 */ | 998 */ |
995 _refreshRequest(request) { | 999 _refreshRequest(request) { |
996 if (!this._nodesByRequestId.get(request.requestId())) | |
997 return; | |
998 | |
999 Network.NetworkLogView._subdomains(request.domain) | 1000 Network.NetworkLogView._subdomains(request.domain) |
1000 .forEach( | 1001 .forEach( |
1001 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ k.NetworkLogView.FilterType.Domain)); | 1002 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ k.NetworkLogView.FilterType.Domain)); |
1002 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re quest.requestMethod); | 1003 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re quest.requestMethod); |
1003 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType, request.mimeType); | 1004 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType, request.mimeType); |
1004 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, '' + request.scheme); | 1005 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, '' + request.scheme); |
1005 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode , '' + request.statusCode); | 1006 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode , '' + request.statusCode); |
1006 | 1007 |
1007 var priority = request.initialPriority(); | 1008 var priority = request.initialPriority(); |
1008 if (priority) { | 1009 if (priority) { |
(...skipping 21 matching lines...) Expand all Loading... | |
1030 for (var i = 0, l = responseHeaders.length; i < l; ++i) | 1031 for (var i = 0, l = responseHeaders.length; i < l; ++i) |
1031 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo nseHeader, responseHeaders[i].name); | 1032 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo nseHeader, responseHeaders[i].name); |
1032 var cookies = request.responseCookies; | 1033 var cookies = request.responseCookies; |
1033 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { | 1034 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { |
1034 var cookie = cookies[i]; | 1035 var cookie = cookies[i]; |
1035 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eDomain, cookie.domain()); | 1036 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eDomain, cookie.domain()); |
1036 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eName, cookie.name()); | 1037 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eName, cookie.name()); |
1037 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eValue, cookie.value()); | 1038 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eValue, cookie.value()); |
1038 } | 1039 } |
1039 | 1040 |
1040 this._staleRequestIds[request.requestId()] = true; | 1041 this._staleRequests.add(request); |
1041 this.dispatchEventToListeners(Network.NetworkLogView.Events.UpdateRequest, r equest); | |
1042 this.scheduleRefresh(); | 1042 this.scheduleRefresh(); |
1043 } | 1043 } |
1044 | 1044 |
1045 /** | 1045 /** |
1046 * @param {!Common.Event} event | |
1047 */ | |
1048 _mainFrameNavigated(event) { | |
1049 if (!this._recording) | |
1050 return; | |
1051 | |
1052 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data); | |
1053 var loaderId = frame.loaderId; | |
1054 | |
1055 // Pick provisional load requests. | |
1056 var requestsToPick = []; | |
1057 var networkManager = frame.resourceTreeModel().target().model(SDK.NetworkMan ager); | |
1058 var requests = networkManager ? NetworkLog.networkLog.requestsForManager(net workManager) : []; | |
1059 for (var i = 0; i < requests.length; ++i) { | |
1060 var request = requests[i]; | |
1061 if (request.loaderId === loaderId) | |
1062 requestsToPick.push(request); | |
1063 } | |
1064 | |
1065 if (!Common.moduleSetting('network.preserve-log').get()) { | |
1066 this.reset(); | |
1067 for (var i = 0; i < requestsToPick.length; ++i) | |
1068 this._appendRequest(requestsToPick[i]); | |
1069 } | |
1070 for (var i = 0; i < requestsToPick.length; ++i) { | |
1071 var request = requestsToPick[i]; | |
1072 var node = this._nodesByRequestId.get(request.requestId()); | |
1073 if (node) { | |
1074 node.markAsNavigationRequest(); | |
1075 break; | |
1076 } | |
1077 } | |
1078 } | |
1079 | |
1080 /** | |
1081 * @return {number} | 1046 * @return {number} |
1082 */ | 1047 */ |
1083 rowHeight() { | 1048 rowHeight() { |
1084 return this._rowHeight; | 1049 return this._rowHeight; |
1085 } | 1050 } |
1086 | 1051 |
1087 /** | 1052 /** |
1088 * @param {boolean} gridMode | 1053 * @param {boolean} gridMode |
1089 */ | 1054 */ |
1090 switchViewMode(gridMode) { | 1055 switchViewMode(gridMode) { |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1182 */ | 1147 */ |
1183 function removeBlockedURL(url) { | 1148 function removeBlockedURL(url) { |
1184 patterns = patterns.filter(pattern => pattern.url !== url); | 1149 patterns = patterns.filter(pattern => pattern.url !== url); |
1185 manager.setBlockedPatterns(patterns); | 1150 manager.setBlockedPatterns(patterns); |
1186 UI.viewManager.showView('network.blocked-urls'); | 1151 UI.viewManager.showView('network.blocked-urls'); |
1187 } | 1152 } |
1188 } | 1153 } |
1189 } | 1154 } |
1190 | 1155 |
1191 _harRequests() { | 1156 _harRequests() { |
1192 var requests = this._nodesByRequestId.valuesArray().map(function(node) { | 1157 var httpRequests = NetworkLog.networkLog.requests().filter(Network.NetworkLo gView.HTTPRequestsFilter); |
1193 return node.request(); | |
1194 }); | |
1195 var httpRequests = requests.filter(Network.NetworkLogView.HTTPRequestsFilter ); | |
1196 return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter); | 1158 return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter); |
1197 } | 1159 } |
1198 | 1160 |
1199 _copyAll() { | 1161 _copyAll() { |
1200 var harArchive = {log: (new NetworkLog.HARLog(this._harRequests())).build()} ; | 1162 var harArchive = {log: (new NetworkLog.HARLog(this._harRequests())).build()} ; |
1201 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2)); | 1163 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2)); |
1202 } | 1164 } |
1203 | 1165 |
1204 /** | 1166 /** |
1205 * @param {!SDK.NetworkRequest} request | 1167 * @param {!SDK.NetworkRequest} request |
(...skipping 29 matching lines...) Expand all Loading... | |
1235 * @param {string} platform | 1197 * @param {string} platform |
1236 */ | 1198 */ |
1237 _copyCurlCommand(request, platform) { | 1199 _copyCurlCommand(request, platform) { |
1238 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ; | 1200 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ; |
1239 } | 1201 } |
1240 | 1202 |
1241 /** | 1203 /** |
1242 * @param {string} platform | 1204 * @param {string} platform |
1243 */ | 1205 */ |
1244 _copyAllCurlCommand(platform) { | 1206 _copyAllCurlCommand(platform) { |
1245 var requests = this._nodesByRequestId.valuesArray().map(node => node.request ()); | 1207 var requests = NetworkLog.networkLog.requests(); |
1246 var commands = []; | 1208 var commands = []; |
1247 for (var request of requests) | 1209 for (var request of requests) |
1248 commands.push(this._generateCurlCommand(request, platform)); | 1210 commands.push(this._generateCurlCommand(request, platform)); |
1249 if (platform === 'win') | 1211 if (platform === 'win') |
1250 InspectorFrontendHost.copyText(commands.join(' &\r\n')); | 1212 InspectorFrontendHost.copyText(commands.join(' &\r\n')); |
1251 else | 1213 else |
1252 InspectorFrontendHost.copyText(commands.join(' ;\n')); | 1214 InspectorFrontendHost.copyText(commands.join(' ;\n')); |
1253 } | 1215 } |
1254 | 1216 |
1255 _exportAll() { | 1217 _exportAll() { |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1603 this._clearSearchMatchedList(); | 1565 this._clearSearchMatchedList(); |
1604 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat ed, 0); | 1566 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat ed, 0); |
1605 } | 1567 } |
1606 | 1568 |
1607 /** | 1569 /** |
1608 * @param {!SDK.NetworkRequest} request | 1570 * @param {!SDK.NetworkRequest} request |
1609 */ | 1571 */ |
1610 revealAndHighlightRequest(request) { | 1572 revealAndHighlightRequest(request) { |
1611 this.removeAllNodeHighlights(); | 1573 this.removeAllNodeHighlights(); |
1612 | 1574 |
1613 var node = this._nodesByRequestId.get(request.requestId()); | 1575 var node = request[Network.NetworkLogView._networkNodeSymbol]; |
1614 if (node) { | 1576 if (node) { |
1615 node.reveal(); | 1577 node.reveal(); |
1616 this._highlightNode(node); | 1578 this._highlightNode(node); |
1617 } | 1579 } |
1618 } | 1580 } |
1619 | 1581 |
1620 removeAllNodeHighlights() { | 1582 removeAllNodeHighlights() { |
1621 if (this._highlightedNode) { | 1583 if (this._highlightedNode) { |
1622 this._highlightedNode.element().classList.remove('highlighted-row'); | 1584 this._highlightedNode.element().classList.remove('highlighted-row'); |
1623 delete this._highlightedNode; | 1585 delete this._highlightedNode; |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1754 command.push('--compressed'); | 1716 command.push('--compressed'); |
1755 | 1717 |
1756 if (request.securityState() === Protocol.Security.SecurityState.Insecure) | 1718 if (request.securityState() === Protocol.Security.SecurityState.Insecure) |
1757 command.push('--insecure'); | 1719 command.push('--insecure'); |
1758 return command.join(' '); | 1720 return command.join(' '); |
1759 } | 1721 } |
1760 }; | 1722 }; |
1761 | 1723 |
1762 Network.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut'); | 1724 Network.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut'); |
1763 Network.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSearchQu ery'); | 1725 Network.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSearchQu ery'); |
1726 Network.NetworkLogView._networkNodeSymbol = Symbol('NetworkNode'); | |
1764 | 1727 |
1765 Network.NetworkLogView.HTTPSchemas = { | 1728 Network.NetworkLogView.HTTPSchemas = { |
1766 'http': true, | 1729 'http': true, |
1767 'https': true, | 1730 'https': true, |
1768 'ws': true, | 1731 'ws': true, |
1769 'wss': true | 1732 'wss': true |
1770 }; | 1733 }; |
1771 | 1734 |
1772 /** @enum {symbol} */ | 1735 /** @enum {symbol} */ |
1773 Network.NetworkLogView.Events = { | 1736 Network.NetworkLogView.Events = { |
1774 RequestSelected: Symbol('RequestSelected'), | 1737 RequestSelected: Symbol('RequestSelected'), |
1775 SearchCountUpdated: Symbol('SearchCountUpdated'), | 1738 SearchCountUpdated: Symbol('SearchCountUpdated'), |
1776 SearchIndexUpdated: Symbol('SearchIndexUpdated'), | 1739 SearchIndexUpdated: Symbol('SearchIndexUpdated') |
1777 UpdateRequest: Symbol('UpdateRequest') | |
1778 }; | 1740 }; |
1779 | 1741 |
1780 /** @enum {string} */ | 1742 /** @enum {string} */ |
1781 Network.NetworkLogView.FilterType = { | 1743 Network.NetworkLogView.FilterType = { |
1782 Domain: 'domain', | 1744 Domain: 'domain', |
1783 HasResponseHeader: 'has-response-header', | 1745 HasResponseHeader: 'has-response-header', |
1784 Is: 'is', | 1746 Is: 'is', |
1785 LargerThan: 'larger-than', | 1747 LargerThan: 'larger-than', |
1786 Method: 'method', | 1748 Method: 'method', |
1787 MimeType: 'mime-type', | 1749 MimeType: 'mime-type', |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1822 | 1784 |
1823 Network.GroupLookupInterface.prototype = { | 1785 Network.GroupLookupInterface.prototype = { |
1824 /** | 1786 /** |
1825 * @param {!SDK.NetworkRequest} request | 1787 * @param {!SDK.NetworkRequest} request |
1826 * @return {?Network.NetworkGroupNode} | 1788 * @return {?Network.NetworkGroupNode} |
1827 */ | 1789 */ |
1828 groupNodeForRequest: function(request) {}, | 1790 groupNodeForRequest: function(request) {}, |
1829 | 1791 |
1830 reset: function() {} | 1792 reset: function() {} |
1831 }; | 1793 }; |
OLD | NEW |