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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js

Issue 2493373002: DevTools: rename WebInspector into modules. (Closed)
Patch Set: for bots Created 4 years, 1 month 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) 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 /** 31 /**
32 * @unrestricted 32 * @unrestricted
33 */ 33 */
34 WebInspector.NetworkManager = class extends WebInspector.SDKModel { 34 SDK.NetworkManager = class extends SDK.SDKModel {
35 /** 35 /**
36 * @param {!WebInspector.Target} target 36 * @param {!SDK.Target} target
37 */ 37 */
38 constructor(target) { 38 constructor(target) {
39 super(WebInspector.NetworkManager, target); 39 super(SDK.NetworkManager, target);
40 this._dispatcher = new WebInspector.NetworkDispatcher(this); 40 this._dispatcher = new SDK.NetworkDispatcher(this);
41 this._target = target; 41 this._target = target;
42 this._networkAgent = target.networkAgent(); 42 this._networkAgent = target.networkAgent();
43 target.registerNetworkDispatcher(this._dispatcher); 43 target.registerNetworkDispatcher(this._dispatcher);
44 if (WebInspector.moduleSetting('cacheDisabled').get()) 44 if (Common.moduleSetting('cacheDisabled').get())
45 this._networkAgent.setCacheDisabled(true); 45 this._networkAgent.setCacheDisabled(true);
46 if (WebInspector.moduleSetting('monitoringXHREnabled').get()) 46 if (Common.moduleSetting('monitoringXHREnabled').get())
47 this._networkAgent.setMonitoringXHREnabled(true); 47 this._networkAgent.setMonitoringXHREnabled(true);
48 48
49 // Limit buffer when talking to a remote device. 49 // Limit buffer when talking to a remote device.
50 if (Runtime.queryParam('remoteFrontend') || Runtime.queryParam('ws')) 50 if (Runtime.queryParam('remoteFrontend') || Runtime.queryParam('ws'))
51 this._networkAgent.enable(10000000, 5000000); 51 this._networkAgent.enable(10000000, 5000000);
52 else 52 else
53 this._networkAgent.enable(); 53 this._networkAgent.enable();
54 54
55 this._bypassServiceWorkerSetting = WebInspector.settings.createSetting('bypa ssServiceWorker', false); 55 this._bypassServiceWorkerSetting = Common.settings.createSetting('bypassServ iceWorker', false);
56 if (this._bypassServiceWorkerSetting.get()) 56 if (this._bypassServiceWorkerSetting.get())
57 this._bypassServiceWorkerChanged(); 57 this._bypassServiceWorkerChanged();
58 this._bypassServiceWorkerSetting.addChangeListener(this._bypassServiceWorker Changed, this); 58 this._bypassServiceWorkerSetting.addChangeListener(this._bypassServiceWorker Changed, this);
59 59
60 WebInspector.moduleSetting('cacheDisabled').addChangeListener(this._cacheDis abledSettingChanged, this); 60 Common.moduleSetting('cacheDisabled').addChangeListener(this._cacheDisabledS ettingChanged, this);
61 } 61 }
62 62
63 /** 63 /**
64 * @param {!WebInspector.Target} target 64 * @param {!SDK.Target} target
65 * @return {?WebInspector.NetworkManager} 65 * @return {?SDK.NetworkManager}
66 */ 66 */
67 static fromTarget(target) { 67 static fromTarget(target) {
68 return /** @type {?WebInspector.NetworkManager} */ (target.model(WebInspecto r.NetworkManager)); 68 return /** @type {?SDK.NetworkManager} */ (target.model(SDK.NetworkManager)) ;
69 } 69 }
70 70
71 /** 71 /**
72 * @param {!WebInspector.NetworkManager.Conditions} conditions 72 * @param {!SDK.NetworkManager.Conditions} conditions
73 * @return {!Protocol.Network.ConnectionType} 73 * @return {!Protocol.Network.ConnectionType}
74 * TODO(allada): this belongs to NetworkConditionsSelector, which should hardc ode/guess it. 74 * TODO(allada): this belongs to NetworkConditionsSelector, which should hardc ode/guess it.
75 */ 75 */
76 static _connectionType(conditions) { 76 static _connectionType(conditions) {
77 if (!conditions.download && !conditions.upload) 77 if (!conditions.download && !conditions.upload)
78 return Protocol.Network.ConnectionType.None; 78 return Protocol.Network.ConnectionType.None;
79 var types = WebInspector.NetworkManager._connectionTypes; 79 var types = SDK.NetworkManager._connectionTypes;
80 if (!types) { 80 if (!types) {
81 WebInspector.NetworkManager._connectionTypes = []; 81 SDK.NetworkManager._connectionTypes = [];
82 types = WebInspector.NetworkManager._connectionTypes; 82 types = SDK.NetworkManager._connectionTypes;
83 types.push(['2g', Protocol.Network.ConnectionType.Cellular2g]); 83 types.push(['2g', Protocol.Network.ConnectionType.Cellular2g]);
84 types.push(['3g', Protocol.Network.ConnectionType.Cellular3g]); 84 types.push(['3g', Protocol.Network.ConnectionType.Cellular3g]);
85 types.push(['4g', Protocol.Network.ConnectionType.Cellular4g]); 85 types.push(['4g', Protocol.Network.ConnectionType.Cellular4g]);
86 types.push(['bluetooth', Protocol.Network.ConnectionType.Bluetooth]); 86 types.push(['bluetooth', Protocol.Network.ConnectionType.Bluetooth]);
87 types.push(['wifi', Protocol.Network.ConnectionType.Wifi]); 87 types.push(['wifi', Protocol.Network.ConnectionType.Wifi]);
88 types.push(['wimax', Protocol.Network.ConnectionType.Wimax]); 88 types.push(['wimax', Protocol.Network.ConnectionType.Wimax]);
89 } 89 }
90 for (var type of types) { 90 for (var type of types) {
91 if (conditions.title.toLowerCase().indexOf(type[0]) !== -1) 91 if (conditions.title.toLowerCase().indexOf(type[0]) !== -1)
92 return type[1]; 92 return type[1];
93 } 93 }
94 return Protocol.Network.ConnectionType.Other; 94 return Protocol.Network.ConnectionType.Other;
95 } 95 }
96 96
97 /** 97 /**
98 * @param {string} url 98 * @param {string} url
99 * @return {!WebInspector.NetworkRequest} 99 * @return {!SDK.NetworkRequest}
100 */ 100 */
101 inflightRequestForURL(url) { 101 inflightRequestForURL(url) {
102 return this._dispatcher._inflightRequestsByURL[url]; 102 return this._dispatcher._inflightRequestsByURL[url];
103 } 103 }
104 104
105 /** 105 /**
106 * @param {!WebInspector.Event} event 106 * @param {!Common.Event} event
107 */ 107 */
108 _cacheDisabledSettingChanged(event) { 108 _cacheDisabledSettingChanged(event) {
109 var enabled = /** @type {boolean} */ (event.data); 109 var enabled = /** @type {boolean} */ (event.data);
110 this._networkAgent.setCacheDisabled(enabled); 110 this._networkAgent.setCacheDisabled(enabled);
111 } 111 }
112 112
113 /** 113 /**
114 * @override 114 * @override
115 */ 115 */
116 dispose() { 116 dispose() {
117 WebInspector.moduleSetting('cacheDisabled').removeChangeListener(this._cache DisabledSettingChanged, this); 117 Common.moduleSetting('cacheDisabled').removeChangeListener(this._cacheDisabl edSettingChanged, this);
118 } 118 }
119 119
120 _bypassServiceWorkerChanged() { 120 _bypassServiceWorkerChanged() {
121 this._networkAgent.setBypassServiceWorker(this._bypassServiceWorkerSetting.g et()); 121 this._networkAgent.setBypassServiceWorker(this._bypassServiceWorkerSetting.g et());
122 } 122 }
123 }; 123 };
124 124
125 /** @enum {symbol} */ 125 /** @enum {symbol} */
126 WebInspector.NetworkManager.Events = { 126 SDK.NetworkManager.Events = {
127 RequestStarted: Symbol('RequestStarted'), 127 RequestStarted: Symbol('RequestStarted'),
128 RequestUpdated: Symbol('RequestUpdated'), 128 RequestUpdated: Symbol('RequestUpdated'),
129 RequestFinished: Symbol('RequestFinished'), 129 RequestFinished: Symbol('RequestFinished'),
130 RequestUpdateDropped: Symbol('RequestUpdateDropped'), 130 RequestUpdateDropped: Symbol('RequestUpdateDropped'),
131 ResponseReceived: Symbol('ResponseReceived') 131 ResponseReceived: Symbol('ResponseReceived')
132 }; 132 };
133 133
134 WebInspector.NetworkManager._MIMETypes = { 134 SDK.NetworkManager._MIMETypes = {
135 'text/html': {'document': true}, 135 'text/html': {'document': true},
136 'text/xml': {'document': true}, 136 'text/xml': {'document': true},
137 'text/plain': {'document': true}, 137 'text/plain': {'document': true},
138 'application/xhtml+xml': {'document': true}, 138 'application/xhtml+xml': {'document': true},
139 'image/svg+xml': {'document': true}, 139 'image/svg+xml': {'document': true},
140 'text/css': {'stylesheet': true}, 140 'text/css': {'stylesheet': true},
141 'text/xsl': {'stylesheet': true}, 141 'text/xsl': {'stylesheet': true},
142 'text/vtt': {'texttrack': true}, 142 'text/vtt': {'texttrack': true},
143 }; 143 };
144 144
145 145
146 /** @typedef {{download: number, upload: number, latency: number, title: string} } */ 146 /** @typedef {{download: number, upload: number, latency: number, title: string} } */
147 WebInspector.NetworkManager.Conditions; 147 SDK.NetworkManager.Conditions;
148 /** @type {!WebInspector.NetworkManager.Conditions} */ 148 /** @type {!SDK.NetworkManager.Conditions} */
149 WebInspector.NetworkManager.NoThrottlingConditions = { 149 SDK.NetworkManager.NoThrottlingConditions = {
150 title: WebInspector.UIString('No throttling'), 150 title: Common.UIString('No throttling'),
151 download: -1, 151 download: -1,
152 upload: -1, 152 upload: -1,
153 latency: 0 153 latency: 0
154 }; 154 };
155 /** @type {!WebInspector.NetworkManager.Conditions} */ 155 /** @type {!SDK.NetworkManager.Conditions} */
156 WebInspector.NetworkManager.OfflineConditions = { 156 SDK.NetworkManager.OfflineConditions = {
157 title: WebInspector.UIString('Offline'), 157 title: Common.UIString('Offline'),
158 download: 0, 158 download: 0,
159 upload: 0, 159 upload: 0,
160 latency: 0 160 latency: 0
161 }; 161 };
162 162
163 163
164 /** 164 /**
165 * @implements {Protocol.NetworkDispatcher} 165 * @implements {Protocol.NetworkDispatcher}
166 * @unrestricted 166 * @unrestricted
167 */ 167 */
168 WebInspector.NetworkDispatcher = class { 168 SDK.NetworkDispatcher = class {
169 constructor(manager) { 169 constructor(manager) {
170 this._manager = manager; 170 this._manager = manager;
171 this._inflightRequestsById = {}; 171 this._inflightRequestsById = {};
172 this._inflightRequestsByURL = {}; 172 this._inflightRequestsByURL = {};
173 } 173 }
174 174
175 /** 175 /**
176 * @param {!Protocol.Network.Headers} headersMap 176 * @param {!Protocol.Network.Headers} headersMap
177 * @return {!Array.<!WebInspector.NetworkRequest.NameValue>} 177 * @return {!Array.<!SDK.NetworkRequest.NameValue>}
178 */ 178 */
179 _headersMapToHeadersArray(headersMap) { 179 _headersMapToHeadersArray(headersMap) {
180 var result = []; 180 var result = [];
181 for (var name in headersMap) { 181 for (var name in headersMap) {
182 var values = headersMap[name].split('\n'); 182 var values = headersMap[name].split('\n');
183 for (var i = 0; i < values.length; ++i) 183 for (var i = 0; i < values.length; ++i)
184 result.push({name: name, value: values[i]}); 184 result.push({name: name, value: values[i]});
185 } 185 }
186 return result; 186 return result;
187 } 187 }
188 188
189 /** 189 /**
190 * @param {!WebInspector.NetworkRequest} networkRequest 190 * @param {!SDK.NetworkRequest} networkRequest
191 * @param {!Protocol.Network.Request} request 191 * @param {!Protocol.Network.Request} request
192 */ 192 */
193 _updateNetworkRequestWithRequest(networkRequest, request) { 193 _updateNetworkRequestWithRequest(networkRequest, request) {
194 networkRequest.requestMethod = request.method; 194 networkRequest.requestMethod = request.method;
195 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(request.head ers)); 195 networkRequest.setRequestHeaders(this._headersMapToHeadersArray(request.head ers));
196 networkRequest.requestFormData = request.postData; 196 networkRequest.requestFormData = request.postData;
197 networkRequest.setInitialPriority(request.initialPriority); 197 networkRequest.setInitialPriority(request.initialPriority);
198 networkRequest.mixedContentType = request.mixedContentType || Protocol.Netwo rk.RequestMixedContentType.None; 198 networkRequest.mixedContentType = request.mixedContentType || Protocol.Netwo rk.RequestMixedContentType.None;
199 } 199 }
200 200
201 /** 201 /**
202 * @param {!WebInspector.NetworkRequest} networkRequest 202 * @param {!SDK.NetworkRequest} networkRequest
203 * @param {!Protocol.Network.Response=} response 203 * @param {!Protocol.Network.Response=} response
204 */ 204 */
205 _updateNetworkRequestWithResponse(networkRequest, response) { 205 _updateNetworkRequestWithResponse(networkRequest, response) {
206 if (response.url && networkRequest.url !== response.url) 206 if (response.url && networkRequest.url !== response.url)
207 networkRequest.url = response.url; 207 networkRequest.url = response.url;
208 networkRequest.mimeType = response.mimeType; 208 networkRequest.mimeType = response.mimeType;
209 networkRequest.statusCode = response.status; 209 networkRequest.statusCode = response.status;
210 networkRequest.statusText = response.statusText; 210 networkRequest.statusText = response.statusText;
211 networkRequest.responseHeaders = this._headersMapToHeadersArray(response.hea ders); 211 networkRequest.responseHeaders = this._headersMapToHeadersArray(response.hea ders);
212 if (response.encodedDataLength >= 0) 212 if (response.encodedDataLength >= 0)
(...skipping 16 matching lines...) Expand all
229 if (response.fromDiskCache) 229 if (response.fromDiskCache)
230 networkRequest.setFromDiskCache(); 230 networkRequest.setFromDiskCache();
231 networkRequest.timing = response.timing; 231 networkRequest.timing = response.timing;
232 232
233 networkRequest.protocol = response.protocol; 233 networkRequest.protocol = response.protocol;
234 234
235 networkRequest.setSecurityState(response.securityState); 235 networkRequest.setSecurityState(response.securityState);
236 236
237 if (!this._mimeTypeIsConsistentWithType(networkRequest)) { 237 if (!this._mimeTypeIsConsistentWithType(networkRequest)) {
238 var consoleModel = this._manager._target.consoleModel; 238 var consoleModel = this._manager._target.consoleModel;
239 consoleModel.addMessage(new WebInspector.ConsoleMessage( 239 consoleModel.addMessage(new SDK.ConsoleMessage(
240 consoleModel.target(), WebInspector.ConsoleMessage.MessageSource.Netwo rk, 240 consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network,
241 WebInspector.ConsoleMessage.MessageLevel.Log, 241 SDK.ConsoleMessage.MessageLevel.Log,
242 WebInspector.UIString( 242 Common.UIString(
243 'Resource interpreted as %s but transferred with MIME type %s: "%s ".', 243 'Resource interpreted as %s but transferred with MIME type %s: "%s ".',
244 networkRequest.resourceType().title(), networkRequest.mimeType, ne tworkRequest.url), 244 networkRequest.resourceType().title(), networkRequest.mimeType, ne tworkRequest.url),
245 WebInspector.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest. requestId)); 245 SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId ));
246 } 246 }
247 247
248 if (response.securityDetails) 248 if (response.securityDetails)
249 networkRequest.setSecurityDetails(response.securityDetails); 249 networkRequest.setSecurityDetails(response.securityDetails);
250 } 250 }
251 251
252 /** 252 /**
253 * @param {!WebInspector.NetworkRequest} networkRequest 253 * @param {!SDK.NetworkRequest} networkRequest
254 * @return {boolean} 254 * @return {boolean}
255 */ 255 */
256 _mimeTypeIsConsistentWithType(networkRequest) { 256 _mimeTypeIsConsistentWithType(networkRequest) {
257 // If status is an error, content is likely to be of an inconsistent type, 257 // If status is an error, content is likely to be of an inconsistent type,
258 // as it's going to be an error message. We do not want to emit a warning 258 // as it's going to be an error message. We do not want to emit a warning
259 // for this, though, as this will already be reported as resource loading fa ilure. 259 // for this, though, as this will already be reported as resource loading fa ilure.
260 // Also, if a URL like http://localhost/wiki/load.php?debug=true&lang=en pro duces text/css and gets reloaded, 260 // Also, if a URL like http://localhost/wiki/load.php?debug=true&lang=en pro duces text/css and gets reloaded,
261 // it is 304 Not Modified and its guessed mime-type is text/php, which is wr ong. 261 // it is 304 Not Modified and its guessed mime-type is text/php, which is wr ong.
262 // Don't check for mime-types in 304-resources. 262 // Don't check for mime-types in 304-resources.
263 if (networkRequest.hasErrorStatusCode() || networkRequest.statusCode === 304 || networkRequest.statusCode === 204) 263 if (networkRequest.hasErrorStatusCode() || networkRequest.statusCode === 304 || networkRequest.statusCode === 204)
264 return true; 264 return true;
265 265
266 var resourceType = networkRequest.resourceType(); 266 var resourceType = networkRequest.resourceType();
267 if (resourceType !== WebInspector.resourceTypes.Stylesheet && 267 if (resourceType !== Common.resourceTypes.Stylesheet &&
268 resourceType !== WebInspector.resourceTypes.Document && resourceType !== WebInspector.resourceTypes.TextTrack) { 268 resourceType !== Common.resourceTypes.Document && resourceType !== Commo n.resourceTypes.TextTrack) {
269 return true; 269 return true;
270 } 270 }
271 271
272 if (!networkRequest.mimeType) 272 if (!networkRequest.mimeType)
273 return true; // Might be not known for cached resources with null respons es. 273 return true; // Might be not known for cached resources with null respons es.
274 274
275 if (networkRequest.mimeType in WebInspector.NetworkManager._MIMETypes) 275 if (networkRequest.mimeType in SDK.NetworkManager._MIMETypes)
276 return resourceType.name() in WebInspector.NetworkManager._MIMETypes[netwo rkRequest.mimeType]; 276 return resourceType.name() in SDK.NetworkManager._MIMETypes[networkRequest .mimeType];
277 277
278 return false; 278 return false;
279 } 279 }
280 280
281 /** 281 /**
282 * @override 282 * @override
283 * @param {!Protocol.Network.RequestId} requestId 283 * @param {!Protocol.Network.RequestId} requestId
284 * @param {!Protocol.Network.ResourcePriority} newPriority 284 * @param {!Protocol.Network.ResourcePriority} newPriority
285 * @param {!Protocol.Network.Timestamp} timestamp 285 * @param {!Protocol.Network.Timestamp} timestamp
286 */ 286 */
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // FIXME: move this check to the backend. 319 // FIXME: move this check to the backend.
320 if (!redirectResponse) 320 if (!redirectResponse)
321 return; 321 return;
322 this.responseReceived(requestId, frameId, loaderId, time, Protocol.Page.Re sourceType.Other, redirectResponse); 322 this.responseReceived(requestId, frameId, loaderId, time, Protocol.Page.Re sourceType.Other, redirectResponse);
323 networkRequest = this._appendRedirect(requestId, time, request.url); 323 networkRequest = this._appendRedirect(requestId, time, request.url);
324 } else 324 } else
325 networkRequest = this._createNetworkRequest(requestId, frameId, loaderId, request.url, documentURL, initiator); 325 networkRequest = this._createNetworkRequest(requestId, frameId, loaderId, request.url, documentURL, initiator);
326 networkRequest.hasNetworkData = true; 326 networkRequest.hasNetworkData = true;
327 this._updateNetworkRequestWithRequest(networkRequest, request); 327 this._updateNetworkRequestWithRequest(networkRequest, request);
328 networkRequest.setIssueTime(time, wallTime); 328 networkRequest.setIssueTime(time, wallTime);
329 networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]); 329 networkRequest.setResourceType(Common.resourceTypes[resourceType]);
330 330
331 this._startNetworkRequest(networkRequest); 331 this._startNetworkRequest(networkRequest);
332 } 332 }
333 333
334 /** 334 /**
335 * @override 335 * @override
336 * @param {!Protocol.Network.RequestId} requestId 336 * @param {!Protocol.Network.RequestId} requestId
337 */ 337 */
338 requestServedFromCache(requestId) { 338 requestServedFromCache(requestId) {
339 var networkRequest = this._inflightRequestsById[requestId]; 339 var networkRequest = this._inflightRequestsById[requestId];
(...skipping 17 matching lines...) Expand all
357 if (!networkRequest) { 357 if (!networkRequest) {
358 // We missed the requestWillBeSent. 358 // We missed the requestWillBeSent.
359 var eventData = {}; 359 var eventData = {};
360 eventData.url = response.url; 360 eventData.url = response.url;
361 eventData.frameId = frameId; 361 eventData.frameId = frameId;
362 eventData.loaderId = loaderId; 362 eventData.loaderId = loaderId;
363 eventData.resourceType = resourceType; 363 eventData.resourceType = resourceType;
364 eventData.mimeType = response.mimeType; 364 eventData.mimeType = response.mimeType;
365 var lastModifiedHeader = response.headers['last-modified']; 365 var lastModifiedHeader = response.headers['last-modified'];
366 eventData.lastModified = lastModifiedHeader ? new Date(lastModifiedHeader) : null; 366 eventData.lastModified = lastModifiedHeader ? new Date(lastModifiedHeader) : null;
367 this._manager.dispatchEventToListeners(WebInspector.NetworkManager.Events. RequestUpdateDropped, eventData); 367 this._manager.dispatchEventToListeners(SDK.NetworkManager.Events.RequestUp dateDropped, eventData);
368 return; 368 return;
369 } 369 }
370 370
371 networkRequest.responseReceivedTime = time; 371 networkRequest.responseReceivedTime = time;
372 networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]); 372 networkRequest.setResourceType(Common.resourceTypes[resourceType]);
373 373
374 this._updateNetworkRequestWithResponse(networkRequest, response); 374 this._updateNetworkRequestWithResponse(networkRequest, response);
375 375
376 this._updateNetworkRequest(networkRequest); 376 this._updateNetworkRequest(networkRequest);
377 this._manager.dispatchEventToListeners(WebInspector.NetworkManager.Events.Re sponseReceived, networkRequest); 377 this._manager.dispatchEventToListeners(SDK.NetworkManager.Events.ResponseRec eived, networkRequest);
378 } 378 }
379 379
380 /** 380 /**
381 * @override 381 * @override
382 * @param {!Protocol.Network.RequestId} requestId 382 * @param {!Protocol.Network.RequestId} requestId
383 * @param {!Protocol.Network.Timestamp} time 383 * @param {!Protocol.Network.Timestamp} time
384 * @param {number} dataLength 384 * @param {number} dataLength
385 * @param {number} encodedDataLength 385 * @param {number} encodedDataLength
386 */ 386 */
387 dataReceived(requestId, time, dataLength, encodedDataLength) { 387 dataReceived(requestId, time, dataLength, encodedDataLength) {
(...skipping 30 matching lines...) Expand all
418 * @param {string} localizedDescription 418 * @param {string} localizedDescription
419 * @param {boolean=} canceled 419 * @param {boolean=} canceled
420 * @param {!Protocol.Network.BlockedReason=} blockedReason 420 * @param {!Protocol.Network.BlockedReason=} blockedReason
421 */ 421 */
422 loadingFailed(requestId, time, resourceType, localizedDescription, canceled, b lockedReason) { 422 loadingFailed(requestId, time, resourceType, localizedDescription, canceled, b lockedReason) {
423 var networkRequest = this._inflightRequestsById[requestId]; 423 var networkRequest = this._inflightRequestsById[requestId];
424 if (!networkRequest) 424 if (!networkRequest)
425 return; 425 return;
426 426
427 networkRequest.failed = true; 427 networkRequest.failed = true;
428 networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]); 428 networkRequest.setResourceType(Common.resourceTypes[resourceType]);
429 networkRequest.canceled = canceled; 429 networkRequest.canceled = canceled;
430 if (blockedReason) { 430 if (blockedReason) {
431 networkRequest.setBlockedReason(blockedReason); 431 networkRequest.setBlockedReason(blockedReason);
432 if (blockedReason === Protocol.Network.BlockedReason.Inspector) { 432 if (blockedReason === Protocol.Network.BlockedReason.Inspector) {
433 var consoleModel = this._manager._target.consoleModel; 433 var consoleModel = this._manager._target.consoleModel;
434 consoleModel.addMessage(new WebInspector.ConsoleMessage( 434 consoleModel.addMessage(new SDK.ConsoleMessage(
435 consoleModel.target(), WebInspector.ConsoleMessage.MessageSource.Net work, 435 consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network,
436 WebInspector.ConsoleMessage.MessageLevel.Warning, 436 SDK.ConsoleMessage.MessageLevel.Warning,
437 WebInspector.UIString('Request was blocked by DevTools: "%s".', netw orkRequest.url), 437 Common.UIString('Request was blocked by DevTools: "%s".', networkReq uest.url),
438 WebInspector.ConsoleMessage.MessageType.Log, '', 0, 0, networkReques t.requestId)); 438 SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.request Id));
439 } 439 }
440 } 440 }
441 networkRequest.localizedFailDescription = localizedDescription; 441 networkRequest.localizedFailDescription = localizedDescription;
442 this._finishNetworkRequest(networkRequest, time, -1); 442 this._finishNetworkRequest(networkRequest, time, -1);
443 } 443 }
444 444
445 /** 445 /**
446 * @override 446 * @override
447 * @param {!Protocol.Network.RequestId} requestId 447 * @param {!Protocol.Network.RequestId} requestId
448 * @param {string} requestURL 448 * @param {string} requestURL
449 * @param {!Protocol.Network.Initiator=} initiator 449 * @param {!Protocol.Network.Initiator=} initiator
450 */ 450 */
451 webSocketCreated(requestId, requestURL, initiator) { 451 webSocketCreated(requestId, requestURL, initiator) {
452 var networkRequest = 452 var networkRequest =
453 new WebInspector.NetworkRequest(this._manager._target, requestId, reques tURL, '', '', '', initiator || null); 453 new SDK.NetworkRequest(this._manager._target, requestId, requestURL, '', '', '', initiator || null);
454 networkRequest.setResourceType(WebInspector.resourceTypes.WebSocket); 454 networkRequest.setResourceType(Common.resourceTypes.WebSocket);
455 this._startNetworkRequest(networkRequest); 455 this._startNetworkRequest(networkRequest);
456 } 456 }
457 457
458 /** 458 /**
459 * @override 459 * @override
460 * @param {!Protocol.Network.RequestId} requestId 460 * @param {!Protocol.Network.RequestId} requestId
461 * @param {!Protocol.Network.Timestamp} time 461 * @param {!Protocol.Network.Timestamp} time
462 * @param {!Protocol.Network.Timestamp} wallTime 462 * @param {!Protocol.Network.Timestamp} wallTime
463 * @param {!Protocol.Network.WebSocketRequest} request 463 * @param {!Protocol.Network.WebSocketRequest} request
464 */ 464 */
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 var networkRequest = this._inflightRequestsById[requestId]; 574 var networkRequest = this._inflightRequestsById[requestId];
575 if (!networkRequest) 575 if (!networkRequest)
576 return; 576 return;
577 networkRequest.addEventSourceMessage(time, eventName, eventId, data); 577 networkRequest.addEventSourceMessage(time, eventName, eventId, data);
578 } 578 }
579 579
580 /** 580 /**
581 * @param {!Protocol.Network.RequestId} requestId 581 * @param {!Protocol.Network.RequestId} requestId
582 * @param {!Protocol.Network.Timestamp} time 582 * @param {!Protocol.Network.Timestamp} time
583 * @param {string} redirectURL 583 * @param {string} redirectURL
584 * @return {!WebInspector.NetworkRequest} 584 * @return {!SDK.NetworkRequest}
585 */ 585 */
586 _appendRedirect(requestId, time, redirectURL) { 586 _appendRedirect(requestId, time, redirectURL) {
587 var originalNetworkRequest = this._inflightRequestsById[requestId]; 587 var originalNetworkRequest = this._inflightRequestsById[requestId];
588 var previousRedirects = originalNetworkRequest.redirects || []; 588 var previousRedirects = originalNetworkRequest.redirects || [];
589 originalNetworkRequest.requestId = requestId + ':redirected.' + previousRedi rects.length; 589 originalNetworkRequest.requestId = requestId + ':redirected.' + previousRedi rects.length;
590 delete originalNetworkRequest.redirects; 590 delete originalNetworkRequest.redirects;
591 if (previousRedirects.length > 0) 591 if (previousRedirects.length > 0)
592 originalNetworkRequest.redirectSource = previousRedirects[previousRedirect s.length - 1]; 592 originalNetworkRequest.redirectSource = previousRedirects[previousRedirect s.length - 1];
593 this._finishNetworkRequest(originalNetworkRequest, time, -1); 593 this._finishNetworkRequest(originalNetworkRequest, time, -1);
594 var newNetworkRequest = this._createNetworkRequest( 594 var newNetworkRequest = this._createNetworkRequest(
595 requestId, originalNetworkRequest.frameId, originalNetworkRequest.loader Id, redirectURL, 595 requestId, originalNetworkRequest.frameId, originalNetworkRequest.loader Id, redirectURL,
596 originalNetworkRequest.documentURL, originalNetworkRequest.initiator()); 596 originalNetworkRequest.documentURL, originalNetworkRequest.initiator());
597 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkReques t); 597 newNetworkRequest.redirects = previousRedirects.concat(originalNetworkReques t);
598 return newNetworkRequest; 598 return newNetworkRequest;
599 } 599 }
600 600
601 /** 601 /**
602 * @param {!WebInspector.NetworkRequest} networkRequest 602 * @param {!SDK.NetworkRequest} networkRequest
603 */ 603 */
604 _startNetworkRequest(networkRequest) { 604 _startNetworkRequest(networkRequest) {
605 this._inflightRequestsById[networkRequest.requestId] = networkRequest; 605 this._inflightRequestsById[networkRequest.requestId] = networkRequest;
606 this._inflightRequestsByURL[networkRequest.url] = networkRequest; 606 this._inflightRequestsByURL[networkRequest.url] = networkRequest;
607 this._dispatchEventToListeners(WebInspector.NetworkManager.Events.RequestSta rted, networkRequest); 607 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestStarted, net workRequest);
608 } 608 }
609 609
610 /** 610 /**
611 * @param {!WebInspector.NetworkRequest} networkRequest 611 * @param {!SDK.NetworkRequest} networkRequest
612 */ 612 */
613 _updateNetworkRequest(networkRequest) { 613 _updateNetworkRequest(networkRequest) {
614 this._dispatchEventToListeners(WebInspector.NetworkManager.Events.RequestUpd ated, networkRequest); 614 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestUpdated, net workRequest);
615 } 615 }
616 616
617 /** 617 /**
618 * @param {!WebInspector.NetworkRequest} networkRequest 618 * @param {!SDK.NetworkRequest} networkRequest
619 * @param {!Protocol.Network.Timestamp} finishTime 619 * @param {!Protocol.Network.Timestamp} finishTime
620 * @param {number} encodedDataLength 620 * @param {number} encodedDataLength
621 */ 621 */
622 _finishNetworkRequest(networkRequest, finishTime, encodedDataLength) { 622 _finishNetworkRequest(networkRequest, finishTime, encodedDataLength) {
623 networkRequest.endTime = finishTime; 623 networkRequest.endTime = finishTime;
624 networkRequest.finished = true; 624 networkRequest.finished = true;
625 if (encodedDataLength >= 0) 625 if (encodedDataLength >= 0)
626 networkRequest.setTransferSize(encodedDataLength); 626 networkRequest.setTransferSize(encodedDataLength);
627 this._dispatchEventToListeners(WebInspector.NetworkManager.Events.RequestFin ished, networkRequest); 627 this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestFinished, ne tworkRequest);
628 delete this._inflightRequestsById[networkRequest.requestId]; 628 delete this._inflightRequestsById[networkRequest.requestId];
629 delete this._inflightRequestsByURL[networkRequest.url]; 629 delete this._inflightRequestsByURL[networkRequest.url];
630 } 630 }
631 631
632 /** 632 /**
633 * @param {string} eventType 633 * @param {string} eventType
634 * @param {!WebInspector.NetworkRequest} networkRequest 634 * @param {!SDK.NetworkRequest} networkRequest
635 */ 635 */
636 _dispatchEventToListeners(eventType, networkRequest) { 636 _dispatchEventToListeners(eventType, networkRequest) {
637 this._manager.dispatchEventToListeners(eventType, networkRequest); 637 this._manager.dispatchEventToListeners(eventType, networkRequest);
638 } 638 }
639 639
640 /** 640 /**
641 * @param {!Protocol.Network.RequestId} requestId 641 * @param {!Protocol.Network.RequestId} requestId
642 * @param {string} frameId 642 * @param {string} frameId
643 * @param {!Protocol.Network.LoaderId} loaderId 643 * @param {!Protocol.Network.LoaderId} loaderId
644 * @param {string} url 644 * @param {string} url
645 * @param {string} documentURL 645 * @param {string} documentURL
646 * @param {?Protocol.Network.Initiator} initiator 646 * @param {?Protocol.Network.Initiator} initiator
647 */ 647 */
648 _createNetworkRequest(requestId, frameId, loaderId, url, documentURL, initiato r) { 648 _createNetworkRequest(requestId, frameId, loaderId, url, documentURL, initiato r) {
649 return new WebInspector.NetworkRequest( 649 return new SDK.NetworkRequest(
650 this._manager._target, requestId, url, documentURL, frameId, loaderId, i nitiator); 650 this._manager._target, requestId, url, documentURL, frameId, loaderId, i nitiator);
651 } 651 }
652 }; 652 };
653 653
654 /** 654 /**
655 * @implements {WebInspector.TargetManager.Observer} 655 * @implements {SDK.TargetManager.Observer}
656 * @unrestricted 656 * @unrestricted
657 */ 657 */
658 WebInspector.MultitargetNetworkManager = class extends WebInspector.Object { 658 SDK.MultitargetNetworkManager = class extends Common.Object {
659 constructor() { 659 constructor() {
660 super(); 660 super();
661 661
662 /** @type {!Set<string>} */ 662 /** @type {!Set<string>} */
663 this._blockedURLs = new Set(); 663 this._blockedURLs = new Set();
664 this._blockedSetting = WebInspector.moduleSetting('blockedURLs'); 664 this._blockedSetting = Common.moduleSetting('blockedURLs');
665 this._blockedSetting.addChangeListener(this._updateBlockedURLs, this); 665 this._blockedSetting.addChangeListener(this._updateBlockedURLs, this);
666 this._blockedSetting.set([]); 666 this._blockedSetting.set([]);
667 this._updateBlockedURLs(); 667 this._updateBlockedURLs();
668 668
669 this._userAgentOverride = ''; 669 this._userAgentOverride = '';
670 /** @type {!Set<!Protocol.NetworkAgent>} */ 670 /** @type {!Set<!Protocol.NetworkAgent>} */
671 this._agents = new Set(); 671 this._agents = new Set();
672 /** @type {!WebInspector.NetworkManager.Conditions} */ 672 /** @type {!SDK.NetworkManager.Conditions} */
673 this._networkConditions = WebInspector.NetworkManager.NoThrottlingConditions ; 673 this._networkConditions = SDK.NetworkManager.NoThrottlingConditions;
674 674
675 WebInspector.targetManager.observeTargets(this, WebInspector.Target.Capabili ty.Network); 675 SDK.targetManager.observeTargets(this, SDK.Target.Capability.Network);
676 } 676 }
677 677
678 /** 678 /**
679 * @param {string} uaString 679 * @param {string} uaString
680 * @return {string} 680 * @return {string}
681 */ 681 */
682 static patchUserAgentWithChromeVersion(uaString) { 682 static patchUserAgentWithChromeVersion(uaString) {
683 // Patches Chrome/CriOS version from user agent ("1.2.3.4" when user agent i s: "Chrome/1.2.3.4"). 683 // Patches Chrome/CriOS version from user agent ("1.2.3.4" when user agent i s: "Chrome/1.2.3.4").
684 var chromeRegex = new RegExp('(?:^|\\W)Chrome/(\\S+)'); 684 var chromeRegex = new RegExp('(?:^|\\W)Chrome/(\\S+)');
685 var chromeMatch = navigator.userAgent.match(chromeRegex); 685 var chromeMatch = navigator.userAgent.match(chromeRegex);
686 if (chromeMatch && chromeMatch.length > 1) 686 if (chromeMatch && chromeMatch.length > 1)
687 return String.sprintf(uaString, chromeMatch[1]); 687 return String.sprintf(uaString, chromeMatch[1]);
688 return uaString; 688 return uaString;
689 } 689 }
690 690
691 /** 691 /**
692 * @override 692 * @override
693 * @param {!WebInspector.Target} target 693 * @param {!SDK.Target} target
694 */ 694 */
695 targetAdded(target) { 695 targetAdded(target) {
696 var networkAgent = target.networkAgent(); 696 var networkAgent = target.networkAgent();
697 if (this._extraHeaders) 697 if (this._extraHeaders)
698 networkAgent.setExtraHTTPHeaders(this._extraHeaders); 698 networkAgent.setExtraHTTPHeaders(this._extraHeaders);
699 if (this._currentUserAgent()) 699 if (this._currentUserAgent())
700 networkAgent.setUserAgentOverride(this._currentUserAgent()); 700 networkAgent.setUserAgentOverride(this._currentUserAgent());
701 for (var url of this._blockedURLs) 701 for (var url of this._blockedURLs)
702 networkAgent.addBlockedURL(url); 702 networkAgent.addBlockedURL(url);
703 this._agents.add(networkAgent); 703 this._agents.add(networkAgent);
704 if (this.isThrottling()) 704 if (this.isThrottling())
705 this._updateNetworkConditions(networkAgent); 705 this._updateNetworkConditions(networkAgent);
706 } 706 }
707 707
708 /** 708 /**
709 * @override 709 * @override
710 * @param {!WebInspector.Target} target 710 * @param {!SDK.Target} target
711 */ 711 */
712 targetRemoved(target) { 712 targetRemoved(target) {
713 this._agents.delete(target.networkAgent()); 713 this._agents.delete(target.networkAgent());
714 } 714 }
715 715
716 /** 716 /**
717 * @return {boolean} 717 * @return {boolean}
718 */ 718 */
719 isThrottling() { 719 isThrottling() {
720 return this._networkConditions.download >= 0 || this._networkConditions.uplo ad >= 0 || 720 return this._networkConditions.download >= 0 || this._networkConditions.uplo ad >= 0 ||
721 this._networkConditions.latency > 0; 721 this._networkConditions.latency > 0;
722 } 722 }
723 723
724 /** 724 /**
725 * @return {boolean} 725 * @return {boolean}
726 */ 726 */
727 isOffline() { 727 isOffline() {
728 return !this._networkConditions.download && !this._networkConditions.upload; 728 return !this._networkConditions.download && !this._networkConditions.upload;
729 } 729 }
730 730
731 /** 731 /**
732 * @param {!WebInspector.NetworkManager.Conditions} conditions 732 * @param {!SDK.NetworkManager.Conditions} conditions
733 */ 733 */
734 setNetworkConditions(conditions) { 734 setNetworkConditions(conditions) {
735 this._networkConditions = conditions; 735 this._networkConditions = conditions;
736 for (var agent of this._agents) 736 for (var agent of this._agents)
737 this._updateNetworkConditions(agent); 737 this._updateNetworkConditions(agent);
738 this.dispatchEventToListeners(WebInspector.MultitargetNetworkManager.Events. ConditionsChanged); 738 this.dispatchEventToListeners(SDK.MultitargetNetworkManager.Events.Condition sChanged);
739 } 739 }
740 740
741 /** 741 /**
742 * @return {!WebInspector.NetworkManager.Conditions} 742 * @return {!SDK.NetworkManager.Conditions}
743 */ 743 */
744 networkConditions() { 744 networkConditions() {
745 return this._networkConditions; 745 return this._networkConditions;
746 } 746 }
747 747
748 /** 748 /**
749 * @param {!Protocol.NetworkAgent} networkAgent 749 * @param {!Protocol.NetworkAgent} networkAgent
750 */ 750 */
751 _updateNetworkConditions(networkAgent) { 751 _updateNetworkConditions(networkAgent) {
752 var conditions = this._networkConditions; 752 var conditions = this._networkConditions;
753 if (!this.isThrottling()) { 753 if (!this.isThrottling()) {
754 networkAgent.emulateNetworkConditions(false, 0, 0, 0); 754 networkAgent.emulateNetworkConditions(false, 0, 0, 0);
755 } else { 755 } else {
756 networkAgent.emulateNetworkConditions( 756 networkAgent.emulateNetworkConditions(
757 this.isOffline(), conditions.latency, conditions.download < 0 ? 0 : co nditions.download, 757 this.isOffline(), conditions.latency, conditions.download < 0 ? 0 : co nditions.download,
758 conditions.upload < 0 ? 0 : conditions.upload, WebInspector.NetworkMan ager._connectionType(conditions)); 758 conditions.upload < 0 ? 0 : conditions.upload, SDK.NetworkManager._con nectionType(conditions));
759 } 759 }
760 } 760 }
761 761
762 /** 762 /**
763 * @param {!Protocol.Network.Headers} headers 763 * @param {!Protocol.Network.Headers} headers
764 */ 764 */
765 setExtraHTTPHeaders(headers) { 765 setExtraHTTPHeaders(headers) {
766 this._extraHeaders = headers; 766 this._extraHeaders = headers;
767 for (var agent of this._agents) 767 for (var agent of this._agents)
768 agent.setExtraHTTPHeaders(this._extraHeaders); 768 agent.setExtraHTTPHeaders(this._extraHeaders);
769 } 769 }
770 770
771 /** 771 /**
772 * @return {string} 772 * @return {string}
773 */ 773 */
774 _currentUserAgent() { 774 _currentUserAgent() {
775 return this._customUserAgent ? this._customUserAgent : this._userAgentOverri de; 775 return this._customUserAgent ? this._customUserAgent : this._userAgentOverri de;
776 } 776 }
777 777
778 _updateUserAgentOverride() { 778 _updateUserAgentOverride() {
779 var userAgent = this._currentUserAgent(); 779 var userAgent = this._currentUserAgent();
780 WebInspector.ResourceLoader.targetUserAgent = userAgent; 780 Host.ResourceLoader.targetUserAgent = userAgent;
781 for (var agent of this._agents) 781 for (var agent of this._agents)
782 agent.setUserAgentOverride(userAgent); 782 agent.setUserAgentOverride(userAgent);
783 } 783 }
784 784
785 /** 785 /**
786 * @param {string} userAgent 786 * @param {string} userAgent
787 */ 787 */
788 setUserAgentOverride(userAgent) { 788 setUserAgentOverride(userAgent) {
789 if (this._userAgentOverride === userAgent) 789 if (this._userAgentOverride === userAgent)
790 return; 790 return;
791 this._userAgentOverride = userAgent; 791 this._userAgentOverride = userAgent;
792 if (!this._customUserAgent) 792 if (!this._customUserAgent)
793 this._updateUserAgentOverride(); 793 this._updateUserAgentOverride();
794 this.dispatchEventToListeners(WebInspector.MultitargetNetworkManager.Events. UserAgentChanged); 794 this.dispatchEventToListeners(SDK.MultitargetNetworkManager.Events.UserAgent Changed);
795 } 795 }
796 796
797 /** 797 /**
798 * @return {string} 798 * @return {string}
799 */ 799 */
800 userAgentOverride() { 800 userAgentOverride() {
801 return this._userAgentOverride; 801 return this._userAgentOverride;
802 } 802 }
803 803
804 /** 804 /**
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 clearBrowserCookies() { 847 clearBrowserCookies() {
848 for (var agent of this._agents) 848 for (var agent of this._agents)
849 agent.clearBrowserCookies(); 849 agent.clearBrowserCookies();
850 } 850 }
851 851
852 /** 852 /**
853 * @param {string} origin 853 * @param {string} origin
854 * @param {function(!Array<string>)} callback 854 * @param {function(!Array<string>)} callback
855 */ 855 */
856 getCertificate(origin, callback) { 856 getCertificate(origin, callback) {
857 var target = WebInspector.targetManager.mainTarget(); 857 var target = SDK.targetManager.mainTarget();
858 target.networkAgent().getCertificate(origin, mycallback); 858 target.networkAgent().getCertificate(origin, mycallback);
859 859
860 /** 860 /**
861 * @param {?Protocol.Error} error 861 * @param {?Protocol.Error} error
862 * @param {!Array<string>} certificate 862 * @param {!Array<string>} certificate
863 */ 863 */
864 function mycallback(error, certificate) { 864 function mycallback(error, certificate) {
865 callback(error ? [] : certificate); 865 callback(error ? [] : certificate);
866 } 866 }
867 } 867 }
868 868
869 /** 869 /**
870 * @param {string} url 870 * @param {string} url
871 * @param {function(number, !Object.<string, string>, string)} callback 871 * @param {function(number, !Object.<string, string>, string)} callback
872 */ 872 */
873 loadResource(url, callback) { 873 loadResource(url, callback) {
874 var headers = {}; 874 var headers = {};
875 875
876 var currentUserAgent = this._currentUserAgent(); 876 var currentUserAgent = this._currentUserAgent();
877 if (currentUserAgent) 877 if (currentUserAgent)
878 headers['User-Agent'] = currentUserAgent; 878 headers['User-Agent'] = currentUserAgent;
879 879
880 if (WebInspector.moduleSetting('cacheDisabled').get()) 880 if (Common.moduleSetting('cacheDisabled').get())
881 headers['Cache-Control'] = 'no-cache'; 881 headers['Cache-Control'] = 'no-cache';
882 882
883 WebInspector.ResourceLoader.load(url, headers, callback); 883 Host.ResourceLoader.load(url, headers, callback);
884 } 884 }
885 }; 885 };
886 886
887 /** @enum {symbol} */ 887 /** @enum {symbol} */
888 WebInspector.MultitargetNetworkManager.Events = { 888 SDK.MultitargetNetworkManager.Events = {
889 ConditionsChanged: Symbol('ConditionsChanged'), 889 ConditionsChanged: Symbol('ConditionsChanged'),
890 UserAgentChanged: Symbol('UserAgentChanged') 890 UserAgentChanged: Symbol('UserAgentChanged')
891 }; 891 };
892 892
893 893
894 /** 894 /**
895 * @type {!WebInspector.MultitargetNetworkManager} 895 * @type {!SDK.MultitargetNetworkManager}
896 */ 896 */
897 WebInspector.multitargetNetworkManager; 897 SDK.multitargetNetworkManager;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698