| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 if (request.endTime !== -1 && request.endTime < windowStart) | 342 if (request.endTime !== -1 && request.endTime < windowStart) |
| 343 return false; | 343 return false; |
| 344 return true; | 344 return true; |
| 345 } | 345 } |
| 346 | 346 |
| 347 /** | 347 /** |
| 348 * @param {!SDK.NetworkRequest} request | 348 * @param {!SDK.NetworkRequest} request |
| 349 * @return {?Network.NetworkNode} | 349 * @return {?Network.NetworkNode} |
| 350 */ | 350 */ |
| 351 nodeForRequest(request) { | 351 nodeForRequest(request) { |
| 352 return this._nodesByRequestId.get(request.requestId); | 352 return this._nodesByRequestId.get(request.requestId()); |
| 353 } | 353 } |
| 354 | 354 |
| 355 /** | 355 /** |
| 356 * @return {number} | 356 * @return {number} |
| 357 */ | 357 */ |
| 358 headerHeight() { | 358 headerHeight() { |
| 359 return this._headerHeight; | 359 return this._headerHeight; |
| 360 } | 360 } |
| 361 | 361 |
| 362 /** | 362 /** |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 /** | 902 /** |
| 903 * @param {!SDK.NetworkRequest} request | 903 * @param {!SDK.NetworkRequest} request |
| 904 */ | 904 */ |
| 905 _appendRequest(request) { | 905 _appendRequest(request) { |
| 906 var node = new Network.NetworkRequestNode(this, request); | 906 var node = new Network.NetworkRequestNode(this, request); |
| 907 node[Network.NetworkLogView._isFilteredOutSymbol] = true; | 907 node[Network.NetworkLogView._isFilteredOutSymbol] = true; |
| 908 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false; | 908 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false; |
| 909 | 909 |
| 910 // In case of redirect request id is reassigned to a redirected | 910 // In case of redirect request id is reassigned to a redirected |
| 911 // request and we need to update _nodesByRequestId and search results. | 911 // request and we need to update _nodesByRequestId and search results. |
| 912 var originalRequestNode = this._nodesByRequestId.get(request.requestId); | 912 var originalRequestNode = this._nodesByRequestId.get(request.requestId()); |
| 913 if (originalRequestNode) | 913 if (originalRequestNode) |
| 914 this._nodesByRequestId.set(originalRequestNode.request().requestId, origin
alRequestNode); | 914 this._nodesByRequestId.set(originalRequestNode.request().requestId(), orig
inalRequestNode); |
| 915 this._nodesByRequestId.set(request.requestId, node); | 915 this._nodesByRequestId.set(request.requestId(), node); |
| 916 | 916 |
| 917 // Pull all the redirects of the main request upon commit load. | 917 // Pull all the redirects of the main request upon commit load. |
| 918 if (request.redirects) { | 918 if (request.redirects) { |
| 919 for (var i = 0; i < request.redirects.length; ++i) | 919 for (var i = 0; i < request.redirects.length; ++i) |
| 920 this._refreshRequest(request.redirects[i]); | 920 this._refreshRequest(request.redirects[i]); |
| 921 } | 921 } |
| 922 | 922 |
| 923 this._refreshRequest(request); | 923 this._refreshRequest(request); |
| 924 } | 924 } |
| 925 | 925 |
| 926 /** | 926 /** |
| 927 * @param {!Common.Event} event | 927 * @param {!Common.Event} event |
| 928 */ | 928 */ |
| 929 _onRequestUpdated(event) { | 929 _onRequestUpdated(event) { |
| 930 var request = /** @type {!SDK.NetworkRequest} */ (event.data); | 930 var request = /** @type {!SDK.NetworkRequest} */ (event.data); |
| 931 this._refreshRequest(request); | 931 this._refreshRequest(request); |
| 932 } | 932 } |
| 933 | 933 |
| 934 /** | 934 /** |
| 935 * @param {!SDK.NetworkRequest} request | 935 * @param {!SDK.NetworkRequest} request |
| 936 */ | 936 */ |
| 937 _refreshRequest(request) { | 937 _refreshRequest(request) { |
| 938 if (!this._nodesByRequestId.get(request.requestId)) | 938 if (!this._nodesByRequestId.get(request.requestId())) |
| 939 return; | 939 return; |
| 940 | 940 |
| 941 Network.NetworkLogView._subdomains(request.domain) | 941 Network.NetworkLogView._subdomains(request.domain) |
| 942 .forEach( | 942 .forEach( |
| 943 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ
k.NetworkLogView.FilterType.Domain)); | 943 this._suggestionBuilder.addItem.bind(this._suggestionBuilder, Networ
k.NetworkLogView.FilterType.Domain)); |
| 944 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re
quest.requestMethod); | 944 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re
quest.requestMethod); |
| 945 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType,
request.mimeType); | 945 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType,
request.mimeType); |
| 946 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, ''
+ request.scheme); | 946 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, ''
+ request.scheme); |
| 947 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode
, '' + request.statusCode); | 947 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode
, '' + request.statusCode); |
| 948 | 948 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 972 for (var i = 0, l = responseHeaders.length; i < l; ++i) | 972 for (var i = 0, l = responseHeaders.length; i < l; ++i) |
| 973 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo
nseHeader, responseHeaders[i].name); | 973 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.HasRespo
nseHeader, responseHeaders[i].name); |
| 974 var cookies = request.responseCookies; | 974 var cookies = request.responseCookies; |
| 975 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { | 975 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { |
| 976 var cookie = cookies[i]; | 976 var cookie = cookies[i]; |
| 977 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eDomain, cookie.domain()); | 977 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eDomain, cookie.domain()); |
| 978 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eName, cookie.name()); | 978 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eName, cookie.name()); |
| 979 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eValue, cookie.value()); | 979 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki
eValue, cookie.value()); |
| 980 } | 980 } |
| 981 | 981 |
| 982 this._staleRequestIds[request.requestId] = true; | 982 this._staleRequestIds[request.requestId()] = true; |
| 983 this.dispatchEventToListeners(Network.NetworkLogView.Events.UpdateRequest, r
equest); | 983 this.dispatchEventToListeners(Network.NetworkLogView.Events.UpdateRequest, r
equest); |
| 984 this.scheduleRefresh(); | 984 this.scheduleRefresh(); |
| 985 } | 985 } |
| 986 | 986 |
| 987 /** | 987 /** |
| 988 * @param {!Common.Event} event | 988 * @param {!Common.Event} event |
| 989 */ | 989 */ |
| 990 _mainFrameNavigated(event) { | 990 _mainFrameNavigated(event) { |
| 991 if (!this._recording) | 991 if (!this._recording) |
| 992 return; | 992 return; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1004 requestsToPick.push(request); | 1004 requestsToPick.push(request); |
| 1005 } | 1005 } |
| 1006 | 1006 |
| 1007 if (!this._preserveLog) { | 1007 if (!this._preserveLog) { |
| 1008 this.reset(); | 1008 this.reset(); |
| 1009 for (var i = 0; i < requestsToPick.length; ++i) | 1009 for (var i = 0; i < requestsToPick.length; ++i) |
| 1010 this._appendRequest(requestsToPick[i]); | 1010 this._appendRequest(requestsToPick[i]); |
| 1011 } | 1011 } |
| 1012 for (var i = 0; i < requestsToPick.length; ++i) { | 1012 for (var i = 0; i < requestsToPick.length; ++i) { |
| 1013 var request = requestsToPick[i]; | 1013 var request = requestsToPick[i]; |
| 1014 var node = this._nodesByRequestId.get(request.requestId); | 1014 var node = this._nodesByRequestId.get(request.requestId()); |
| 1015 if (node) { | 1015 if (node) { |
| 1016 node.markAsNavigationRequest(); | 1016 node.markAsNavigationRequest(); |
| 1017 break; | 1017 break; |
| 1018 } | 1018 } |
| 1019 } | 1019 } |
| 1020 } | 1020 } |
| 1021 | 1021 |
| 1022 /** | 1022 /** |
| 1023 * @return {number} | 1023 * @return {number} |
| 1024 */ | 1024 */ |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1522 this._clearSearchMatchedList(); | 1522 this._clearSearchMatchedList(); |
| 1523 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat
ed, 0); | 1523 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat
ed, 0); |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 /** | 1526 /** |
| 1527 * @param {!SDK.NetworkRequest} request | 1527 * @param {!SDK.NetworkRequest} request |
| 1528 */ | 1528 */ |
| 1529 revealAndHighlightRequest(request) { | 1529 revealAndHighlightRequest(request) { |
| 1530 this.removeAllNodeHighlights(); | 1530 this.removeAllNodeHighlights(); |
| 1531 | 1531 |
| 1532 var node = this._nodesByRequestId.get(request.requestId); | 1532 var node = this._nodesByRequestId.get(request.requestId()); |
| 1533 if (node) { | 1533 if (node) { |
| 1534 node.reveal(); | 1534 node.reveal(); |
| 1535 this._highlightNode(node); | 1535 this._highlightNode(node); |
| 1536 } | 1536 } |
| 1537 } | 1537 } |
| 1538 | 1538 |
| 1539 removeAllNodeHighlights() { | 1539 removeAllNodeHighlights() { |
| 1540 if (this._highlightedNode) { | 1540 if (this._highlightedNode) { |
| 1541 this._highlightedNode.element().classList.remove('highlighted-row'); | 1541 this._highlightedNode.element().classList.remove('highlighted-row'); |
| 1542 delete this._highlightedNode; | 1542 delete this._highlightedNode; |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1718 Running: 'running', | 1718 Running: 'running', |
| 1719 FromCache: 'from-cache' | 1719 FromCache: 'from-cache' |
| 1720 }; | 1720 }; |
| 1721 | 1721 |
| 1722 /** @type {!Array<string>} */ | 1722 /** @type {!Array<string>} */ |
| 1723 Network.NetworkLogView._searchKeys = | 1723 Network.NetworkLogView._searchKeys = |
| 1724 Object.keys(Network.NetworkLogView.FilterType).map(key => Network.NetworkLog
View.FilterType[key]); | 1724 Object.keys(Network.NetworkLogView.FilterType).map(key => Network.NetworkLog
View.FilterType[key]); |
| 1725 | 1725 |
| 1726 /** @typedef {function(!SDK.NetworkRequest): boolean} */ | 1726 /** @typedef {function(!SDK.NetworkRequest): boolean} */ |
| 1727 Network.NetworkLogView.Filter; | 1727 Network.NetworkLogView.Filter; |
| OLD | NEW |