| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 networkRequest.requestFormData = request.postData; | 198 networkRequest.requestFormData = request.postData; |
| 199 networkRequest.setInitialPriority(request.initialPriority); | 199 networkRequest.setInitialPriority(request.initialPriority); |
| 200 networkRequest.mixedContentType = request.mixedContentType || Protocol.Netwo
rk.RequestMixedContentType.None; | 200 networkRequest.mixedContentType = request.mixedContentType || Protocol.Netwo
rk.RequestMixedContentType.None; |
| 201 } | 201 } |
| 202 | 202 |
| 203 /** | 203 /** |
| 204 * @param {!SDK.NetworkRequest} networkRequest | 204 * @param {!SDK.NetworkRequest} networkRequest |
| 205 * @param {!Protocol.Network.Response=} response | 205 * @param {!Protocol.Network.Response=} response |
| 206 */ | 206 */ |
| 207 _updateNetworkRequestWithResponse(networkRequest, response) { | 207 _updateNetworkRequestWithResponse(networkRequest, response) { |
| 208 if (response.url && networkRequest.url !== response.url) | 208 if (response.url && networkRequest.url() !== response.url) |
| 209 networkRequest.url = response.url; | 209 networkRequest.setUrl(response.url); |
| 210 networkRequest.mimeType = response.mimeType; | 210 networkRequest.mimeType = response.mimeType; |
| 211 networkRequest.statusCode = response.status; | 211 networkRequest.statusCode = response.status; |
| 212 networkRequest.statusText = response.statusText; | 212 networkRequest.statusText = response.statusText; |
| 213 networkRequest.responseHeaders = this._headersMapToHeadersArray(response.hea
ders); | 213 networkRequest.responseHeaders = this._headersMapToHeadersArray(response.hea
ders); |
| 214 if (response.encodedDataLength >= 0) | 214 if (response.encodedDataLength >= 0) |
| 215 networkRequest.setTransferSize(response.encodedDataLength); | 215 networkRequest.setTransferSize(response.encodedDataLength); |
| 216 if (response.headersText) | 216 if (response.headersText) |
| 217 networkRequest.responseHeadersText = response.headersText; | 217 networkRequest.responseHeadersText = response.headersText; |
| 218 if (response.requestHeaders) { | 218 if (response.requestHeaders) { |
| 219 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(response.r
equestHeaders)); | 219 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(response.r
equestHeaders)); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 235 networkRequest.protocol = response.protocol; | 235 networkRequest.protocol = response.protocol; |
| 236 | 236 |
| 237 networkRequest.setSecurityState(response.securityState); | 237 networkRequest.setSecurityState(response.securityState); |
| 238 | 238 |
| 239 if (!this._mimeTypeIsConsistentWithType(networkRequest)) { | 239 if (!this._mimeTypeIsConsistentWithType(networkRequest)) { |
| 240 var consoleModel = this._manager._target.consoleModel; | 240 var consoleModel = this._manager._target.consoleModel; |
| 241 consoleModel.addMessage(new SDK.ConsoleMessage( | 241 consoleModel.addMessage(new SDK.ConsoleMessage( |
| 242 consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network, SDK.C
onsoleMessage.MessageLevel.Log, | 242 consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network, SDK.C
onsoleMessage.MessageLevel.Log, |
| 243 Common.UIString( | 243 Common.UIString( |
| 244 'Resource interpreted as %s but transferred with MIME type %s: "%s
".', | 244 'Resource interpreted as %s but transferred with MIME type %s: "%s
".', |
| 245 networkRequest.resourceType().title(), networkRequest.mimeType, ne
tworkRequest.url), | 245 networkRequest.resourceType().title(), networkRequest.mimeType, ne
tworkRequest.url()), |
| 246 SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId
())); | 246 SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId
())); |
| 247 } | 247 } |
| 248 | 248 |
| 249 if (response.securityDetails) | 249 if (response.securityDetails) |
| 250 networkRequest.setSecurityDetails(response.securityDetails); | 250 networkRequest.setSecurityDetails(response.securityDetails); |
| 251 } | 251 } |
| 252 | 252 |
| 253 /** | 253 /** |
| 254 * @param {!SDK.NetworkRequest} networkRequest | 254 * @param {!SDK.NetworkRequest} networkRequest |
| 255 * @return {boolean} | 255 * @return {boolean} |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 originalNetworkRequest.documentURL, originalNetworkRequest.initiator()); | 605 originalNetworkRequest.documentURL, originalNetworkRequest.initiator()); |
| 606 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkReques
t); | 606 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkReques
t); |
| 607 return newNetworkRequest; | 607 return newNetworkRequest; |
| 608 } | 608 } |
| 609 | 609 |
| 610 /** | 610 /** |
| 611 * @param {!SDK.NetworkRequest} networkRequest | 611 * @param {!SDK.NetworkRequest} networkRequest |
| 612 */ | 612 */ |
| 613 _startNetworkRequest(networkRequest) { | 613 _startNetworkRequest(networkRequest) { |
| 614 this._inflightRequestsById[networkRequest.requestId()] = networkRequest; | 614 this._inflightRequestsById[networkRequest.requestId()] = networkRequest; |
| 615 this._inflightRequestsByURL[networkRequest.url] = networkRequest; | 615 this._inflightRequestsByURL[networkRequest.url()] = networkRequest; |
| 616 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestStarted, net
workRequest); | 616 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestStarted, net
workRequest); |
| 617 } | 617 } |
| 618 | 618 |
| 619 /** | 619 /** |
| 620 * @param {!SDK.NetworkRequest} networkRequest | 620 * @param {!SDK.NetworkRequest} networkRequest |
| 621 */ | 621 */ |
| 622 _updateNetworkRequest(networkRequest) { | 622 _updateNetworkRequest(networkRequest) { |
| 623 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestUpdated, net
workRequest); | 623 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestUpdated, net
workRequest); |
| 624 } | 624 } |
| 625 | 625 |
| 626 /** | 626 /** |
| 627 * @param {!SDK.NetworkRequest} networkRequest | 627 * @param {!SDK.NetworkRequest} networkRequest |
| 628 * @param {!Protocol.Network.Timestamp} finishTime | 628 * @param {!Protocol.Network.Timestamp} finishTime |
| 629 * @param {number} encodedDataLength | 629 * @param {number} encodedDataLength |
| 630 */ | 630 */ |
| 631 _finishNetworkRequest(networkRequest, finishTime, encodedDataLength) { | 631 _finishNetworkRequest(networkRequest, finishTime, encodedDataLength) { |
| 632 networkRequest.endTime = finishTime; | 632 networkRequest.endTime = finishTime; |
| 633 networkRequest.finished = true; | 633 networkRequest.finished = true; |
| 634 if (encodedDataLength >= 0) | 634 if (encodedDataLength >= 0) |
| 635 networkRequest.setTransferSize(encodedDataLength); | 635 networkRequest.setTransferSize(encodedDataLength); |
| 636 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestFinished, ne
tworkRequest); | 636 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestFinished, ne
tworkRequest); |
| 637 delete this._inflightRequestsById[networkRequest.requestId()]; | 637 delete this._inflightRequestsById[networkRequest.requestId()]; |
| 638 delete this._inflightRequestsByURL[networkRequest.url]; | 638 delete this._inflightRequestsByURL[networkRequest.url()]; |
| 639 } | 639 } |
| 640 | 640 |
| 641 /** | 641 /** |
| 642 * @param {string} eventType | 642 * @param {string} eventType |
| 643 * @param {!SDK.NetworkRequest} networkRequest | 643 * @param {!SDK.NetworkRequest} networkRequest |
| 644 */ | 644 */ |
| 645 _dispatchEventToListeners(eventType, networkRequest) { | 645 _dispatchEventToListeners(eventType, networkRequest) { |
| 646 this._manager.dispatchEventToListeners(eventType, networkRequest); | 646 this._manager.dispatchEventToListeners(eventType, networkRequest); |
| 647 } | 647 } |
| 648 | 648 |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 896 SDK.MultitargetNetworkManager.Events = { | 896 SDK.MultitargetNetworkManager.Events = { |
| 897 ConditionsChanged: Symbol('ConditionsChanged'), | 897 ConditionsChanged: Symbol('ConditionsChanged'), |
| 898 UserAgentChanged: Symbol('UserAgentChanged') | 898 UserAgentChanged: Symbol('UserAgentChanged') |
| 899 }; | 899 }; |
| 900 | 900 |
| 901 | 901 |
| 902 /** | 902 /** |
| 903 * @type {!SDK.MultitargetNetworkManager} | 903 * @type {!SDK.MultitargetNetworkManager} |
| 904 */ | 904 */ |
| 905 SDK.multitargetNetworkManager; | 905 SDK.multitargetNetworkManager; |
| OLD | NEW |