Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

Issue 2914033002: [Devtools] NetworkLogView now uses NetworkLog as source of truth. (Closed)
Patch Set: changes Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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
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);
121 SDK.targetManager.addModelListener(
122 SDK.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onR equestUpdated, this);
123 118
124 this._updateGroupByFrame(); 119 this._updateGroupByFrame();
125 Common.moduleSetting('network.group-by-frame').addChangeListener(() => this. _updateGroupByFrame()); 120 Common.moduleSetting('network.group-by-frame').addChangeListener(() => this. _updateGroupByFrame());
126 } 121 }
127 122
128 _updateGroupByFrame() { 123 _updateGroupByFrame() {
129 var value = Common.moduleSetting('network.group-by-frame').get(); 124 var value = Common.moduleSetting('network.group-by-frame').get();
130 this._setGrouping(value ? 'Frame' : null); 125 this._setGrouping(value ? 'Frame' : null);
131 } 126 }
132 127
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 return false; 351 return false;
357 if (request.endTime !== -1 && request.endTime < windowStart) 352 if (request.endTime !== -1 && request.endTime < windowStart)
358 return false; 353 return false;
359 return true; 354 return true;
360 } 355 }
361 356
362 /** 357 /**
363 * @param {?string} groupKey 358 * @param {?string} groupKey
364 */ 359 */
365 _setGrouping(groupKey) { 360 _setGrouping(groupKey) {
361 if (this._activeGroupLookup)
362 this._activeGroupLookup.reset();
366 var groupLookup = groupKey ? this._groupLookups.get(groupKey) || null : null ; 363 var groupLookup = groupKey ? this._groupLookups.get(groupKey) || null : null ;
367 this._activeGroupLookup = groupLookup; 364 this._activeGroupLookup = groupLookup;
368 if (groupLookup)
369 groupLookup.reset();
370 this._invalidateAllItems(); 365 this._invalidateAllItems();
371 } 366 }
372 367
373 _updateRowHeight() { 368 _updateRowHeight() {
374 this._rowHeight = Math.floor(this._rawRowHeight * window.devicePixelRatio) / window.devicePixelRatio; 369 this._rowHeight = Math.floor(this._rawRowHeight * window.devicePixelRatio) / window.devicePixelRatio;
375 } 370 }
376 371
377 /** 372 /**
378 * @param {!SDK.NetworkRequest} request 373 * @param {!SDK.NetworkRequest} request
379 * @return {?Network.NetworkRequestNode} 374 * @return {?Network.NetworkRequestNode}
380 */ 375 */
381 nodeForRequest(request) { 376 nodeForRequest(request) {
382 return this._nodesByRequestId.get(request.requestId()); 377 return request[Network.NetworkLogView._networkNodeSymbol] || null;
383 } 378 }
384 379
385 /** 380 /**
386 * @return {number} 381 * @return {number}
387 */ 382 */
388 headerHeight() { 383 headerHeight() {
389 return this._headerHeight; 384 return this._headerHeight;
390 } 385 }
391 386
392 /** 387 /**
393 * @param {boolean} recording 388 * @param {boolean} recording
394 */ 389 */
395 setRecording(recording) { 390 setRecording(recording) {
396 this._recording = recording; 391 this._recording = recording;
397 this._updateSummaryBar(); 392 this._updateSummaryBar();
398 } 393 }
399 394
400 /** 395 /**
401 * @override 396 * @override
402 * @param {!SDK.NetworkManager} networkManager 397 * @param {!SDK.NetworkManager} networkManager
403 */ 398 */
404 modelAdded(networkManager) { 399 modelAdded(networkManager) {
405 if (!networkManager.target().parentTarget()) { 400 // 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); 401 if (networkManager.target().parentTarget())
407 if (resourceTreeModel) { 402 return;
408 resourceTreeModel.addEventListener( 403 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel) ;
409 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this); 404 if (resourceTreeModel) {
410 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th is._loadEventFired, this); 405 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, this ._loadEventFired, this);
411 resourceTreeModel.addEventListener( 406 resourceTreeModel.addEventListener(
412 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); 407 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoadedE ventFired, this);
413 }
414 } 408 }
415 NetworkLog.networkLog.requestsForManager(networkManager).forEach(this._appen dRequest.bind(this));
416 } 409 }
417 410
418 /** 411 /**
419 * @override 412 * @override
420 * @param {!SDK.NetworkManager} networkManager 413 * @param {!SDK.NetworkManager} networkManager
421 */ 414 */
422 modelRemoved(networkManager) { 415 modelRemoved(networkManager) {
423 if (!networkManager.target().parentTarget()) { 416 if (!networkManager.target().parentTarget()) {
424 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode l); 417 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeMode l);
425 if (resourceTreeModel) { 418 if (resourceTreeModel) {
426 resourceTreeModel.removeEventListener(
427 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this);
428 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this); 419 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
429 resourceTreeModel.removeEventListener( 420 resourceTreeModel.removeEventListener(
430 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); 421 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this);
431 } 422 }
432 } 423 }
433 } 424 }
434 425
435 /** 426 /**
436 * @param {number} start 427 * @param {number} start
437 * @param {number} end 428 * @param {number} end
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 584
594 /** 585 /**
595 * @param {!Event} event 586 * @param {!Event} event
596 */ 587 */
597 _dataGridMouseDown(event) { 588 _dataGridMouseDown(event) {
598 if (!this._dataGrid.selectedNode && event.button) 589 if (!this._dataGrid.selectedNode && event.button)
599 event.consume(); 590 event.consume();
600 } 591 }
601 592
602 _updateSummaryBar() { 593 _updateSummaryBar() {
603 var requestsNumber = this._nodesByRequestId.size;
604
605 if (!requestsNumber) {
606 this._showRecordingHint();
607 return;
608 }
609 this._hideRecordingHint(); 594 this._hideRecordingHint();
610 595
611 var transferSize = 0; 596 var transferSize = 0;
612 var selectedRequestsNumber = 0; 597 var selectedNodeNumber = 0;
613 var selectedTransferSize = 0; 598 var selectedTransferSize = 0;
614 var baseTime = -1; 599 var baseTime = -1;
615 var maxTime = -1; 600 var maxTime = -1;
616 var nodes = this._nodesByRequestId.valuesArray(); 601
617 for (var i = 0; i < nodes.length; ++i) { 602 var nodeCount = 0;
618 var request = nodes[i].request(); 603 for (var request of NetworkLog.networkLog.requests()) {
604 var node = request[Network.NetworkLogView._networkNodeSymbol];
605 if (!node)
606 continue;
607 nodeCount++;
619 var requestTransferSize = request.transferSize; 608 var requestTransferSize = request.transferSize;
620 transferSize += requestTransferSize; 609 transferSize += requestTransferSize;
621 if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) { 610 if (!node[Network.NetworkLogView._isFilteredOutSymbol]) {
622 selectedRequestsNumber++; 611 selectedNodeNumber++;
623 selectedTransferSize += requestTransferSize; 612 selectedTransferSize += requestTransferSize;
624 } 613 }
625 if (request.url() === request.networkManager().target().inspectedURL() && 614 if (request.url() === request.networkManager().target().inspectedURL() &&
626 request.resourceType() === Common.resourceTypes.Document) 615 request.resourceType() === Common.resourceTypes.Document)
627 baseTime = request.startTime; 616 baseTime = request.startTime;
628 if (request.endTime > maxTime) 617 if (request.endTime > maxTime)
629 maxTime = request.endTime; 618 maxTime = request.endTime;
630 } 619 }
631 620
621 if (!nodeCount) {
622 this._showRecordingHint();
623 return;
624 }
625
632 var summaryBar = this._summaryBarElement; 626 var summaryBar = this._summaryBarElement;
633 summaryBar.removeChildren(); 627 summaryBar.removeChildren();
634 var separator = '\u2002\u2758\u2002'; 628 var separator = '\u2002\u2758\u2002';
635 var text = ''; 629 var text = '';
636 /** 630 /**
637 * @param {string} chunk 631 * @param {string} chunk
638 * @return {!Element} 632 * @return {!Element}
639 */ 633 */
640 function appendChunk(chunk) { 634 function appendChunk(chunk) {
641 var span = summaryBar.createChild('span'); 635 var span = summaryBar.createChild('span');
642 span.textContent = chunk; 636 span.textContent = chunk;
643 text += chunk; 637 text += chunk;
644 return span; 638 return span;
645 } 639 }
646 640
647 if (selectedRequestsNumber !== requestsNumber) { 641 if (selectedNodeNumber !== nodeCount) {
648 appendChunk(Common.UIString('%d / %d requests', selectedRequestsNumber, re questsNumber)); 642 appendChunk(Common.UIString('%d / %d requests', selectedNodeNumber, nodeCo unt));
649 appendChunk(separator); 643 appendChunk(separator);
650 appendChunk(Common.UIString( 644 appendChunk(Common.UIString(
651 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize))); 645 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize)));
652 } else { 646 } else {
653 appendChunk(Common.UIString('%d requests', requestsNumber)); 647 appendChunk(Common.UIString('%d requests', nodeCount));
654 appendChunk(separator); 648 appendChunk(separator);
655 appendChunk(Common.UIString('%s transferred', Number.bytesToString(transfe rSize))); 649 appendChunk(Common.UIString('%s transferred', Number.bytesToString(transfe rSize)));
656 } 650 }
657 if (baseTime !== -1 && maxTime !== -1) { 651 if (baseTime !== -1 && maxTime !== -1) {
658 appendChunk(separator); 652 appendChunk(separator);
659 appendChunk(Common.UIString('Finish: %s', Number.secondsToString(maxTime - baseTime))); 653 appendChunk(Common.UIString('Finish: %s', Number.secondsToString(maxTime - baseTime)));
660 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) { 654 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) {
661 appendChunk(separator); 655 appendChunk(separator);
662 var domContentLoadedText = Common.UIString( 656 var domContentLoadedText = Common.UIString(
663 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime)); 657 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime));
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 696
703 _refreshIfNeeded() { 697 _refreshIfNeeded() {
704 if (this._needsRefresh) 698 if (this._needsRefresh)
705 this._refresh(); 699 this._refresh();
706 } 700 }
707 701
708 /** 702 /**
709 * @param {boolean=} deferUpdate 703 * @param {boolean=} deferUpdate
710 */ 704 */
711 _invalidateAllItems(deferUpdate) { 705 _invalidateAllItems(deferUpdate) {
712 var requestIds = this._nodesByRequestId.keysArray(); 706 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) 707 if (deferUpdate)
716 this.scheduleRefresh(); 708 this.scheduleRefresh();
717 else 709 else
718 this._refresh(); 710 this._refresh();
719 } 711 }
720 712
721 /** 713 /**
722 * @return {!Network.NetworkTimeCalculator} 714 * @return {!Network.NetworkTimeCalculator}
723 */ 715 */
724 timeCalculator() { 716 timeCalculator() {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 817
826 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ; 818 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ;
827 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime); 819 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime);
828 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime); 820 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime);
829 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime); 821 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime);
830 822
831 /** @type {!Map<!Network.NetworkNode, !Network.NetworkNode>} */ 823 /** @type {!Map<!Network.NetworkNode, !Network.NetworkNode>} */
832 var nodesToInsert = new Map(); 824 var nodesToInsert = new Map();
833 /** @type {!Array<!Network.NetworkNode>} */ 825 /** @type {!Array<!Network.NetworkNode>} */
834 var nodesToRefresh = []; 826 var nodesToRefresh = [];
835 for (var requestId in this._staleRequestIds) { 827
836 var node = this._nodesByRequestId.get(requestId); 828 /** @type {!Set<!Network.NetworkRequestNode>} */
829 var staleNodes = new Set();
830
831 // While creating nodes it may add more entries into _staleRequests because redirect request nodes update the parent
832 // node so we loop until we have no more stale requests.
833 while (this._staleRequests.size) {
834 var request = this._staleRequests.firstValue();
835 this._staleRequests.delete(request);
836 var node = request[Network.NetworkLogView._networkNodeSymbol];
837 if (!node) 837 if (!node)
838 continue; 838 node = this._createNodeForRequest(request);
839 staleNodes.add(node);
840 }
841
842 for (var node of staleNodes) {
839 var isFilteredOut = !this._applyFilter(node); 843 var isFilteredOut = !this._applyFilter(node);
840 if (isFilteredOut && node === this._hoveredNode) 844 if (isFilteredOut && node === this._hoveredNode)
841 this._setHoveredNode(null); 845 this._setHoveredNode(null);
842 846
843 if (!isFilteredOut) 847 if (!isFilteredOut)
844 nodesToRefresh.push(node); 848 nodesToRefresh.push(node);
845 var request = node.request(); 849 var request = node.request();
846 this._timeCalculator.updateBoundaries(request); 850 this._timeCalculator.updateBoundaries(request);
847 this._durationCalculator.updateBoundaries(request); 851 this._durationCalculator.updateBoundaries(request);
848 var newParent = this._parentNodeForInsert(node); 852 var newParent = this._parentNodeForInsert(node);
(...skipping 28 matching lines...) Expand all
877 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchR equest(request); 881 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchR equest(request);
878 parent.appendChild(node); 882 parent.appendChild(node);
879 } 883 }
880 884
881 for (var node of nodesToRefresh) 885 for (var node of nodesToRefresh)
882 node.refresh(); 886 node.refresh();
883 887
884 this._highlightNthMatchedRequestForSearch( 888 this._highlightNthMatchedRequestForSearch(
885 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false); 889 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false);
886 890
887 this._staleRequestIds = {};
888 this._updateSummaryBar(); 891 this._updateSummaryBar();
889 892
890 if (nodesToInsert.size) 893 if (nodesToInsert.size)
891 this._columns.sortByCurrentColumn(); 894 this._columns.sortByCurrentColumn();
892 895
893 this._dataGrid.updateInstantly(); 896 this._dataGrid.updateInstantly();
897 this._didRefreshForTest();
898 }
899
900 _didRefreshForTest() {
894 } 901 }
895 902
896 /** 903 /**
897 * @param {!Network.NetworkRequestNode} node 904 * @param {!Network.NetworkRequestNode} node
898 * @return {?Network.NetworkNode} 905 * @return {?Network.NetworkNode}
899 */ 906 */
900 _parentNodeForInsert(node) { 907 _parentNodeForInsert(node) {
901 if (!this._activeGroupLookup) 908 if (!this._activeGroupLookup)
902 return this._dataGrid.rootNode(); 909 return this._dataGrid.rootNode();
903 910
904 var groupNode = this._activeGroupLookup.groupNodeForRequest(node.request()); 911 var groupNode = this._activeGroupLookup.groupNodeForRequest(node.request());
905 if (!groupNode) 912 if (!groupNode)
906 return this._dataGrid.rootNode(); 913 return this._dataGrid.rootNode();
907 return groupNode; 914 return groupNode;
908 } 915 }
909 916
910 reset() { 917 _reset() {
dgozman 2017/06/15 20:24:09 Out of curiosity, how does this method trigger _re
allada 2017/06/17 00:04:13 Looks like it never did call _refresh... I added a
911 this._requestWithHighlightedInitiators = null; 918 this._requestWithHighlightedInitiators = null;
912 this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null); 919 this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null);
913 920
914 this._clearSearchMatchedList(); 921 this._clearSearchMatchedList();
915 922
916 this._setHoveredNode(null); 923 this._setHoveredNode(null);
917 this._columns.reset(); 924 this._columns.reset();
918 925
919 this._timeFilter = null; 926 this._timeFilter = null;
920 this._calculator.reset(); 927 this._calculator.reset();
921 928
922 this._timeCalculator.setWindow(null); 929 this._timeCalculator.setWindow(null);
923 this.linkifier.reset(); 930 this.linkifier.reset();
924 this.badgePool.reset(); 931 this.badgePool.reset();
925 932
926 if (this._activeGroupLookup) 933 if (this._activeGroupLookup)
927 this._activeGroupLookup.reset(); 934 this._activeGroupLookup.reset();
928 this._nodesByRequestId.clear(); 935 this._staleRequests.clear();
929 this._staleRequestIds = {};
930 this._resetSuggestionBuilder(); 936 this._resetSuggestionBuilder();
931 937
932 this._mainRequestLoadTime = -1; 938 this._mainRequestLoadTime = -1;
933 this._mainRequestDOMContentLoadedTime = -1; 939 this._mainRequestDOMContentLoadedTime = -1;
934 940
935 this._dataGrid.rootNode().removeChildren(); 941 this._dataGrid.rootNode().removeChildren();
936 this._updateSummaryBar(); 942 this._updateSummaryBar();
937 this._dataGrid.setStickToBottom(true); 943 this._dataGrid.setStickToBottom(true);
938 } 944 }
939 945
940 /** 946 /**
941 * @param {string} filterString 947 * @param {string} filterString
942 */ 948 */
943 setTextFilterValue(filterString) { 949 setTextFilterValue(filterString) {
944 this._textFilterUI.setValue(filterString); 950 this._textFilterUI.setValue(filterString);
945 this._textFilterUI.setRegexChecked(false); 951 this._textFilterUI.setRegexChecked(false);
946 this._dataURLFilterUI.setChecked(false); 952 this._dataURLFilterUI.setChecked(false);
947 this._resourceCategoryFilterUI.reset(); 953 this._resourceCategoryFilterUI.reset();
948 } 954 }
949 955
950 /** 956 /**
951 * @param {!Common.Event} event
952 */
953 _onRequestStarted(event) {
954 if (!this._recording)
955 return;
956 var request = /** @type {!SDK.NetworkRequest} */ (event.data);
957 this._appendRequest(request);
958 }
959
960 /**
961 * @param {!SDK.NetworkRequest} request 957 * @param {!SDK.NetworkRequest} request
962 */ 958 */
963 _appendRequest(request) { 959 _createNodeForRequest(request) {
964 var node = new Network.NetworkRequestNode(this, request); 960 var node = new Network.NetworkRequestNode(this, request);
961 request[Network.NetworkLogView._networkNodeSymbol] = node;
965 node[Network.NetworkLogView._isFilteredOutSymbol] = true; 962 node[Network.NetworkLogView._isFilteredOutSymbol] = true;
966 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false; 963 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false;
967 964
968 // In case of redirect request id is reassigned to a redirected 965 if (request.redirects)
969 // request and we need to update _nodesByRequestId and search results. 966 request.redirects.forEach(this._refreshRequest.bind(this));
970 var originalRequestNode = this._nodesByRequestId.get(request.requestId()); 967 return node;
971 if (originalRequestNode) 968 }
972 this._nodesByRequestId.set(originalRequestNode.request().requestId(), orig inalRequestNode);
973 this._nodesByRequestId.set(request.requestId(), node);
974 969
975 // Pull all the redirects of the main request upon commit load. 970 // /**
dgozman 2017/06/15 20:24:09 Remove?
allada 2017/06/17 00:04:13 Done.
976 if (request.redirects) { 971 // * @param {!Common.Event} event
977 for (var i = 0; i < request.redirects.length; ++i) 972 // */
978 this._refreshRequest(request.redirects[i]); 973 // _onRequestsRemoved(event) {
979 } 974 // var requests = /** @type {!Set<!SDK.NetworkRequest>} */ (event.data);
975 // var rootNode = this._dataGrid.rootNode();
976 // for (var request of requests) {
977 // var node = request[Network.NetworkLogView._networkNodeSymbol];
978 // while (node && node.parent) {
979 // var parent = node.parent;
980 // this._nodesToRemove.add(node);
981 // if (parent === rootNode || !parent.children.every(child => this._node sToRemove.has(child)))
982 // break;
983 // node = parent;
984 // }
985 // this._staleRequests.delete(request);
986 // delete request[Network.NetworkLogView._networkNodeSymbol];
987 // }
980 988
981 this._refreshRequest(request); 989 // // TODO(allada) We need to unify these calculators with NetworkOverview.
982 } 990 // this._calculator.reset();
991 // this._durationCalculator.reset();
992 // for (var request of NetworkLog.networkLog.requests()) {
993 // this._timeCalculator.updateBoundaries(request);
994 // this._durationCalculator.updateBoundaries(request);
995 // }
996 // }
983 997
984 /** 998 /**
985 * @param {!Common.Event} event 999 * @param {!Common.Event} event
986 */ 1000 */
987 _onRequestUpdated(event) { 1001 _onRequestUpdated(event) {
988 var request = /** @type {!SDK.NetworkRequest} */ (event.data); 1002 var request = /** @type {!SDK.NetworkRequest} */ (event.data);
989 this._refreshRequest(request); 1003 this._refreshRequest(request);
990 } 1004 }
991 1005
992 /** 1006 /**
993 * @param {!SDK.NetworkRequest} request 1007 * @param {!SDK.NetworkRequest} request
994 */ 1008 */
995 _refreshRequest(request) { 1009 _refreshRequest(request) {
996 if (!this._nodesByRequestId.get(request.requestId()))
997 return;
998
999 Network.NetworkLogView._subdomains(request.domain) 1010 Network.NetworkLogView._subdomains(request.domain)
1000 .forEach( 1011 .forEach(
1001 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ k.NetworkLogView.FilterType.Domain)); 1012 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ k.NetworkLogView.FilterType.Domain));
1002 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re quest.requestMethod); 1013 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re quest.requestMethod);
1003 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType, request.mimeType); 1014 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType, request.mimeType);
1004 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, '' + request.scheme); 1015 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, '' + request.scheme);
1005 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode , '' + request.statusCode); 1016 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode , '' + request.statusCode);
1006 1017
1007 var priority = request.initialPriority(); 1018 var priority = request.initialPriority();
1008 if (priority) { 1019 if (priority) {
(...skipping 21 matching lines...) Expand all
1030 for (var i = 0, l = responseHeaders.length; i < l; ++i) 1041 for (var i = 0, l = responseHeaders.length; i < l; ++i)
1031 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo nseHeader, responseHeaders[i].name); 1042 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo nseHeader, responseHeaders[i].name);
1032 var cookies = request.responseCookies; 1043 var cookies = request.responseCookies;
1033 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { 1044 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) {
1034 var cookie = cookies[i]; 1045 var cookie = cookies[i];
1035 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eDomain, cookie.domain()); 1046 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eDomain, cookie.domain());
1036 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eName, cookie.name()); 1047 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eName, cookie.name());
1037 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eValue, cookie.value()); 1048 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eValue, cookie.value());
1038 } 1049 }
1039 1050
1040 this._staleRequestIds[request.requestId()] = true; 1051 this._staleRequests.add(request);
1041 this.dispatchEventToListeners(Network.NetworkLogView.Events.UpdateRequest, r equest);
1042 this.scheduleRefresh(); 1052 this.scheduleRefresh();
1043 } 1053 }
1044 1054
1045 /** 1055 /**
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} 1056 * @return {number}
1082 */ 1057 */
1083 rowHeight() { 1058 rowHeight() {
1084 return this._rowHeight; 1059 return this._rowHeight;
1085 } 1060 }
1086 1061
1087 /** 1062 /**
1088 * @param {boolean} gridMode 1063 * @param {boolean} gridMode
1089 */ 1064 */
1090 switchViewMode(gridMode) { 1065 switchViewMode(gridMode) {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 */ 1153 */
1179 function removeBlockedURL(url) { 1154 function removeBlockedURL(url) {
1180 patterns = patterns.filter(pattern => pattern.url !== url); 1155 patterns = patterns.filter(pattern => pattern.url !== url);
1181 manager.setBlockedPatterns(patterns); 1156 manager.setBlockedPatterns(patterns);
1182 UI.viewManager.showView('network.blocked-urls'); 1157 UI.viewManager.showView('network.blocked-urls');
1183 } 1158 }
1184 } 1159 }
1185 } 1160 }
1186 1161
1187 _harRequests() { 1162 _harRequests() {
1188 var requests = this._nodesByRequestId.valuesArray().map(function(node) { 1163 var httpRequests = NetworkLog.networkLog.requests().filter(Network.NetworkLo gView.HTTPRequestsFilter);
1189 return node.request();
1190 });
1191 var httpRequests = requests.filter(Network.NetworkLogView.HTTPRequestsFilter );
1192 return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter); 1164 return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter);
1193 } 1165 }
1194 1166
1195 _copyAll() { 1167 _copyAll() {
1196 var harArchive = {log: (new NetworkLog.HARLog(this._harRequests())).build()} ; 1168 var harArchive = {log: (new NetworkLog.HARLog(this._harRequests())).build()} ;
1197 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2)); 1169 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2));
1198 } 1170 }
1199 1171
1200 /** 1172 /**
1201 * @param {!SDK.NetworkRequest} request 1173 * @param {!SDK.NetworkRequest} request
(...skipping 29 matching lines...) Expand all
1231 * @param {string} platform 1203 * @param {string} platform
1232 */ 1204 */
1233 _copyCurlCommand(request, platform) { 1205 _copyCurlCommand(request, platform) {
1234 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ; 1206 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ;
1235 } 1207 }
1236 1208
1237 /** 1209 /**
1238 * @param {string} platform 1210 * @param {string} platform
1239 */ 1211 */
1240 _copyAllCurlCommand(platform) { 1212 _copyAllCurlCommand(platform) {
1241 var requests = this._nodesByRequestId.valuesArray().map(node => node.request ()); 1213 var requests = NetworkLog.networkLog.requests();
1242 var commands = []; 1214 var commands = [];
1243 for (var request of requests) 1215 for (var request of requests)
1244 commands.push(this._generateCurlCommand(request, platform)); 1216 commands.push(this._generateCurlCommand(request, platform));
1245 if (platform === 'win') 1217 if (platform === 'win')
1246 InspectorFrontendHost.copyText(commands.join(' &\r\n')); 1218 InspectorFrontendHost.copyText(commands.join(' &\r\n'));
1247 else 1219 else
1248 InspectorFrontendHost.copyText(commands.join(' ;\n')); 1220 InspectorFrontendHost.copyText(commands.join(' ;\n'));
1249 } 1221 }
1250 1222
1251 _exportAll() { 1223 _exportAll() {
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 this._clearSearchMatchedList(); 1571 this._clearSearchMatchedList();
1600 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat ed, 0); 1572 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat ed, 0);
1601 } 1573 }
1602 1574
1603 /** 1575 /**
1604 * @param {!SDK.NetworkRequest} request 1576 * @param {!SDK.NetworkRequest} request
1605 */ 1577 */
1606 revealAndHighlightRequest(request) { 1578 revealAndHighlightRequest(request) {
1607 this.removeAllNodeHighlights(); 1579 this.removeAllNodeHighlights();
1608 1580
1609 var node = this._nodesByRequestId.get(request.requestId()); 1581 var node = request[Network.NetworkLogView._networkNodeSymbol];
1610 if (node) { 1582 if (node && this.attached) {
1611 node.reveal(); 1583 node.reveal();
1612 this._highlightNode(node); 1584 this._highlightNode(node);
1613 } 1585 }
1614 } 1586 }
1615 1587
1616 removeAllNodeHighlights() { 1588 removeAllNodeHighlights() {
1617 if (this._highlightedNode) { 1589 if (this._highlightedNode) {
1618 this._highlightedNode.element().classList.remove('highlighted-row'); 1590 this._highlightedNode.element().classList.remove('highlighted-row');
1619 delete this._highlightedNode; 1591 delete this._highlightedNode;
1620 } 1592 }
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 command.push('--compressed'); 1722 command.push('--compressed');
1751 1723
1752 if (request.securityState() === Protocol.Security.SecurityState.Insecure) 1724 if (request.securityState() === Protocol.Security.SecurityState.Insecure)
1753 command.push('--insecure'); 1725 command.push('--insecure');
1754 return command.join(' '); 1726 return command.join(' ');
1755 } 1727 }
1756 }; 1728 };
1757 1729
1758 Network.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut'); 1730 Network.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut');
1759 Network.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSearchQu ery'); 1731 Network.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSearchQu ery');
1732 Network.NetworkLogView._networkNodeSymbol = Symbol('NetworkNode');
1760 1733
1761 Network.NetworkLogView.HTTPSchemas = { 1734 Network.NetworkLogView.HTTPSchemas = {
1762 'http': true, 1735 'http': true,
1763 'https': true, 1736 'https': true,
1764 'ws': true, 1737 'ws': true,
1765 'wss': true 1738 'wss': true
1766 }; 1739 };
1767 1740
1768 /** @enum {symbol} */ 1741 /** @enum {symbol} */
1769 Network.NetworkLogView.Events = { 1742 Network.NetworkLogView.Events = {
1770 RequestSelected: Symbol('RequestSelected'), 1743 RequestSelected: Symbol('RequestSelected'),
1771 SearchCountUpdated: Symbol('SearchCountUpdated'), 1744 SearchCountUpdated: Symbol('SearchCountUpdated'),
1772 SearchIndexUpdated: Symbol('SearchIndexUpdated'), 1745 SearchIndexUpdated: Symbol('SearchIndexUpdated')
1773 UpdateRequest: Symbol('UpdateRequest')
1774 }; 1746 };
1775 1747
1776 /** @enum {string} */ 1748 /** @enum {string} */
1777 Network.NetworkLogView.FilterType = { 1749 Network.NetworkLogView.FilterType = {
1778 Domain: 'domain', 1750 Domain: 'domain',
1779 HasResponseHeader: 'has-response-header', 1751 HasResponseHeader: 'has-response-header',
1780 Is: 'is', 1752 Is: 'is',
1781 LargerThan: 'larger-than', 1753 LargerThan: 'larger-than',
1782 Method: 'method', 1754 Method: 'method',
1783 MimeType: 'mime-type', 1755 MimeType: 'mime-type',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 1790
1819 Network.GroupLookupInterface.prototype = { 1791 Network.GroupLookupInterface.prototype = {
1820 /** 1792 /**
1821 * @param {!SDK.NetworkRequest} request 1793 * @param {!SDK.NetworkRequest} request
1822 * @return {?Network.NetworkGroupNode} 1794 * @return {?Network.NetworkGroupNode}
1823 */ 1795 */
1824 groupNodeForRequest: function(request) {}, 1796 groupNodeForRequest: function(request) {},
1825 1797
1826 reset: function() {} 1798 reset: function() {}
1827 }; 1799 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698