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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.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) 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 10 matching lines...) Expand all
21 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 21 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 /** 30 /**
31 * @implements {WebInspector.Searchable} 31 * @implements {UI.Searchable}
32 * @implements {WebInspector.TargetManager.Observer} 32 * @implements {SDK.TargetManager.Observer}
33 * @unrestricted 33 * @unrestricted
34 */ 34 */
35 WebInspector.NetworkLogView = class extends WebInspector.VBox { 35 Network.NetworkLogView = class extends UI.VBox {
36 /** 36 /**
37 * @param {!WebInspector.FilterBar} filterBar 37 * @param {!UI.FilterBar} filterBar
38 * @param {!Element} progressBarContainer 38 * @param {!Element} progressBarContainer
39 * @param {!WebInspector.Setting} networkLogLargeRowsSetting 39 * @param {!Common.Setting} networkLogLargeRowsSetting
40 */ 40 */
41 constructor(filterBar, progressBarContainer, networkLogLargeRowsSetting) { 41 constructor(filterBar, progressBarContainer, networkLogLargeRowsSetting) {
42 super(); 42 super();
43 this.setMinimumSize(50, 64); 43 this.setMinimumSize(50, 64);
44 this.registerRequiredCSS('network/networkLogView.css'); 44 this.registerRequiredCSS('network/networkLogView.css');
45 45
46 this._networkHideDataURLSetting = WebInspector.settings.createSetting('netwo rkHideDataURL', false); 46 this._networkHideDataURLSetting = Common.settings.createSetting('networkHide DataURL', false);
47 this._networkResourceTypeFiltersSetting = WebInspector.settings.createSettin g('networkResourceTypeFilters', {}); 47 this._networkResourceTypeFiltersSetting = Common.settings.createSetting('net workResourceTypeFilters', {});
48 this._networkShowPrimaryLoadWaterfallSetting = 48 this._networkShowPrimaryLoadWaterfallSetting =
49 WebInspector.settings.createSetting('networkShowPrimaryLoadWaterfall', f alse); 49 Common.settings.createSetting('networkShowPrimaryLoadWaterfall', false);
50 50
51 this._filterBar = filterBar; 51 this._filterBar = filterBar;
52 this._progressBarContainer = progressBarContainer; 52 this._progressBarContainer = progressBarContainer;
53 this._networkLogLargeRowsSetting = networkLogLargeRowsSetting; 53 this._networkLogLargeRowsSetting = networkLogLargeRowsSetting;
54 this._networkLogLargeRowsSetting.addChangeListener(updateRowHeight.bind(this ), this); 54 this._networkLogLargeRowsSetting.addChangeListener(updateRowHeight.bind(this ), this);
55 55
56 /** @type {!WebInspector.NetworkTransferTimeCalculator} */ 56 /** @type {!Network.NetworkTransferTimeCalculator} */
57 this._timeCalculator = new WebInspector.NetworkTransferTimeCalculator(); 57 this._timeCalculator = new Network.NetworkTransferTimeCalculator();
58 /** @type {!WebInspector.NetworkTransferDurationCalculator} */ 58 /** @type {!Network.NetworkTransferDurationCalculator} */
59 this._durationCalculator = new WebInspector.NetworkTransferDurationCalculato r(); 59 this._durationCalculator = new Network.NetworkTransferDurationCalculator();
60 this._calculator = this._timeCalculator; 60 this._calculator = this._timeCalculator;
61 61
62 /** 62 /**
63 * @this {WebInspector.NetworkLogView} 63 * @this {Network.NetworkLogView}
64 */ 64 */
65 function updateRowHeight() { 65 function updateRowHeight() {
66 /** @type {number} */ 66 /** @type {number} */
67 this._rowHeight = !!this._networkLogLargeRowsSetting.get() ? 41 : 21; 67 this._rowHeight = !!this._networkLogLargeRowsSetting.get() ? 41 : 21;
68 } 68 }
69 updateRowHeight.call(this); 69 updateRowHeight.call(this);
70 70
71 this._columns = new WebInspector.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, !WebInspector.NetworkDataGridNode>} */ 74 /** @type {!Map.<string, !Network.NetworkDataGridNode>} */
75 this._nodesByRequestId = new Map(); 75 this._nodesByRequestId = new Map();
76 /** @type {!Object.<string, boolean>} */ 76 /** @type {!Object.<string, boolean>} */
77 this._staleRequestIds = {}; 77 this._staleRequestIds = {};
78 /** @type {number} */ 78 /** @type {number} */
79 this._mainRequestLoadTime = -1; 79 this._mainRequestLoadTime = -1;
80 /** @type {number} */ 80 /** @type {number} */
81 this._mainRequestDOMContentLoadedTime = -1; 81 this._mainRequestDOMContentLoadedTime = -1;
82 this._matchedRequestCount = 0; 82 this._matchedRequestCount = 0;
83 this._highlightedSubstringChanges = []; 83 this._highlightedSubstringChanges = [];
84 84
85 /** @type {!Array.<!WebInspector.NetworkLogView.Filter>} */ 85 /** @type {!Array.<!Network.NetworkLogView.Filter>} */
86 this._filters = []; 86 this._filters = [];
87 /** @type {?WebInspector.NetworkLogView.Filter} */ 87 /** @type {?Network.NetworkLogView.Filter} */
88 this._timeFilter = null; 88 this._timeFilter = null;
89 89
90 this._currentMatchedRequestNode = null; 90 this._currentMatchedRequestNode = null;
91 this._currentMatchedRequestIndex = -1; 91 this._currentMatchedRequestIndex = -1;
92 92
93 /** @type {!WebInspector.Linkifier} */ 93 /** @type {!Components.Linkifier} */
94 this.linkifier = new WebInspector.Linkifier(); 94 this.linkifier = new Components.Linkifier();
95 95
96 this._recording = false; 96 this._recording = false;
97 this._preserveLog = false; 97 this._preserveLog = false;
98 98
99 this._headerHeight = 0; 99 this._headerHeight = 0;
100 100
101 this._addFilters(); 101 this._addFilters();
102 this._resetSuggestionBuilder(); 102 this._resetSuggestionBuilder();
103 this._initializeView(); 103 this._initializeView();
104 104
105 WebInspector.moduleSetting('networkColorCodeResourceTypes').addChangeListene r(this._invalidateAllItems, this); 105 Common.moduleSetting('networkColorCodeResourceTypes').addChangeListener(this ._invalidateAllItems, this);
106 106
107 WebInspector.targetManager.observeTargets(this); 107 SDK.targetManager.observeTargets(this);
108 WebInspector.targetManager.addModelListener( 108 SDK.targetManager.addModelListener(
109 WebInspector.NetworkManager, WebInspector.NetworkManager.Events.RequestS tarted, this._onRequestStarted, this); 109 SDK.NetworkManager, SDK.NetworkManager.Events.RequestStarted, this._onRe questStarted, this);
110 WebInspector.targetManager.addModelListener( 110 SDK.targetManager.addModelListener(
111 WebInspector.NetworkManager, WebInspector.NetworkManager.Events.RequestU pdated, this._onRequestUpdated, this); 111 SDK.NetworkManager, SDK.NetworkManager.Events.RequestUpdated, this._onRe questUpdated, this);
112 WebInspector.targetManager.addModelListener( 112 SDK.targetManager.addModelListener(
113 WebInspector.NetworkManager, WebInspector.NetworkManager.Events.RequestF inished, this._onRequestUpdated, this); 113 SDK.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onR equestUpdated, this);
114 } 114 }
115 115
116 /** 116 /**
117 * @param {!WebInspector.NetworkLogView.Filter} filter 117 * @param {!Network.NetworkLogView.Filter} filter
118 * @param {!WebInspector.NetworkRequest} request 118 * @param {!SDK.NetworkRequest} request
119 * @return {boolean} 119 * @return {boolean}
120 */ 120 */
121 static _negativeFilter(filter, request) { 121 static _negativeFilter(filter, request) {
122 return !filter(request); 122 return !filter(request);
123 } 123 }
124 124
125 /** 125 /**
126 * @param {?RegExp} regex 126 * @param {?RegExp} regex
127 * @param {!WebInspector.NetworkRequest} request 127 * @param {!SDK.NetworkRequest} request
128 * @return {boolean} 128 * @return {boolean}
129 */ 129 */
130 static _requestPathFilter(regex, request) { 130 static _requestPathFilter(regex, request) {
131 if (!regex) 131 if (!regex)
132 return false; 132 return false;
133 133
134 return regex.test(request.path() + '/' + request.name()); 134 return regex.test(request.path() + '/' + request.name());
135 } 135 }
136 136
137 /** 137 /**
138 * @param {string} domain 138 * @param {string} domain
139 * @return {!Array.<string>} 139 * @return {!Array.<string>}
140 */ 140 */
141 static _subdomains(domain) { 141 static _subdomains(domain) {
142 var result = [domain]; 142 var result = [domain];
143 var indexOfPeriod = domain.indexOf('.'); 143 var indexOfPeriod = domain.indexOf('.');
144 while (indexOfPeriod !== -1) { 144 while (indexOfPeriod !== -1) {
145 result.push('*' + domain.substring(indexOfPeriod)); 145 result.push('*' + domain.substring(indexOfPeriod));
146 indexOfPeriod = domain.indexOf('.', indexOfPeriod + 1); 146 indexOfPeriod = domain.indexOf('.', indexOfPeriod + 1);
147 } 147 }
148 return result; 148 return result;
149 } 149 }
150 150
151 /** 151 /**
152 * @param {string} value 152 * @param {string} value
153 * @return {!WebInspector.NetworkLogView.Filter} 153 * @return {!Network.NetworkLogView.Filter}
154 */ 154 */
155 static _createRequestDomainFilter(value) { 155 static _createRequestDomainFilter(value) {
156 /** 156 /**
157 * @param {string} string 157 * @param {string} string
158 * @return {string} 158 * @return {string}
159 */ 159 */
160 function escapeForRegExp(string) { 160 function escapeForRegExp(string) {
161 return string.escapeForRegExp(); 161 return string.escapeForRegExp();
162 } 162 }
163 var escapedPattern = value.split('*').map(escapeForRegExp).join('.*'); 163 var escapedPattern = value.split('*').map(escapeForRegExp).join('.*');
164 return WebInspector.NetworkLogView._requestDomainFilter.bind(null, new RegEx p('^' + escapedPattern + '$', 'i')); 164 return Network.NetworkLogView._requestDomainFilter.bind(null, new RegExp('^' + escapedPattern + '$', 'i'));
165 } 165 }
166 166
167 /** 167 /**
168 * @param {!RegExp} regex 168 * @param {!RegExp} regex
169 * @param {!WebInspector.NetworkRequest} request 169 * @param {!SDK.NetworkRequest} request
170 * @return {boolean} 170 * @return {boolean}
171 */ 171 */
172 static _requestDomainFilter(regex, request) { 172 static _requestDomainFilter(regex, request) {
173 return regex.test(request.domain); 173 return regex.test(request.domain);
174 } 174 }
175 175
176 /** 176 /**
177 * @param {!WebInspector.NetworkRequest} request 177 * @param {!SDK.NetworkRequest} request
178 * @return {boolean} 178 * @return {boolean}
179 */ 179 */
180 static _runningRequestFilter(request) { 180 static _runningRequestFilter(request) {
181 return !request.finished; 181 return !request.finished;
182 } 182 }
183 183
184 /** 184 /**
185 * @param {string} value 185 * @param {string} value
186 * @param {!WebInspector.NetworkRequest} request 186 * @param {!SDK.NetworkRequest} request
187 * @return {boolean} 187 * @return {boolean}
188 */ 188 */
189 static _requestResponseHeaderFilter(value, request) { 189 static _requestResponseHeaderFilter(value, request) {
190 return request.responseHeaderValue(value) !== undefined; 190 return request.responseHeaderValue(value) !== undefined;
191 } 191 }
192 192
193 /** 193 /**
194 * @param {string} value 194 * @param {string} value
195 * @param {!WebInspector.NetworkRequest} request 195 * @param {!SDK.NetworkRequest} request
196 * @return {boolean} 196 * @return {boolean}
197 */ 197 */
198 static _requestMethodFilter(value, request) { 198 static _requestMethodFilter(value, request) {
199 return request.requestMethod === value; 199 return request.requestMethod === value;
200 } 200 }
201 201
202 /** 202 /**
203 * @param {string} value 203 * @param {string} value
204 * @param {!WebInspector.NetworkRequest} request 204 * @param {!SDK.NetworkRequest} request
205 * @return {boolean} 205 * @return {boolean}
206 */ 206 */
207 static _requestMimeTypeFilter(value, request) { 207 static _requestMimeTypeFilter(value, request) {
208 return request.mimeType === value; 208 return request.mimeType === value;
209 } 209 }
210 210
211 /** 211 /**
212 * @param {!WebInspector.NetworkLogView.MixedContentFilterValues} value 212 * @param {!Network.NetworkLogView.MixedContentFilterValues} value
213 * @param {!WebInspector.NetworkRequest} request 213 * @param {!SDK.NetworkRequest} request
214 * @return {boolean} 214 * @return {boolean}
215 */ 215 */
216 static _requestMixedContentFilter(value, request) { 216 static _requestMixedContentFilter(value, request) {
217 if (value === WebInspector.NetworkLogView.MixedContentFilterValues.Displayed ) { 217 if (value === Network.NetworkLogView.MixedContentFilterValues.Displayed) {
218 return request.mixedContentType === 'optionally-blockable'; 218 return request.mixedContentType === 'optionally-blockable';
219 } else if (value === WebInspector.NetworkLogView.MixedContentFilterValues.Bl ocked) { 219 } else if (value === Network.NetworkLogView.MixedContentFilterValues.Blocked ) {
220 return request.mixedContentType === 'blockable' && request.wasBlocked(); 220 return request.mixedContentType === 'blockable' && request.wasBlocked();
221 } else if (value === WebInspector.NetworkLogView.MixedContentFilterValues.Bl ockOverridden) { 221 } else if (value === Network.NetworkLogView.MixedContentFilterValues.BlockOv erridden) {
222 return request.mixedContentType === 'blockable' && !request.wasBlocked(); 222 return request.mixedContentType === 'blockable' && !request.wasBlocked();
223 } else if (value === WebInspector.NetworkLogView.MixedContentFilterValues.Al l) { 223 } else if (value === Network.NetworkLogView.MixedContentFilterValues.All) {
224 return request.mixedContentType !== 'none'; 224 return request.mixedContentType !== 'none';
225 } 225 }
226 return false; 226 return false;
227 } 227 }
228 228
229 /** 229 /**
230 * @param {string} value 230 * @param {string} value
231 * @param {!WebInspector.NetworkRequest} request 231 * @param {!SDK.NetworkRequest} request
232 * @return {boolean} 232 * @return {boolean}
233 */ 233 */
234 static _requestSchemeFilter(value, request) { 234 static _requestSchemeFilter(value, request) {
235 return request.scheme === value; 235 return request.scheme === value;
236 } 236 }
237 237
238 /** 238 /**
239 * @param {string} value 239 * @param {string} value
240 * @param {!WebInspector.NetworkRequest} request 240 * @param {!SDK.NetworkRequest} request
241 * @return {boolean} 241 * @return {boolean}
242 */ 242 */
243 static _requestSetCookieDomainFilter(value, request) { 243 static _requestSetCookieDomainFilter(value, request) {
244 var cookies = request.responseCookies; 244 var cookies = request.responseCookies;
245 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { 245 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) {
246 if (cookies[i].domain() === value) 246 if (cookies[i].domain() === value)
247 return true; 247 return true;
248 } 248 }
249 return false; 249 return false;
250 } 250 }
251 251
252 /** 252 /**
253 * @param {string} value 253 * @param {string} value
254 * @param {!WebInspector.NetworkRequest} request 254 * @param {!SDK.NetworkRequest} request
255 * @return {boolean} 255 * @return {boolean}
256 */ 256 */
257 static _requestSetCookieNameFilter(value, request) { 257 static _requestSetCookieNameFilter(value, request) {
258 var cookies = request.responseCookies; 258 var cookies = request.responseCookies;
259 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { 259 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) {
260 if (cookies[i].name() === value) 260 if (cookies[i].name() === value)
261 return true; 261 return true;
262 } 262 }
263 return false; 263 return false;
264 } 264 }
265 265
266 /** 266 /**
267 * @param {string} value 267 * @param {string} value
268 * @param {!WebInspector.NetworkRequest} request 268 * @param {!SDK.NetworkRequest} request
269 * @return {boolean} 269 * @return {boolean}
270 */ 270 */
271 static _requestSetCookieValueFilter(value, request) { 271 static _requestSetCookieValueFilter(value, request) {
272 var cookies = request.responseCookies; 272 var cookies = request.responseCookies;
273 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { 273 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) {
274 if (cookies[i].value() === value) 274 if (cookies[i].value() === value)
275 return true; 275 return true;
276 } 276 }
277 return false; 277 return false;
278 } 278 }
279 279
280 /** 280 /**
281 * @param {number} value 281 * @param {number} value
282 * @param {!WebInspector.NetworkRequest} request 282 * @param {!SDK.NetworkRequest} request
283 * @return {boolean} 283 * @return {boolean}
284 */ 284 */
285 static _requestSizeLargerThanFilter(value, request) { 285 static _requestSizeLargerThanFilter(value, request) {
286 return request.transferSize >= value; 286 return request.transferSize >= value;
287 } 287 }
288 288
289 /** 289 /**
290 * @param {string} value 290 * @param {string} value
291 * @param {!WebInspector.NetworkRequest} request 291 * @param {!SDK.NetworkRequest} request
292 * @return {boolean} 292 * @return {boolean}
293 */ 293 */
294 static _statusCodeFilter(value, request) { 294 static _statusCodeFilter(value, request) {
295 return ('' + request.statusCode) === value; 295 return ('' + request.statusCode) === value;
296 } 296 }
297 297
298 /** 298 /**
299 * @param {!WebInspector.NetworkRequest} request 299 * @param {!SDK.NetworkRequest} request
300 * @return {boolean} 300 * @return {boolean}
301 */ 301 */
302 static HTTPRequestsFilter(request) { 302 static HTTPRequestsFilter(request) {
303 return request.parsedURL.isValid && (request.scheme in WebInspector.NetworkL ogView.HTTPSchemas); 303 return request.parsedURL.isValid && (request.scheme in Network.NetworkLogVie w.HTTPSchemas);
304 } 304 }
305 305
306 /** 306 /**
307 * @param {!WebInspector.NetworkRequest} request 307 * @param {!SDK.NetworkRequest} request
308 * @return {boolean} 308 * @return {boolean}
309 */ 309 */
310 static FinishedRequestsFilter(request) { 310 static FinishedRequestsFilter(request) {
311 return request.finished; 311 return request.finished;
312 } 312 }
313 313
314 /** 314 /**
315 * @param {number} windowStart 315 * @param {number} windowStart
316 * @param {number} windowEnd 316 * @param {number} windowEnd
317 * @param {!WebInspector.NetworkRequest} request 317 * @param {!SDK.NetworkRequest} request
318 * @return {boolean} 318 * @return {boolean}
319 */ 319 */
320 static _requestTimeFilter(windowStart, windowEnd, request) { 320 static _requestTimeFilter(windowStart, windowEnd, request) {
321 if (request.issueTime() > windowEnd) 321 if (request.issueTime() > windowEnd)
322 return false; 322 return false;
323 if (request.endTime !== -1 && request.endTime < windowStart) 323 if (request.endTime !== -1 && request.endTime < windowStart)
324 return false; 324 return false;
325 return true; 325 return true;
326 } 326 }
327 327
(...skipping 14 matching lines...) Expand all
342 342
343 /** 343 /**
344 * @param {boolean} preserveLog 344 * @param {boolean} preserveLog
345 */ 345 */
346 setPreserveLog(preserveLog) { 346 setPreserveLog(preserveLog) {
347 this._preserveLog = preserveLog; 347 this._preserveLog = preserveLog;
348 } 348 }
349 349
350 /** 350 /**
351 * @override 351 * @override
352 * @param {!WebInspector.Target} target 352 * @param {!SDK.Target} target
353 */ 353 */
354 targetAdded(target) { 354 targetAdded(target) {
355 if (!target.parentTarget()) { 355 if (!target.parentTarget()) {
356 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target); 356 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
357 if (resourceTreeModel) { 357 if (resourceTreeModel) {
358 resourceTreeModel.addEventListener( 358 resourceTreeModel.addEventListener(
359 WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._main FrameNavigated, this); 359 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this);
360 resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.Events .Load, this._loadEventFired, this); 360 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th is._loadEventFired, this);
361 resourceTreeModel.addEventListener( 361 resourceTreeModel.addEventListener(
362 WebInspector.ResourceTreeModel.Events.DOMContentLoaded, this._domCon tentLoadedEventFired, this); 362 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this);
363 } 363 }
364 } 364 }
365 var networkLog = WebInspector.NetworkLog.fromTarget(target); 365 var networkLog = SDK.NetworkLog.fromTarget(target);
366 if (networkLog) 366 if (networkLog)
367 networkLog.requests().forEach(this._appendRequest.bind(this)); 367 networkLog.requests().forEach(this._appendRequest.bind(this));
368 } 368 }
369 369
370 /** 370 /**
371 * @override 371 * @override
372 * @param {!WebInspector.Target} target 372 * @param {!SDK.Target} target
373 */ 373 */
374 targetRemoved(target) { 374 targetRemoved(target) {
375 if (!target.parentTarget()) { 375 if (!target.parentTarget()) {
376 var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target); 376 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
377 if (resourceTreeModel) { 377 if (resourceTreeModel) {
378 resourceTreeModel.removeEventListener( 378 resourceTreeModel.removeEventListener(
379 WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._main FrameNavigated, this); 379 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this);
380 resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.Eve nts.Load, this._loadEventFired, this); 380 resourceTreeModel.removeEventListener(SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
381 resourceTreeModel.removeEventListener( 381 resourceTreeModel.removeEventListener(
382 WebInspector.ResourceTreeModel.Events.DOMContentLoaded, this._domCon tentLoadedEventFired, this); 382 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this);
383 } 383 }
384 } 384 }
385 } 385 }
386 386
387 /** 387 /**
388 * @param {number} start 388 * @param {number} start
389 * @param {number} end 389 * @param {number} end
390 */ 390 */
391 setWindow(start, end) { 391 setWindow(start, end) {
392 if (!start && !end) { 392 if (!start && !end) {
393 this._timeFilter = null; 393 this._timeFilter = null;
394 this._timeCalculator.setWindow(null); 394 this._timeCalculator.setWindow(null);
395 } else { 395 } else {
396 this._timeFilter = WebInspector.NetworkLogView._requestTimeFilter.bind(nul l, start, end); 396 this._timeFilter = Network.NetworkLogView._requestTimeFilter.bind(null, st art, end);
397 this._timeCalculator.setWindow(new WebInspector.NetworkTimeBoundary(start, end)); 397 this._timeCalculator.setWindow(new Network.NetworkTimeBoundary(start, end) );
398 } 398 }
399 this._filterRequests(); 399 this._filterRequests();
400 } 400 }
401 401
402 clearSelection() { 402 clearSelection() {
403 if (this._dataGrid.selectedNode) 403 if (this._dataGrid.selectedNode)
404 this._dataGrid.selectedNode.deselect(); 404 this._dataGrid.selectedNode.deselect();
405 } 405 }
406 406
407 _addFilters() { 407 _addFilters() {
408 this._textFilterUI = new WebInspector.TextFilterUI(true); 408 this._textFilterUI = new UI.TextFilterUI(true);
409 this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChang ed, this._filterChanged, this); 409 this._textFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this._ filterChanged, this);
410 this._filterBar.addFilter(this._textFilterUI); 410 this._filterBar.addFilter(this._textFilterUI);
411 411
412 var dataURLSetting = this._networkHideDataURLSetting; 412 var dataURLSetting = this._networkHideDataURLSetting;
413 this._dataURLFilterUI = new WebInspector.CheckboxFilterUI( 413 this._dataURLFilterUI = new UI.CheckboxFilterUI(
414 'hide-data-url', WebInspector.UIString('Hide data URLs'), true, dataURLS etting); 414 'hide-data-url', Common.UIString('Hide data URLs'), true, dataURLSetting );
415 this._dataURLFilterUI.addEventListener( 415 this._dataURLFilterUI.addEventListener(
416 WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(thi s), this); 416 UI.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this);
417 this._filterBar.addFilter(this._dataURLFilterUI); 417 this._filterBar.addFilter(this._dataURLFilterUI);
418 418
419 var filterItems = []; 419 var filterItems = [];
420 for (var categoryId in WebInspector.resourceCategories) { 420 for (var categoryId in Common.resourceCategories) {
421 var category = WebInspector.resourceCategories[categoryId]; 421 var category = Common.resourceCategories[categoryId];
422 filterItems.push({name: category.title, label: category.shortTitle, title: category.title}); 422 filterItems.push({name: category.title, label: category.shortTitle, title: category.title});
423 } 423 }
424 this._resourceCategoryFilterUI = 424 this._resourceCategoryFilterUI =
425 new WebInspector.NamedBitSetFilterUI(filterItems, this._networkResourceT ypeFiltersSetting); 425 new UI.NamedBitSetFilterUI(filterItems, this._networkResourceTypeFilters Setting);
426 this._resourceCategoryFilterUI.addEventListener( 426 this._resourceCategoryFilterUI.addEventListener(
427 WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(thi s), this); 427 UI.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this);
428 this._filterBar.addFilter(this._resourceCategoryFilterUI); 428 this._filterBar.addFilter(this._resourceCategoryFilterUI);
429 } 429 }
430 430
431 _resetSuggestionBuilder() { 431 _resetSuggestionBuilder() {
432 this._suggestionBuilder = new WebInspector.FilterSuggestionBuilder(WebInspec tor.NetworkLogView._searchKeys); 432 this._suggestionBuilder = new Network.FilterSuggestionBuilder(Network.Networ kLogView._searchKeys);
433 this._suggestionBuilder.addItem( 433 this._suggestionBuilder.addItem(
434 WebInspector.NetworkLogView.FilterType.Is, WebInspector.NetworkLogView.I sFilterType.Running); 434 Network.NetworkLogView.FilterType.Is, Network.NetworkLogView.IsFilterTyp e.Running);
435 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Large rThan, '100'); 435 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.LargerThan , '100');
436 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Large rThan, '10k'); 436 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.LargerThan , '10k');
437 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Large rThan, '1M'); 437 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.LargerThan , '1M');
438 this._textFilterUI.setSuggestionBuilder(this._suggestionBuilder); 438 this._textFilterUI.setSuggestionBuilder(this._suggestionBuilder);
439 } 439 }
440 440
441 /** 441 /**
442 * @param {!WebInspector.Event} event 442 * @param {!Common.Event} event
443 */ 443 */
444 _filterChanged(event) { 444 _filterChanged(event) {
445 this.removeAllNodeHighlights(); 445 this.removeAllNodeHighlights();
446 this._parseFilterQuery(this._textFilterUI.value()); 446 this._parseFilterQuery(this._textFilterUI.value());
447 this._filterRequests(); 447 this._filterRequests();
448 } 448 }
449 449
450 _initializeView() { 450 _initializeView() {
451 this.element.id = 'network-container'; 451 this.element.id = 'network-container';
452 this._setupDataGrid(); 452 this._setupDataGrid();
453 453
454 this._columns.show(this.element); 454 this._columns.show(this.element);
455 455
456 this._summaryBarElement = this.element.createChild('div', 'network-summary-b ar'); 456 this._summaryBarElement = this.element.createChild('div', 'network-summary-b ar');
457 457
458 this._columns.sortByCurrentColumn(); 458 this._columns.sortByCurrentColumn();
459 } 459 }
460 460
461 _showRecordingHint() { 461 _showRecordingHint() {
462 this._hideRecordingHint(); 462 this._hideRecordingHint();
463 this._recordingHint = this.element.createChild('div', 'network-status-pane f ill'); 463 this._recordingHint = this.element.createChild('div', 'network-status-pane f ill');
464 var hintText = this._recordingHint.createChild('div', 'recording-hint'); 464 var hintText = this._recordingHint.createChild('div', 'recording-hint');
465 var reloadShortcutNode = this._recordingHint.createChild('b'); 465 var reloadShortcutNode = this._recordingHint.createChild('b');
466 reloadShortcutNode.textContent = WebInspector.shortcutRegistry.shortcutDescr iptorsForAction('main.reload')[0].name; 466 reloadShortcutNode.textContent = UI.shortcutRegistry.shortcutDescriptorsForA ction('main.reload')[0].name;
467 467
468 if (this._recording) { 468 if (this._recording) {
469 var recordingText = hintText.createChild('span'); 469 var recordingText = hintText.createChild('span');
470 recordingText.textContent = WebInspector.UIString('Recording network activ ity\u2026'); 470 recordingText.textContent = Common.UIString('Recording network activity\u2 026');
471 hintText.createChild('br'); 471 hintText.createChild('br');
472 hintText.appendChild( 472 hintText.appendChild(
473 WebInspector.formatLocalized('Perform a request or hit %s to record th e reload.', [reloadShortcutNode])); 473 UI.formatLocalized('Perform a request or hit %s to record the reload.' , [reloadShortcutNode]));
474 } else { 474 } else {
475 var recordNode = hintText.createChild('b'); 475 var recordNode = hintText.createChild('b');
476 recordNode.textContent = WebInspector.shortcutRegistry.shortcutTitleForAct ion('network.toggle-recording'); 476 recordNode.textContent = UI.shortcutRegistry.shortcutTitleForAction('netwo rk.toggle-recording');
477 hintText.appendChild(WebInspector.formatLocalized( 477 hintText.appendChild(UI.formatLocalized(
478 'Record (%s) or reload (%s) to display network activity.', [recordNode , reloadShortcutNode])); 478 'Record (%s) or reload (%s) to display network activity.', [recordNode , reloadShortcutNode]));
479 } 479 }
480 } 480 }
481 481
482 _hideRecordingHint() { 482 _hideRecordingHint() {
483 if (this._recordingHint) 483 if (this._recordingHint)
484 this._recordingHint.remove(); 484 this._recordingHint.remove();
485 delete this._recordingHint; 485 delete this._recordingHint;
486 } 486 }
487 487
488 /** 488 /**
489 * @override 489 * @override
490 * @return {!Array.<!Element>} 490 * @return {!Array.<!Element>}
491 */ 491 */
492 elementsToRestoreScrollPositionsFor() { 492 elementsToRestoreScrollPositionsFor() {
493 if (!this._dataGrid) // Not initialized yet. 493 if (!this._dataGrid) // Not initialized yet.
494 return []; 494 return [];
495 return [this._dataGrid.scrollContainer]; 495 return [this._dataGrid.scrollContainer];
496 } 496 }
497 497
498 _setupDataGrid() { 498 _setupDataGrid() {
499 this._dataGrid = this._columns.dataGrid(); 499 this._dataGrid = this._columns.dataGrid();
500 this._dataGrid.setRowContextMenuCallback( 500 this._dataGrid.setRowContextMenuCallback(
501 (contextMenu, node) => this.handleContextMenuForRequest(contextMenu, nod e.request())); 501 (contextMenu, node) => this.handleContextMenuForRequest(contextMenu, nod e.request()));
502 this._dataGrid.setStickToBottom(true); 502 this._dataGrid.setStickToBottom(true);
503 this._dataGrid.setName('networkLog'); 503 this._dataGrid.setName('networkLog');
504 this._dataGrid.setResizeMethod(WebInspector.DataGrid.ResizeMethod.Last); 504 this._dataGrid.setResizeMethod(UI.DataGrid.ResizeMethod.Last);
505 this._dataGrid.element.classList.add('network-log-grid'); 505 this._dataGrid.element.classList.add('network-log-grid');
506 this._dataGrid.element.addEventListener('mousedown', this._dataGridMouseDown .bind(this), true); 506 this._dataGrid.element.addEventListener('mousedown', this._dataGridMouseDown .bind(this), true);
507 this._dataGrid.element.addEventListener('mousemove', this._dataGridMouseMove .bind(this), true); 507 this._dataGrid.element.addEventListener('mousemove', this._dataGridMouseMove .bind(this), true);
508 this._dataGrid.element.addEventListener('mouseleave', this._dataGridMouseLea ve.bind(this), true); 508 this._dataGrid.element.addEventListener('mouseleave', this._dataGridMouseLea ve.bind(this), true);
509 } 509 }
510 510
511 /** 511 /**
512 * @param {!Event} event 512 * @param {!Event} event
513 */ 513 */
514 _dataGridMouseMove(event) { 514 _dataGridMouseMove(event) {
515 var node = this._dataGrid.dataGridNodeFromNode(event.target); 515 var node = this._dataGrid.dataGridNodeFromNode(event.target);
516 var highlightInitiatorChain = event.shiftKey; 516 var highlightInitiatorChain = event.shiftKey;
517 this._setHoveredNode(node, highlightInitiatorChain); 517 this._setHoveredNode(node, highlightInitiatorChain);
518 this._highlightInitiatorChain((highlightInitiatorChain && node) ? node.reque st() : null); 518 this._highlightInitiatorChain((highlightInitiatorChain && node) ? node.reque st() : null);
519 } 519 }
520 520
521 _dataGridMouseLeave() { 521 _dataGridMouseLeave() {
522 this._setHoveredNode(null); 522 this._setHoveredNode(null);
523 this._highlightInitiatorChain(null); 523 this._highlightInitiatorChain(null);
524 } 524 }
525 525
526 /** 526 /**
527 * @param {?WebInspector.NetworkRequest} request 527 * @param {?SDK.NetworkRequest} request
528 * @param {boolean} highlightInitiatorChain 528 * @param {boolean} highlightInitiatorChain
529 */ 529 */
530 setHoveredRequest(request, highlightInitiatorChain) { 530 setHoveredRequest(request, highlightInitiatorChain) {
531 this._setHoveredNode(request ? this._nodesByRequestId.get(request.requestId) : null, highlightInitiatorChain); 531 this._setHoveredNode(request ? this._nodesByRequestId.get(request.requestId) : null, highlightInitiatorChain);
532 this._highlightInitiatorChain((request && highlightInitiatorChain) ? request : null); 532 this._highlightInitiatorChain((request && highlightInitiatorChain) ? request : null);
533 } 533 }
534 534
535 /** 535 /**
536 * @param {?WebInspector.NetworkDataGridNode} node 536 * @param {?Network.NetworkDataGridNode} node
537 * @param {boolean=} highlightInitiatorChain 537 * @param {boolean=} highlightInitiatorChain
538 */ 538 */
539 _setHoveredNode(node, highlightInitiatorChain) { 539 _setHoveredNode(node, highlightInitiatorChain) {
540 if (this._hoveredNode) 540 if (this._hoveredNode)
541 this._hoveredNode.element().classList.remove('hover'); 541 this._hoveredNode.element().classList.remove('hover');
542 this._hoveredNode = node; 542 this._hoveredNode = node;
543 if (this._hoveredNode) 543 if (this._hoveredNode)
544 this._hoveredNode.element().classList.add('hover'); 544 this._hoveredNode.element().classList.add('hover');
545 this._columns.setHoveredRequest(this._hoveredNode ? this._hoveredNode.reques t() : null, !!highlightInitiatorChain); 545 this._columns.setHoveredRequest(this._hoveredNode ? this._hoveredNode.reques t() : null, !!highlightInitiatorChain);
546 } 546 }
547 547
548 /** 548 /**
549 * @param {!Event} event 549 * @param {!Event} event
550 */ 550 */
551 _dataGridMouseDown(event) { 551 _dataGridMouseDown(event) {
552 if ((!this._dataGrid.selectedNode && event.button) || event.target.enclosing NodeOrSelfWithNodeName('a')) 552 if ((!this._dataGrid.selectedNode && event.button) || event.target.enclosing NodeOrSelfWithNodeName('a'))
553 event.consume(); 553 event.consume();
554 } 554 }
555 555
556 /** 556 /**
557 * @param {?WebInspector.NetworkRequest} request 557 * @param {?SDK.NetworkRequest} request
558 */ 558 */
559 _highlightInitiatorChain(request) { 559 _highlightInitiatorChain(request) {
560 if (this._requestWithHighlightedInitiators === request) 560 if (this._requestWithHighlightedInitiators === request)
561 return; 561 return;
562 this._requestWithHighlightedInitiators = request; 562 this._requestWithHighlightedInitiators = request;
563 563
564 if (!request) { 564 if (!request) {
565 for (var node of this._nodesByRequestId.values()) { 565 for (var node of this._nodesByRequestId.values()) {
566 if (!node.dataGrid) 566 if (!node.dataGrid)
567 continue; 567 continue;
(...skipping 26 matching lines...) Expand all
594 var transferSize = 0; 594 var transferSize = 0;
595 var selectedRequestsNumber = 0; 595 var selectedRequestsNumber = 0;
596 var selectedTransferSize = 0; 596 var selectedTransferSize = 0;
597 var baseTime = -1; 597 var baseTime = -1;
598 var maxTime = -1; 598 var maxTime = -1;
599 var nodes = this._nodesByRequestId.valuesArray(); 599 var nodes = this._nodesByRequestId.valuesArray();
600 for (var i = 0; i < nodes.length; ++i) { 600 for (var i = 0; i < nodes.length; ++i) {
601 var request = nodes[i].request(); 601 var request = nodes[i].request();
602 var requestTransferSize = request.transferSize; 602 var requestTransferSize = request.transferSize;
603 transferSize += requestTransferSize; 603 transferSize += requestTransferSize;
604 if (!nodes[i][WebInspector.NetworkLogView._isFilteredOutSymbol]) { 604 if (!nodes[i][Network.NetworkLogView._isFilteredOutSymbol]) {
605 selectedRequestsNumber++; 605 selectedRequestsNumber++;
606 selectedTransferSize += requestTransferSize; 606 selectedTransferSize += requestTransferSize;
607 } 607 }
608 if (request.url === request.target().inspectedURL() && 608 if (request.url === request.target().inspectedURL() &&
609 request.resourceType() === WebInspector.resourceTypes.Document) 609 request.resourceType() === Common.resourceTypes.Document)
610 baseTime = request.startTime; 610 baseTime = request.startTime;
611 if (request.endTime > maxTime) 611 if (request.endTime > maxTime)
612 maxTime = request.endTime; 612 maxTime = request.endTime;
613 } 613 }
614 614
615 var summaryBar = this._summaryBarElement; 615 var summaryBar = this._summaryBarElement;
616 summaryBar.removeChildren(); 616 summaryBar.removeChildren();
617 var separator = '\u2002\u2758\u2002'; 617 var separator = '\u2002\u2758\u2002';
618 var text = ''; 618 var text = '';
619 /** 619 /**
620 * @param {string} chunk 620 * @param {string} chunk
621 * @return {!Element} 621 * @return {!Element}
622 */ 622 */
623 function appendChunk(chunk) { 623 function appendChunk(chunk) {
624 var span = summaryBar.createChild('span'); 624 var span = summaryBar.createChild('span');
625 span.textContent = chunk; 625 span.textContent = chunk;
626 text += chunk; 626 text += chunk;
627 return span; 627 return span;
628 } 628 }
629 629
630 if (selectedRequestsNumber !== requestsNumber) { 630 if (selectedRequestsNumber !== requestsNumber) {
631 appendChunk(WebInspector.UIString('%d / %d requests', selectedRequestsNumb er, requestsNumber)); 631 appendChunk(Common.UIString('%d / %d requests', selectedRequestsNumber, re questsNumber));
632 appendChunk(separator); 632 appendChunk(separator);
633 appendChunk(WebInspector.UIString( 633 appendChunk(Common.UIString(
634 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize))); 634 '%s / %s transferred', Number.bytesToString(selectedTransferSize), Num ber.bytesToString(transferSize)));
635 } else { 635 } else {
636 appendChunk(WebInspector.UIString('%d requests', requestsNumber)); 636 appendChunk(Common.UIString('%d requests', requestsNumber));
637 appendChunk(separator); 637 appendChunk(separator);
638 appendChunk(WebInspector.UIString('%s transferred', Number.bytesToString(t ransferSize))); 638 appendChunk(Common.UIString('%s transferred', Number.bytesToString(transfe rSize)));
639 } 639 }
640 if (baseTime !== -1 && maxTime !== -1) { 640 if (baseTime !== -1 && maxTime !== -1) {
641 appendChunk(separator); 641 appendChunk(separator);
642 appendChunk(WebInspector.UIString('Finish: %s', Number.secondsToString(max Time - baseTime))); 642 appendChunk(Common.UIString('Finish: %s', Number.secondsToString(maxTime - baseTime)));
643 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) { 643 if (this._mainRequestDOMContentLoadedTime !== -1 && this._mainRequestDOMCo ntentLoadedTime > baseTime) {
644 appendChunk(separator); 644 appendChunk(separator);
645 var domContentLoadedText = WebInspector.UIString( 645 var domContentLoadedText = Common.UIString(
646 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime)); 646 'DOMContentLoaded: %s', Number.secondsToString(this._mainRequestDOMC ontentLoadedTime - baseTime));
647 appendChunk(domContentLoadedText).classList.add('summary-blue'); 647 appendChunk(domContentLoadedText).classList.add('summary-blue');
648 } 648 }
649 if (this._mainRequestLoadTime !== -1) { 649 if (this._mainRequestLoadTime !== -1) {
650 appendChunk(separator); 650 appendChunk(separator);
651 var loadText = WebInspector.UIString('Load: %s', Number.secondsToString( this._mainRequestLoadTime - baseTime)); 651 var loadText = Common.UIString('Load: %s', Number.secondsToString(this._ mainRequestLoadTime - baseTime));
652 appendChunk(loadText).classList.add('summary-red'); 652 appendChunk(loadText).classList.add('summary-red');
653 } 653 }
654 } 654 }
655 summaryBar.title = text; 655 summaryBar.title = text;
656 } 656 }
657 657
658 scheduleRefresh() { 658 scheduleRefresh() {
659 if (this._needsRefresh) 659 if (this._needsRefresh)
660 return; 660 return;
661 661
(...skipping 27 matching lines...) Expand all
689 } 689 }
690 690
691 _invalidateAllItems() { 691 _invalidateAllItems() {
692 var requestIds = this._nodesByRequestId.keysArray(); 692 var requestIds = this._nodesByRequestId.keysArray();
693 for (var i = 0; i < requestIds.length; ++i) 693 for (var i = 0; i < requestIds.length; ++i)
694 this._staleRequestIds[requestIds[i]] = true; 694 this._staleRequestIds[requestIds[i]] = true;
695 this._refresh(); 695 this._refresh();
696 } 696 }
697 697
698 /** 698 /**
699 * @return {!WebInspector.NetworkTimeCalculator} 699 * @return {!Network.NetworkTimeCalculator}
700 */ 700 */
701 timeCalculator() { 701 timeCalculator() {
702 return this._timeCalculator; 702 return this._timeCalculator;
703 } 703 }
704 704
705 /** 705 /**
706 * @return {!WebInspector.NetworkTimeCalculator} 706 * @return {!Network.NetworkTimeCalculator}
707 */ 707 */
708 calculator() { 708 calculator() {
709 return this._calculator; 709 return this._calculator;
710 } 710 }
711 711
712 /** 712 /**
713 * @param {!WebInspector.NetworkTimeCalculator} x 713 * @param {!Network.NetworkTimeCalculator} x
714 */ 714 */
715 setCalculator(x) { 715 setCalculator(x) {
716 if (!x || this._calculator === x) 716 if (!x || this._calculator === x)
717 return; 717 return;
718 718
719 if (this._calculator !== x) { 719 if (this._calculator !== x) {
720 this._calculator = x; 720 this._calculator = x;
721 this._columns.setCalculator(this._calculator); 721 this._columns.setCalculator(this._calculator);
722 } 722 }
723 this._calculator.reset(); 723 this._calculator.reset();
724 724
725 if (this._calculator.startAtZero) 725 if (this._calculator.startAtZero)
726 this._columns.hideEventDividers(); 726 this._columns.hideEventDividers();
727 else 727 else
728 this._columns.showEventDividers(); 728 this._columns.showEventDividers();
729 729
730 this._invalidateAllItems(); 730 this._invalidateAllItems();
731 } 731 }
732 732
733 /** 733 /**
734 * @param {!WebInspector.Event} event 734 * @param {!Common.Event} event
735 */ 735 */
736 _loadEventFired(event) { 736 _loadEventFired(event) {
737 if (!this._recording) 737 if (!this._recording)
738 return; 738 return;
739 739
740 var data = /** @type {number} */ (event.data); 740 var data = /** @type {number} */ (event.data);
741 if (data) { 741 if (data) {
742 this._mainRequestLoadTime = data; 742 this._mainRequestLoadTime = data;
743 this._columns.addEventDividers([data], 'network-red-divider'); 743 this._columns.addEventDividers([data], 'network-red-divider');
744 } 744 }
745 } 745 }
746 746
747 /** 747 /**
748 * @param {!WebInspector.Event} event 748 * @param {!Common.Event} event
749 */ 749 */
750 _domContentLoadedEventFired(event) { 750 _domContentLoadedEventFired(event) {
751 if (!this._recording) 751 if (!this._recording)
752 return; 752 return;
753 var data = /** @type {number} */ (event.data); 753 var data = /** @type {number} */ (event.data);
754 if (data) { 754 if (data) {
755 this._mainRequestDOMContentLoadedTime = data; 755 this._mainRequestDOMContentLoadedTime = data;
756 this._columns.addEventDividers([data], 'network-blue-divider'); 756 this._columns.addEventDividers([data], 'network-blue-divider');
757 } 757 }
758 } 758 }
(...skipping 17 matching lines...) Expand all
776 this.removeAllNodeHighlights(); 776 this.removeAllNodeHighlights();
777 777
778 var oldBoundary = this.calculator().boundary(); 778 var oldBoundary = this.calculator().boundary();
779 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ; 779 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime) ;
780 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime); 780 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadT ime);
781 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime); 781 this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMConten tLoadedTime);
782 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime); 782 this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMCo ntentLoadedTime);
783 783
784 var dataGrid = this._dataGrid; 784 var dataGrid = this._dataGrid;
785 var rootNode = dataGrid.rootNode(); 785 var rootNode = dataGrid.rootNode();
786 /** @type {!Array<!WebInspector.NetworkDataGridNode> } */ 786 /** @type {!Array<!Network.NetworkDataGridNode> } */
787 var nodesToInsert = []; 787 var nodesToInsert = [];
788 /** @type {!Array<!WebInspector.NetworkDataGridNode> } */ 788 /** @type {!Array<!Network.NetworkDataGridNode> } */
789 var nodesToRefresh = []; 789 var nodesToRefresh = [];
790 for (var requestId in this._staleRequestIds) { 790 for (var requestId in this._staleRequestIds) {
791 var node = this._nodesByRequestId.get(requestId); 791 var node = this._nodesByRequestId.get(requestId);
792 if (!node) 792 if (!node)
793 continue; 793 continue;
794 var isFilteredOut = !this._applyFilter(node); 794 var isFilteredOut = !this._applyFilter(node);
795 if (isFilteredOut && node === this._hoveredNode) 795 if (isFilteredOut && node === this._hoveredNode)
796 this._setHoveredNode(null); 796 this._setHoveredNode(null);
797 if (node[WebInspector.NetworkLogView._isFilteredOutSymbol] !== isFilteredO ut) { 797 if (node[Network.NetworkLogView._isFilteredOutSymbol] !== isFilteredOut) {
798 if (!node[WebInspector.NetworkLogView._isFilteredOutSymbol]) 798 if (!node[Network.NetworkLogView._isFilteredOutSymbol])
799 rootNode.removeChild(node); 799 rootNode.removeChild(node);
800 800
801 node[WebInspector.NetworkLogView._isFilteredOutSymbol] = isFilteredOut; 801 node[Network.NetworkLogView._isFilteredOutSymbol] = isFilteredOut;
802 802
803 if (!node[WebInspector.NetworkLogView._isFilteredOutSymbol]) 803 if (!node[Network.NetworkLogView._isFilteredOutSymbol])
804 nodesToInsert.push(node); 804 nodesToInsert.push(node);
805 } 805 }
806 if (!isFilteredOut) 806 if (!isFilteredOut)
807 nodesToRefresh.push(node); 807 nodesToRefresh.push(node);
808 var request = node.request(); 808 var request = node.request();
809 this._timeCalculator.updateBoundaries(request); 809 this._timeCalculator.updateBoundaries(request);
810 this._durationCalculator.updateBoundaries(request); 810 this._durationCalculator.updateBoundaries(request);
811 } 811 }
812 812
813 for (var i = 0; i < nodesToInsert.length; ++i) { 813 for (var i = 0; i < nodesToInsert.length; ++i) {
814 var node = nodesToInsert[i]; 814 var node = nodesToInsert[i];
815 var request = node.request(); 815 var request = node.request();
816 dataGrid.insertChild(node); 816 dataGrid.insertChild(node);
817 node[WebInspector.NetworkLogView._isMatchingSearchQuerySymbol] = this._mat chRequest(request); 817 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchReq uest(request);
818 } 818 }
819 819
820 for (var node of nodesToRefresh) 820 for (var node of nodesToRefresh)
821 node.refresh(); 821 node.refresh();
822 822
823 this._highlightNthMatchedRequestForSearch( 823 this._highlightNthMatchedRequestForSearch(
824 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false); 824 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false);
825 825
826 this._staleRequestIds = {}; 826 this._staleRequestIds = {};
827 this._updateSummaryBar(); 827 this._updateSummaryBar();
828 828
829 this._columns.dataChanged(); 829 this._columns.dataChanged();
830 } 830 }
831 831
832 reset() { 832 reset() {
833 this._requestWithHighlightedInitiators = null; 833 this._requestWithHighlightedInitiators = null;
834 this.dispatchEventToListeners(WebInspector.NetworkLogView.Events.RequestSele cted, null); 834 this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null);
835 835
836 this._clearSearchMatchedList(); 836 this._clearSearchMatchedList();
837 837
838 this._setHoveredNode(null); 838 this._setHoveredNode(null);
839 this._columns.reset(); 839 this._columns.reset();
840 840
841 this._timeFilter = null; 841 this._timeFilter = null;
842 this._calculator.reset(); 842 this._calculator.reset();
843 843
844 this._timeCalculator.setWindow(null); 844 this._timeCalculator.setWindow(null);
(...skipping 19 matching lines...) Expand all
864 * @param {string} filterString 864 * @param {string} filterString
865 */ 865 */
866 setTextFilterValue(filterString) { 866 setTextFilterValue(filterString) {
867 this._textFilterUI.setValue(filterString); 867 this._textFilterUI.setValue(filterString);
868 this._textFilterUI.setRegexChecked(false); 868 this._textFilterUI.setRegexChecked(false);
869 this._dataURLFilterUI.setChecked(false); 869 this._dataURLFilterUI.setChecked(false);
870 this._resourceCategoryFilterUI.reset(); 870 this._resourceCategoryFilterUI.reset();
871 } 871 }
872 872
873 /** 873 /**
874 * @param {!WebInspector.Event} event 874 * @param {!Common.Event} event
875 */ 875 */
876 _onRequestStarted(event) { 876 _onRequestStarted(event) {
877 if (!this._recording) 877 if (!this._recording)
878 return; 878 return;
879 var request = /** @type {!WebInspector.NetworkRequest} */ (event.data); 879 var request = /** @type {!SDK.NetworkRequest} */ (event.data);
880 this._appendRequest(request); 880 this._appendRequest(request);
881 } 881 }
882 882
883 /** 883 /**
884 * @param {!WebInspector.NetworkRequest} request 884 * @param {!SDK.NetworkRequest} request
885 */ 885 */
886 _appendRequest(request) { 886 _appendRequest(request) {
887 var node = new WebInspector.NetworkDataGridNode(this, request); 887 var node = new Network.NetworkDataGridNode(this, request);
888 node[WebInspector.NetworkLogView._isFilteredOutSymbol] = true; 888 node[Network.NetworkLogView._isFilteredOutSymbol] = true;
889 node[WebInspector.NetworkLogView._isMatchingSearchQuerySymbol] = false; 889 node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = false;
890 890
891 // In case of redirect request id is reassigned to a redirected 891 // In case of redirect request id is reassigned to a redirected
892 // request and we need to update _nodesByRequestId and search results. 892 // request and we need to update _nodesByRequestId and search results.
893 var originalRequestNode = this._nodesByRequestId.get(request.requestId); 893 var originalRequestNode = this._nodesByRequestId.get(request.requestId);
894 if (originalRequestNode) 894 if (originalRequestNode)
895 this._nodesByRequestId.set(originalRequestNode.request().requestId, origin alRequestNode); 895 this._nodesByRequestId.set(originalRequestNode.request().requestId, origin alRequestNode);
896 this._nodesByRequestId.set(request.requestId, node); 896 this._nodesByRequestId.set(request.requestId, node);
897 897
898 // Pull all the redirects of the main request upon commit load. 898 // Pull all the redirects of the main request upon commit load.
899 if (request.redirects) { 899 if (request.redirects) {
900 for (var i = 0; i < request.redirects.length; ++i) 900 for (var i = 0; i < request.redirects.length; ++i)
901 this._refreshRequest(request.redirects[i]); 901 this._refreshRequest(request.redirects[i]);
902 } 902 }
903 903
904 this._refreshRequest(request); 904 this._refreshRequest(request);
905 } 905 }
906 906
907 /** 907 /**
908 * @param {!WebInspector.Event} event 908 * @param {!Common.Event} event
909 */ 909 */
910 _onRequestUpdated(event) { 910 _onRequestUpdated(event) {
911 var request = /** @type {!WebInspector.NetworkRequest} */ (event.data); 911 var request = /** @type {!SDK.NetworkRequest} */ (event.data);
912 this._refreshRequest(request); 912 this._refreshRequest(request);
913 } 913 }
914 914
915 /** 915 /**
916 * @param {!WebInspector.NetworkRequest} request 916 * @param {!SDK.NetworkRequest} request
917 */ 917 */
918 _refreshRequest(request) { 918 _refreshRequest(request) {
919 if (!this._nodesByRequestId.get(request.requestId)) 919 if (!this._nodesByRequestId.get(request.requestId))
920 return; 920 return;
921 921
922 WebInspector.NetworkLogView._subdomains(request.domain) 922 Network.NetworkLogView._subdomains(request.domain)
923 .forEach(this._suggestionBuilder.addItem.bind( 923 .forEach(this._suggestionBuilder.addItem.bind(
924 this._suggestionBuilder, WebInspector.NetworkLogView.FilterType.Doma in)); 924 this._suggestionBuilder, Network.NetworkLogView.FilterType.Domain));
925 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Metho d, request.requestMethod); 925 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Method, re quest.requestMethod);
926 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.MimeT ype, request.mimeType); 926 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MimeType, request.mimeType);
927 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Schem e, '' + request.scheme); 927 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.Scheme, '' + request.scheme);
928 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Statu sCode, '' + request.statusCode); 928 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.StatusCode , '' + request.statusCode);
929 929
930 if (request.mixedContentType !== 'none') { 930 if (request.mixedContentType !== 'none') {
931 this._suggestionBuilder.addItem( 931 this._suggestionBuilder.addItem(
932 WebInspector.NetworkLogView.FilterType.MixedContent, 932 Network.NetworkLogView.FilterType.MixedContent,
933 WebInspector.NetworkLogView.MixedContentFilterValues.All); 933 Network.NetworkLogView.MixedContentFilterValues.All);
934 } 934 }
935 935
936 if (request.mixedContentType === 'optionally-blockable') { 936 if (request.mixedContentType === 'optionally-blockable') {
937 this._suggestionBuilder.addItem( 937 this._suggestionBuilder.addItem(
938 WebInspector.NetworkLogView.FilterType.MixedContent, 938 Network.NetworkLogView.FilterType.MixedContent,
939 WebInspector.NetworkLogView.MixedContentFilterValues.Displayed); 939 Network.NetworkLogView.MixedContentFilterValues.Displayed);
940 } 940 }
941 941
942 if (request.mixedContentType === 'blockable') { 942 if (request.mixedContentType === 'blockable') {
943 var suggestion = request.wasBlocked() ? WebInspector.NetworkLogView.MixedC ontentFilterValues.Blocked : 943 var suggestion = request.wasBlocked() ? Network.NetworkLogView.MixedConten tFilterValues.Blocked :
944 WebInspector.NetworkLogView.MixedC ontentFilterValues.BlockOverridden; 944 Network.NetworkLogView.MixedConten tFilterValues.BlockOverridden;
945 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Mix edContent, suggestion); 945 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.MixedCon tent, suggestion);
946 } 946 }
947 947
948 var responseHeaders = request.responseHeaders; 948 var responseHeaders = request.responseHeaders;
949 for (var i = 0, l = responseHeaders.length; i < l; ++i) 949 for (var i = 0, l = responseHeaders.length; i < l; ++i)
950 this._suggestionBuilder.addItem( 950 this._suggestionBuilder.addItem(
951 WebInspector.NetworkLogView.FilterType.HasResponseHeader, responseHead ers[i].name); 951 Network.NetworkLogView.FilterType.HasResponseHeader, responseHeaders[i ].name);
952 var cookies = request.responseCookies; 952 var cookies = request.responseCookies;
953 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) { 953 for (var i = 0, l = cookies ? cookies.length : 0; i < l; ++i) {
954 var cookie = cookies[i]; 954 var cookie = cookies[i];
955 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Set CookieDomain, cookie.domain()); 955 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eDomain, cookie.domain());
956 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Set CookieName, cookie.name()); 956 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eName, cookie.name());
957 this._suggestionBuilder.addItem(WebInspector.NetworkLogView.FilterType.Set CookieValue, cookie.value()); 957 this._suggestionBuilder.addItem(Network.NetworkLogView.FilterType.SetCooki eValue, cookie.value());
958 } 958 }
959 959
960 this._staleRequestIds[request.requestId] = true; 960 this._staleRequestIds[request.requestId] = true;
961 this.dispatchEventToListeners(WebInspector.NetworkLogView.Events.UpdateReque st, request); 961 this.dispatchEventToListeners(Network.NetworkLogView.Events.UpdateRequest, r equest);
962 this.scheduleRefresh(); 962 this.scheduleRefresh();
963 } 963 }
964 964
965 /** 965 /**
966 * @param {!WebInspector.Event} event 966 * @param {!Common.Event} event
967 */ 967 */
968 _mainFrameNavigated(event) { 968 _mainFrameNavigated(event) {
969 if (!this._recording) 969 if (!this._recording)
970 return; 970 return;
971 971
972 var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data); 972 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data);
973 var loaderId = frame.loaderId; 973 var loaderId = frame.loaderId;
974 974
975 // Pick provisional load requests. 975 // Pick provisional load requests.
976 var requestsToPick = []; 976 var requestsToPick = [];
977 var networkLog = WebInspector.NetworkLog.fromTarget(frame.target()); 977 var networkLog = SDK.NetworkLog.fromTarget(frame.target());
978 var requests = networkLog ? networkLog.requests() : []; 978 var requests = networkLog ? networkLog.requests() : [];
979 for (var i = 0; i < requests.length; ++i) { 979 for (var i = 0; i < requests.length; ++i) {
980 var request = requests[i]; 980 var request = requests[i];
981 if (request.loaderId === loaderId) 981 if (request.loaderId === loaderId)
982 requestsToPick.push(request); 982 requestsToPick.push(request);
983 } 983 }
984 984
985 if (!this._preserveLog) { 985 if (!this._preserveLog) {
986 this.reset(); 986 this.reset();
987 for (var i = 0; i < requestsToPick.length; ++i) 987 for (var i = 0; i < requestsToPick.length; ++i)
(...skipping 17 matching lines...) Expand all
1005 } 1005 }
1006 1006
1007 /** 1007 /**
1008 * @param {boolean} gridMode 1008 * @param {boolean} gridMode
1009 */ 1009 */
1010 switchViewMode(gridMode) { 1010 switchViewMode(gridMode) {
1011 this._columns.switchViewMode(gridMode); 1011 this._columns.switchViewMode(gridMode);
1012 } 1012 }
1013 1013
1014 /** 1014 /**
1015 * @param {!WebInspector.ContextMenu} contextMenu 1015 * @param {!UI.ContextMenu} contextMenu
1016 * @param {!WebInspector.NetworkRequest} request 1016 * @param {!SDK.NetworkRequest} request
1017 */ 1017 */
1018 handleContextMenuForRequest(contextMenu, request) { 1018 handleContextMenuForRequest(contextMenu, request) {
1019 contextMenu.appendApplicableItems(request); 1019 contextMenu.appendApplicableItems(request);
1020 var copyMenu = contextMenu.appendSubMenuItem(WebInspector.UIString('Copy')); 1020 var copyMenu = contextMenu.appendSubMenuItem(Common.UIString('Copy'));
1021 if (request) { 1021 if (request) {
1022 copyMenu.appendItem( 1022 copyMenu.appendItem(
1023 WebInspector.copyLinkAddressLabel(), 1023 UI.copyLinkAddressLabel(),
1024 InspectorFrontendHost.copyText.bind(InspectorFrontendHost, request.con tentURL())); 1024 InspectorFrontendHost.copyText.bind(InspectorFrontendHost, request.con tentURL()));
1025 copyMenu.appendSeparator(); 1025 copyMenu.appendSeparator();
1026 1026
1027 if (request.requestHeadersText()) 1027 if (request.requestHeadersText())
1028 copyMenu.appendItem( 1028 copyMenu.appendItem(
1029 WebInspector.UIString.capitalize('Copy ^request ^headers'), this._co pyRequestHeaders.bind(this, request)); 1029 Common.UIString.capitalize('Copy ^request ^headers'), this._copyRequ estHeaders.bind(this, request));
1030 if (request.responseHeadersText) 1030 if (request.responseHeadersText)
1031 copyMenu.appendItem( 1031 copyMenu.appendItem(
1032 WebInspector.UIString.capitalize('Copy ^response ^headers'), this._c opyResponseHeaders.bind(this, request)); 1032 Common.UIString.capitalize('Copy ^response ^headers'), this._copyRes ponseHeaders.bind(this, request));
1033 if (request.finished) 1033 if (request.finished)
1034 copyMenu.appendItem(WebInspector.UIString.capitalize('Copy ^response'), this._copyResponse.bind(this, request)); 1034 copyMenu.appendItem(Common.UIString.capitalize('Copy ^response'), this._ copyResponse.bind(this, request));
1035 1035
1036 if (WebInspector.isWin()) { 1036 if (Host.isWin()) {
1037 copyMenu.appendItem( 1037 copyMenu.appendItem(
1038 WebInspector.UIString('Copy as cURL (cmd)'), this._copyCurlCommand.b ind(this, request, 'win')); 1038 Common.UIString('Copy as cURL (cmd)'), this._copyCurlCommand.bind(th is, request, 'win'));
1039 copyMenu.appendItem( 1039 copyMenu.appendItem(
1040 WebInspector.UIString('Copy as cURL (bash)'), this._copyCurlCommand. bind(this, request, 'unix')); 1040 Common.UIString('Copy as cURL (bash)'), this._copyCurlCommand.bind(t his, request, 'unix'));
1041 copyMenu.appendItem( 1041 copyMenu.appendItem(
1042 WebInspector.UIString('Copy All as cURL (cmd)'), this._copyAllCurlCo mmand.bind(this, 'win')); 1042 Common.UIString('Copy All as cURL (cmd)'), this._copyAllCurlCommand. bind(this, 'win'));
1043 copyMenu.appendItem( 1043 copyMenu.appendItem(
1044 WebInspector.UIString('Copy All as cURL (bash)'), this._copyAllCurlC ommand.bind(this, 'unix')); 1044 Common.UIString('Copy All as cURL (bash)'), this._copyAllCurlCommand .bind(this, 'unix'));
1045 } else { 1045 } else {
1046 copyMenu.appendItem(WebInspector.UIString('Copy as cURL'), this._copyCur lCommand.bind(this, request, 'unix')); 1046 copyMenu.appendItem(Common.UIString('Copy as cURL'), this._copyCurlComma nd.bind(this, request, 'unix'));
1047 copyMenu.appendItem(WebInspector.UIString('Copy All as cURL'), this._cop yAllCurlCommand.bind(this, 'unix')); 1047 copyMenu.appendItem(Common.UIString('Copy All as cURL'), this._copyAllCu rlCommand.bind(this, 'unix'));
1048 } 1048 }
1049 } else { 1049 } else {
1050 copyMenu = contextMenu.appendSubMenuItem(WebInspector.UIString('Copy')); 1050 copyMenu = contextMenu.appendSubMenuItem(Common.UIString('Copy'));
1051 } 1051 }
1052 copyMenu.appendItem(WebInspector.UIString.capitalize('Copy ^all as HAR'), th is._copyAll.bind(this)); 1052 copyMenu.appendItem(Common.UIString.capitalize('Copy ^all as HAR'), this._co pyAll.bind(this));
1053 1053
1054 contextMenu.appendSeparator(); 1054 contextMenu.appendSeparator();
1055 contextMenu.appendItem(WebInspector.UIString.capitalize('Save as HAR with ^c ontent'), this._exportAll.bind(this)); 1055 contextMenu.appendItem(Common.UIString.capitalize('Save as HAR with ^content '), this._exportAll.bind(this));
1056 1056
1057 contextMenu.appendSeparator(); 1057 contextMenu.appendSeparator();
1058 contextMenu.appendItem( 1058 contextMenu.appendItem(
1059 WebInspector.UIString.capitalize('Clear ^browser ^cache'), this._clearBr owserCache.bind(this)); 1059 Common.UIString.capitalize('Clear ^browser ^cache'), this._clearBrowserC ache.bind(this));
1060 contextMenu.appendItem( 1060 contextMenu.appendItem(
1061 WebInspector.UIString.capitalize('Clear ^browser ^cookies'), this._clear BrowserCookies.bind(this)); 1061 Common.UIString.capitalize('Clear ^browser ^cookies'), this._clearBrowse rCookies.bind(this));
1062 1062
1063 var blockedSetting = WebInspector.moduleSetting('blockedURLs'); 1063 var blockedSetting = Common.moduleSetting('blockedURLs');
1064 if (request && Runtime.experiments.isEnabled('requestBlocking')) { // Disab led until ready. 1064 if (request && Runtime.experiments.isEnabled('requestBlocking')) { // Disab led until ready.
1065 contextMenu.appendSeparator(); 1065 contextMenu.appendSeparator();
1066 1066
1067 var urlWithoutScheme = request.parsedURL.urlWithoutScheme(); 1067 var urlWithoutScheme = request.parsedURL.urlWithoutScheme();
1068 if (urlWithoutScheme && blockedSetting.get().indexOf(urlWithoutScheme) === -1) 1068 if (urlWithoutScheme && blockedSetting.get().indexOf(urlWithoutScheme) === -1)
1069 contextMenu.appendItem( 1069 contextMenu.appendItem(
1070 WebInspector.UIString.capitalize('Block ^request URL'), addBlockedUR L.bind(null, urlWithoutScheme)); 1070 Common.UIString.capitalize('Block ^request URL'), addBlockedURL.bind (null, urlWithoutScheme));
1071 1071
1072 var domain = request.parsedURL.domain(); 1072 var domain = request.parsedURL.domain();
1073 if (domain && blockedSetting.get().indexOf(domain) === -1) 1073 if (domain && blockedSetting.get().indexOf(domain) === -1)
1074 contextMenu.appendItem( 1074 contextMenu.appendItem(
1075 WebInspector.UIString.capitalize('Block ^request ^domain'), addBlock edURL.bind(null, domain)); 1075 Common.UIString.capitalize('Block ^request ^domain'), addBlockedURL. bind(null, domain));
1076 1076
1077 function addBlockedURL(url) { 1077 function addBlockedURL(url) {
1078 var list = blockedSetting.get(); 1078 var list = blockedSetting.get();
1079 list.push(url); 1079 list.push(url);
1080 blockedSetting.set(list); 1080 blockedSetting.set(list);
1081 WebInspector.viewManager.showView('network.blocked-urls'); 1081 UI.viewManager.showView('network.blocked-urls');
1082 } 1082 }
1083 } 1083 }
1084 1084
1085 if (request && request.resourceType() === WebInspector.resourceTypes.XHR) { 1085 if (request && request.resourceType() === Common.resourceTypes.XHR) {
1086 contextMenu.appendSeparator(); 1086 contextMenu.appendSeparator();
1087 contextMenu.appendItem(WebInspector.UIString('Replay XHR'), request.replay XHR.bind(request)); 1087 contextMenu.appendItem(Common.UIString('Replay XHR'), request.replayXHR.bi nd(request));
1088 contextMenu.appendSeparator(); 1088 contextMenu.appendSeparator();
1089 } 1089 }
1090 } 1090 }
1091 1091
1092 _harRequests() { 1092 _harRequests() {
1093 var requests = this._nodesByRequestId.valuesArray().map(function(node) { 1093 var requests = this._nodesByRequestId.valuesArray().map(function(node) {
1094 return node.request(); 1094 return node.request();
1095 }); 1095 });
1096 var httpRequests = requests.filter(WebInspector.NetworkLogView.HTTPRequestsF ilter); 1096 var httpRequests = requests.filter(Network.NetworkLogView.HTTPRequestsFilter );
1097 return httpRequests.filter(WebInspector.NetworkLogView.FinishedRequestsFilte r); 1097 return httpRequests.filter(Network.NetworkLogView.FinishedRequestsFilter);
1098 } 1098 }
1099 1099
1100 _copyAll() { 1100 _copyAll() {
1101 var harArchive = {log: (new WebInspector.HARLog(this._harRequests())).build( )}; 1101 var harArchive = {log: (new SDK.HARLog(this._harRequests())).build()};
1102 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2)); 1102 InspectorFrontendHost.copyText(JSON.stringify(harArchive, null, 2));
1103 } 1103 }
1104 1104
1105 /** 1105 /**
1106 * @param {!WebInspector.NetworkRequest} request 1106 * @param {!SDK.NetworkRequest} request
1107 */ 1107 */
1108 _copyRequestHeaders(request) { 1108 _copyRequestHeaders(request) {
1109 InspectorFrontendHost.copyText(request.requestHeadersText()); 1109 InspectorFrontendHost.copyText(request.requestHeadersText());
1110 } 1110 }
1111 1111
1112 /** 1112 /**
1113 * @param {!WebInspector.NetworkRequest} request 1113 * @param {!SDK.NetworkRequest} request
1114 */ 1114 */
1115 _copyResponse(request) { 1115 _copyResponse(request) {
1116 /** 1116 /**
1117 * @param {?string} content 1117 * @param {?string} content
1118 */ 1118 */
1119 function callback(content) { 1119 function callback(content) {
1120 if (request.contentEncoded) 1120 if (request.contentEncoded)
1121 content = request.asDataURL(); 1121 content = request.asDataURL();
1122 InspectorFrontendHost.copyText(content || ''); 1122 InspectorFrontendHost.copyText(content || '');
1123 } 1123 }
1124 request.requestContent().then(callback); 1124 request.requestContent().then(callback);
1125 } 1125 }
1126 1126
1127 /** 1127 /**
1128 * @param {!WebInspector.NetworkRequest} request 1128 * @param {!SDK.NetworkRequest} request
1129 */ 1129 */
1130 _copyResponseHeaders(request) { 1130 _copyResponseHeaders(request) {
1131 InspectorFrontendHost.copyText(request.responseHeadersText); 1131 InspectorFrontendHost.copyText(request.responseHeadersText);
1132 } 1132 }
1133 1133
1134 /** 1134 /**
1135 * @param {!WebInspector.NetworkRequest} request 1135 * @param {!SDK.NetworkRequest} request
1136 * @param {string} platform 1136 * @param {string} platform
1137 */ 1137 */
1138 _copyCurlCommand(request, platform) { 1138 _copyCurlCommand(request, platform) {
1139 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ; 1139 InspectorFrontendHost.copyText(this._generateCurlCommand(request, platform)) ;
1140 } 1140 }
1141 1141
1142 /** 1142 /**
1143 * @param {string} platform 1143 * @param {string} platform
1144 */ 1144 */
1145 _copyAllCurlCommand(platform) { 1145 _copyAllCurlCommand(platform) {
1146 var requests = this._nodesByRequestId.valuesArray().map(node => node.request ()); 1146 var requests = this._nodesByRequestId.valuesArray().map(node => node.request ());
1147 var commands = []; 1147 var commands = [];
1148 for (var request of requests) 1148 for (var request of requests)
1149 commands.push(this._generateCurlCommand(request, platform)); 1149 commands.push(this._generateCurlCommand(request, platform));
1150 if (platform === 'win') 1150 if (platform === 'win')
1151 InspectorFrontendHost.copyText(commands.join(' &\r\n')); 1151 InspectorFrontendHost.copyText(commands.join(' &\r\n'));
1152 else 1152 else
1153 InspectorFrontendHost.copyText(commands.join(' ;\n')); 1153 InspectorFrontendHost.copyText(commands.join(' ;\n'));
1154 } 1154 }
1155 1155
1156 _exportAll() { 1156 _exportAll() {
1157 var url = WebInspector.targetManager.mainTarget().inspectedURL(); 1157 var url = SDK.targetManager.mainTarget().inspectedURL();
1158 var parsedURL = url.asParsedURL(); 1158 var parsedURL = url.asParsedURL();
1159 var filename = parsedURL ? parsedURL.host : 'network-log'; 1159 var filename = parsedURL ? parsedURL.host : 'network-log';
1160 var stream = new WebInspector.FileOutputStream(); 1160 var stream = new Bindings.FileOutputStream();
1161 stream.open(filename + '.har', openCallback.bind(this)); 1161 stream.open(filename + '.har', openCallback.bind(this));
1162 1162
1163 /** 1163 /**
1164 * @param {boolean} accepted 1164 * @param {boolean} accepted
1165 * @this {WebInspector.NetworkLogView} 1165 * @this {Network.NetworkLogView}
1166 */ 1166 */
1167 function openCallback(accepted) { 1167 function openCallback(accepted) {
1168 if (!accepted) 1168 if (!accepted)
1169 return; 1169 return;
1170 var progressIndicator = new WebInspector.ProgressIndicator(); 1170 var progressIndicator = new UI.ProgressIndicator();
1171 this._progressBarContainer.appendChild(progressIndicator.element); 1171 this._progressBarContainer.appendChild(progressIndicator.element);
1172 var harWriter = new WebInspector.HARWriter(); 1172 var harWriter = new Network.HARWriter();
1173 harWriter.write(stream, this._harRequests(), progressIndicator); 1173 harWriter.write(stream, this._harRequests(), progressIndicator);
1174 } 1174 }
1175 } 1175 }
1176 1176
1177 _clearBrowserCache() { 1177 _clearBrowserCache() {
1178 if (confirm(WebInspector.UIString('Are you sure you want to clear browser ca che?'))) 1178 if (confirm(Common.UIString('Are you sure you want to clear browser cache?') ))
1179 WebInspector.multitargetNetworkManager.clearBrowserCache(); 1179 SDK.multitargetNetworkManager.clearBrowserCache();
1180 } 1180 }
1181 1181
1182 _clearBrowserCookies() { 1182 _clearBrowserCookies() {
1183 if (confirm(WebInspector.UIString('Are you sure you want to clear browser co okies?'))) 1183 if (confirm(Common.UIString('Are you sure you want to clear browser cookies? ')))
1184 WebInspector.multitargetNetworkManager.clearBrowserCookies(); 1184 SDK.multitargetNetworkManager.clearBrowserCookies();
1185 } 1185 }
1186 1186
1187 /** 1187 /**
1188 * @param {!WebInspector.NetworkRequest} request 1188 * @param {!SDK.NetworkRequest} request
1189 * @return {boolean} 1189 * @return {boolean}
1190 */ 1190 */
1191 _matchRequest(request) { 1191 _matchRequest(request) {
1192 var re = this._searchRegex; 1192 var re = this._searchRegex;
1193 if (!re) 1193 if (!re)
1194 return false; 1194 return false;
1195 1195
1196 var text = this._networkLogLargeRowsSetting.get() ? request.path() + '/' + r equest.name() : request.name(); 1196 var text = this._networkLogLargeRowsSetting.get() ? request.path() + '/' + r equest.name() : request.name();
1197 return re.test(text); 1197 return re.test(text);
1198 } 1198 }
1199 1199
1200 _clearSearchMatchedList() { 1200 _clearSearchMatchedList() {
1201 this._matchedRequestCount = -1; 1201 this._matchedRequestCount = -1;
1202 this._currentMatchedRequestNode = null; 1202 this._currentMatchedRequestNode = null;
1203 this._removeAllHighlights(); 1203 this._removeAllHighlights();
1204 } 1204 }
1205 1205
1206 _removeAllHighlights() { 1206 _removeAllHighlights() {
1207 this.removeAllNodeHighlights(); 1207 this.removeAllNodeHighlights();
1208 for (var i = 0; i < this._highlightedSubstringChanges.length; ++i) 1208 for (var i = 0; i < this._highlightedSubstringChanges.length; ++i)
1209 WebInspector.revertDomChanges(this._highlightedSubstringChanges[i]); 1209 UI.revertDomChanges(this._highlightedSubstringChanges[i]);
1210 this._highlightedSubstringChanges = []; 1210 this._highlightedSubstringChanges = [];
1211 } 1211 }
1212 1212
1213 dataGridSorted() { 1213 dataGridSorted() {
1214 this._highlightNthMatchedRequestForSearch( 1214 this._highlightNthMatchedRequestForSearch(
1215 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false); 1215 this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode) , false);
1216 } 1216 }
1217 1217
1218 /** 1218 /**
1219 * @param {number} n 1219 * @param {number} n
1220 * @param {boolean} reveal 1220 * @param {boolean} reveal
1221 */ 1221 */
1222 _highlightNthMatchedRequestForSearch(n, reveal) { 1222 _highlightNthMatchedRequestForSearch(n, reveal) {
1223 this._removeAllHighlights(); 1223 this._removeAllHighlights();
1224 1224
1225 /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */ 1225 /** @type {!Array.<!Network.NetworkDataGridNode>} */
1226 var nodes = this._dataGrid.rootNode().children; 1226 var nodes = this._dataGrid.rootNode().children;
1227 var matchCount = 0; 1227 var matchCount = 0;
1228 var node = null; 1228 var node = null;
1229 for (var i = 0; i < nodes.length; ++i) { 1229 for (var i = 0; i < nodes.length; ++i) {
1230 if (nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol]) { 1230 if (nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol]) {
1231 if (matchCount === n) { 1231 if (matchCount === n) {
1232 node = nodes[i]; 1232 node = nodes[i];
1233 break; 1233 break;
1234 } 1234 }
1235 matchCount++; 1235 matchCount++;
1236 } 1236 }
1237 } 1237 }
1238 if (!node) { 1238 if (!node) {
1239 this._currentMatchedRequestNode = null; 1239 this._currentMatchedRequestNode = null;
1240 return; 1240 return;
1241 } 1241 }
1242 1242
1243 var request = node.request(); 1243 var request = node.request();
1244 if (reveal) 1244 if (reveal)
1245 WebInspector.Revealer.reveal(request); 1245 Common.Revealer.reveal(request);
1246 var highlightedSubstringChanges = node.highlightMatchedSubstring(this._searc hRegex); 1246 var highlightedSubstringChanges = node.highlightMatchedSubstring(this._searc hRegex);
1247 this._highlightedSubstringChanges.push(highlightedSubstringChanges); 1247 this._highlightedSubstringChanges.push(highlightedSubstringChanges);
1248 1248
1249 this._currentMatchedRequestNode = node; 1249 this._currentMatchedRequestNode = node;
1250 this._currentMatchedRequestIndex = n; 1250 this._currentMatchedRequestIndex = n;
1251 this.dispatchEventToListeners(WebInspector.NetworkLogView.Events.SearchIndex Updated, n); 1251 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchIndexUpdat ed, n);
1252 } 1252 }
1253 1253
1254 /** 1254 /**
1255 * @override 1255 * @override
1256 * @param {!WebInspector.SearchableView.SearchConfig} searchConfig 1256 * @param {!UI.SearchableView.SearchConfig} searchConfig
1257 * @param {boolean} shouldJump 1257 * @param {boolean} shouldJump
1258 * @param {boolean=} jumpBackwards 1258 * @param {boolean=} jumpBackwards
1259 */ 1259 */
1260 performSearch(searchConfig, shouldJump, jumpBackwards) { 1260 performSearch(searchConfig, shouldJump, jumpBackwards) {
1261 var query = searchConfig.query; 1261 var query = searchConfig.query;
1262 var currentMatchedRequestNode = this._currentMatchedRequestNode; 1262 var currentMatchedRequestNode = this._currentMatchedRequestNode;
1263 this._clearSearchMatchedList(); 1263 this._clearSearchMatchedList();
1264 this._searchRegex = createPlainTextSearchRegex(query, 'i'); 1264 this._searchRegex = createPlainTextSearchRegex(query, 'i');
1265 1265
1266 /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */ 1266 /** @type {!Array.<!Network.NetworkDataGridNode>} */
1267 var nodes = this._dataGrid.rootNode().children; 1267 var nodes = this._dataGrid.rootNode().children;
1268 for (var i = 0; i < nodes.length; ++i) 1268 for (var i = 0; i < nodes.length; ++i)
1269 nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol] = this. _matchRequest(nodes[i].request()); 1269 nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matc hRequest(nodes[i].request());
1270 var newMatchedRequestIndex = this._updateMatchCountAndFindMatchIndex(current MatchedRequestNode); 1270 var newMatchedRequestIndex = this._updateMatchCountAndFindMatchIndex(current MatchedRequestNode);
1271 if (!newMatchedRequestIndex && jumpBackwards) 1271 if (!newMatchedRequestIndex && jumpBackwards)
1272 newMatchedRequestIndex = this._matchedRequestCount - 1; 1272 newMatchedRequestIndex = this._matchedRequestCount - 1;
1273 this._highlightNthMatchedRequestForSearch(newMatchedRequestIndex, shouldJump ); 1273 this._highlightNthMatchedRequestForSearch(newMatchedRequestIndex, shouldJump );
1274 } 1274 }
1275 1275
1276 /** 1276 /**
1277 * @override 1277 * @override
1278 * @return {boolean} 1278 * @return {boolean}
1279 */ 1279 */
1280 supportsCaseSensitiveSearch() { 1280 supportsCaseSensitiveSearch() {
1281 return false; 1281 return false;
1282 } 1282 }
1283 1283
1284 /** 1284 /**
1285 * @override 1285 * @override
1286 * @return {boolean} 1286 * @return {boolean}
1287 */ 1287 */
1288 supportsRegexSearch() { 1288 supportsRegexSearch() {
1289 return true; 1289 return true;
1290 } 1290 }
1291 1291
1292 /** 1292 /**
1293 * @param {?WebInspector.NetworkDataGridNode} node 1293 * @param {?Network.NetworkDataGridNode} node
1294 * @return {number} 1294 * @return {number}
1295 */ 1295 */
1296 _updateMatchCountAndFindMatchIndex(node) { 1296 _updateMatchCountAndFindMatchIndex(node) {
1297 /** @type {!Array.<!WebInspector.NetworkDataGridNode>} */ 1297 /** @type {!Array.<!Network.NetworkDataGridNode>} */
1298 var nodes = this._dataGrid.rootNode().children; 1298 var nodes = this._dataGrid.rootNode().children;
1299 var matchCount = 0; 1299 var matchCount = 0;
1300 var matchIndex = 0; 1300 var matchIndex = 0;
1301 for (var i = 0; i < nodes.length; ++i) { 1301 for (var i = 0; i < nodes.length; ++i) {
1302 if (!nodes[i][WebInspector.NetworkLogView._isMatchingSearchQuerySymbol]) 1302 if (!nodes[i][Network.NetworkLogView._isMatchingSearchQuerySymbol])
1303 continue; 1303 continue;
1304 if (node === nodes[i]) 1304 if (node === nodes[i])
1305 matchIndex = matchCount; 1305 matchIndex = matchCount;
1306 matchCount++; 1306 matchCount++;
1307 } 1307 }
1308 if (this._matchedRequestCount !== matchCount) { 1308 if (this._matchedRequestCount !== matchCount) {
1309 this._matchedRequestCount = matchCount; 1309 this._matchedRequestCount = matchCount;
1310 this.dispatchEventToListeners(WebInspector.NetworkLogView.Events.SearchCou ntUpdated, matchCount); 1310 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpd ated, matchCount);
1311 } 1311 }
1312 return matchIndex; 1312 return matchIndex;
1313 } 1313 }
1314 1314
1315 /** 1315 /**
1316 * @param {number} index 1316 * @param {number} index
1317 * @return {number} 1317 * @return {number}
1318 */ 1318 */
1319 _normalizeSearchResultIndex(index) { 1319 _normalizeSearchResultIndex(index) {
1320 return (index + this._matchedRequestCount) % this._matchedRequestCount; 1320 return (index + this._matchedRequestCount) % this._matchedRequestCount;
1321 } 1321 }
1322 1322
1323 /** 1323 /**
1324 * @param {!WebInspector.NetworkDataGridNode} node 1324 * @param {!Network.NetworkDataGridNode} node
1325 * @return {boolean} 1325 * @return {boolean}
1326 */ 1326 */
1327 _applyFilter(node) { 1327 _applyFilter(node) {
1328 var request = node.request(); 1328 var request = node.request();
1329 if (this._timeFilter && !this._timeFilter(request)) 1329 if (this._timeFilter && !this._timeFilter(request))
1330 return false; 1330 return false;
1331 var categoryName = request.resourceType().category().title; 1331 var categoryName = request.resourceType().category().title;
1332 if (!this._resourceCategoryFilterUI.accept(categoryName)) 1332 if (!this._resourceCategoryFilterUI.accept(categoryName))
1333 return false; 1333 return false;
1334 if (this._dataURLFilterUI.checked() && request.parsedURL.isDataURL()) 1334 if (this._dataURLFilterUI.checked() && request.parsedURL.isDataURL())
(...skipping 15 matching lines...) Expand all
1350 if (this._textFilterUI.isRegexChecked() && query !== '') 1350 if (this._textFilterUI.isRegexChecked() && query !== '')
1351 parsedQuery = {text: [query], filters: []}; 1351 parsedQuery = {text: [query], filters: []};
1352 else 1352 else
1353 parsedQuery = this._suggestionBuilder.parseQuery(query); 1353 parsedQuery = this._suggestionBuilder.parseQuery(query);
1354 1354
1355 this._filters = parsedQuery.text.map(this._createTextFilter, this); 1355 this._filters = parsedQuery.text.map(this._createTextFilter, this);
1356 1356
1357 var n = parsedQuery.filters.length; 1357 var n = parsedQuery.filters.length;
1358 for (var i = 0; i < n; ++i) { 1358 for (var i = 0; i < n; ++i) {
1359 var filter = parsedQuery.filters[i]; 1359 var filter = parsedQuery.filters[i];
1360 var filterType = /** @type {!WebInspector.NetworkLogView.FilterType} */ (f ilter.type.toLowerCase()); 1360 var filterType = /** @type {!Network.NetworkLogView.FilterType} */ (filter .type.toLowerCase());
1361 this._filters.push(this._createFilter(filterType, filter.data, filter.nega tive)); 1361 this._filters.push(this._createFilter(filterType, filter.data, filter.nega tive));
1362 } 1362 }
1363 } 1363 }
1364 1364
1365 /** 1365 /**
1366 * @param {string} text 1366 * @param {string} text
1367 * @return {!WebInspector.NetworkLogView.Filter} 1367 * @return {!Network.NetworkLogView.Filter}
1368 */ 1368 */
1369 _createTextFilter(text) { 1369 _createTextFilter(text) {
1370 var negative = false; 1370 var negative = false;
1371 /** @type {?RegExp} */ 1371 /** @type {?RegExp} */
1372 var regex; 1372 var regex;
1373 if (!this._textFilterUI.isRegexChecked() && text[0] === '-' && text.length > 1) { 1373 if (!this._textFilterUI.isRegexChecked() && text[0] === '-' && text.length > 1) {
1374 negative = true; 1374 negative = true;
1375 text = text.substring(1); 1375 text = text.substring(1);
1376 regex = new RegExp(text.escapeForRegExp(), 'i'); 1376 regex = new RegExp(text.escapeForRegExp(), 'i');
1377 } else { 1377 } else {
1378 regex = this._textFilterUI.regex(); 1378 regex = this._textFilterUI.regex();
1379 } 1379 }
1380 1380
1381 var filter = WebInspector.NetworkLogView._requestPathFilter.bind(null, regex ); 1381 var filter = Network.NetworkLogView._requestPathFilter.bind(null, regex);
1382 if (negative) 1382 if (negative)
1383 filter = WebInspector.NetworkLogView._negativeFilter.bind(null, filter); 1383 filter = Network.NetworkLogView._negativeFilter.bind(null, filter);
1384 return filter; 1384 return filter;
1385 } 1385 }
1386 1386
1387 /** 1387 /**
1388 * @param {!WebInspector.NetworkLogView.FilterType} type 1388 * @param {!Network.NetworkLogView.FilterType} type
1389 * @param {string} value 1389 * @param {string} value
1390 * @param {boolean} negative 1390 * @param {boolean} negative
1391 * @return {!WebInspector.NetworkLogView.Filter} 1391 * @return {!Network.NetworkLogView.Filter}
1392 */ 1392 */
1393 _createFilter(type, value, negative) { 1393 _createFilter(type, value, negative) {
1394 var filter = this._createSpecialFilter(type, value); 1394 var filter = this._createSpecialFilter(type, value);
1395 if (!filter) 1395 if (!filter)
1396 return this._createTextFilter((negative ? '-' : '') + type + ':' + value); 1396 return this._createTextFilter((negative ? '-' : '') + type + ':' + value);
1397 if (negative) 1397 if (negative)
1398 return WebInspector.NetworkLogView._negativeFilter.bind(null, filter); 1398 return Network.NetworkLogView._negativeFilter.bind(null, filter);
1399 return filter; 1399 return filter;
1400 } 1400 }
1401 1401
1402 /** 1402 /**
1403 * @param {!WebInspector.NetworkLogView.FilterType} type 1403 * @param {!Network.NetworkLogView.FilterType} type
1404 * @param {string} value 1404 * @param {string} value
1405 * @return {?WebInspector.NetworkLogView.Filter} 1405 * @return {?Network.NetworkLogView.Filter}
1406 */ 1406 */
1407 _createSpecialFilter(type, value) { 1407 _createSpecialFilter(type, value) {
1408 switch (type) { 1408 switch (type) {
1409 case WebInspector.NetworkLogView.FilterType.Domain: 1409 case Network.NetworkLogView.FilterType.Domain:
1410 return WebInspector.NetworkLogView._createRequestDomainFilter(value); 1410 return Network.NetworkLogView._createRequestDomainFilter(value);
1411 1411
1412 case WebInspector.NetworkLogView.FilterType.HasResponseHeader: 1412 case Network.NetworkLogView.FilterType.HasResponseHeader:
1413 return WebInspector.NetworkLogView._requestResponseHeaderFilter.bind(nul l, value); 1413 return Network.NetworkLogView._requestResponseHeaderFilter.bind(null, va lue);
1414 1414
1415 case WebInspector.NetworkLogView.FilterType.Is: 1415 case Network.NetworkLogView.FilterType.Is:
1416 if (value.toLowerCase() === WebInspector.NetworkLogView.IsFilterType.Run ning) 1416 if (value.toLowerCase() === Network.NetworkLogView.IsFilterType.Running)
1417 return WebInspector.NetworkLogView._runningRequestFilter; 1417 return Network.NetworkLogView._runningRequestFilter;
1418 break; 1418 break;
1419 1419
1420 case WebInspector.NetworkLogView.FilterType.LargerThan: 1420 case Network.NetworkLogView.FilterType.LargerThan:
1421 return this._createSizeFilter(value.toLowerCase()); 1421 return this._createSizeFilter(value.toLowerCase());
1422 1422
1423 case WebInspector.NetworkLogView.FilterType.Method: 1423 case Network.NetworkLogView.FilterType.Method:
1424 return WebInspector.NetworkLogView._requestMethodFilter.bind(null, value ); 1424 return Network.NetworkLogView._requestMethodFilter.bind(null, value);
1425 1425
1426 case WebInspector.NetworkLogView.FilterType.MimeType: 1426 case Network.NetworkLogView.FilterType.MimeType:
1427 return WebInspector.NetworkLogView._requestMimeTypeFilter.bind(null, val ue); 1427 return Network.NetworkLogView._requestMimeTypeFilter.bind(null, value);
1428 1428
1429 case WebInspector.NetworkLogView.FilterType.MixedContent: 1429 case Network.NetworkLogView.FilterType.MixedContent:
1430 return WebInspector.NetworkLogView._requestMixedContentFilter.bind( 1430 return Network.NetworkLogView._requestMixedContentFilter.bind(
1431 null, /** @type {!WebInspector.NetworkLogView.MixedContentFilterValu es} */ (value)); 1431 null, /** @type {!Network.NetworkLogView.MixedContentFilterValues} * / (value));
1432 1432
1433 case WebInspector.NetworkLogView.FilterType.Scheme: 1433 case Network.NetworkLogView.FilterType.Scheme:
1434 return WebInspector.NetworkLogView._requestSchemeFilter.bind(null, value ); 1434 return Network.NetworkLogView._requestSchemeFilter.bind(null, value);
1435 1435
1436 case WebInspector.NetworkLogView.FilterType.SetCookieDomain: 1436 case Network.NetworkLogView.FilterType.SetCookieDomain:
1437 return WebInspector.NetworkLogView._requestSetCookieDomainFilter.bind(nu ll, value); 1437 return Network.NetworkLogView._requestSetCookieDomainFilter.bind(null, v alue);
1438 1438
1439 case WebInspector.NetworkLogView.FilterType.SetCookieName: 1439 case Network.NetworkLogView.FilterType.SetCookieName:
1440 return WebInspector.NetworkLogView._requestSetCookieNameFilter.bind(null , value); 1440 return Network.NetworkLogView._requestSetCookieNameFilter.bind(null, val ue);
1441 1441
1442 case WebInspector.NetworkLogView.FilterType.SetCookieValue: 1442 case Network.NetworkLogView.FilterType.SetCookieValue:
1443 return WebInspector.NetworkLogView._requestSetCookieValueFilter.bind(nul l, value); 1443 return Network.NetworkLogView._requestSetCookieValueFilter.bind(null, va lue);
1444 1444
1445 case WebInspector.NetworkLogView.FilterType.StatusCode: 1445 case Network.NetworkLogView.FilterType.StatusCode:
1446 return WebInspector.NetworkLogView._statusCodeFilter.bind(null, value); 1446 return Network.NetworkLogView._statusCodeFilter.bind(null, value);
1447 } 1447 }
1448 return null; 1448 return null;
1449 } 1449 }
1450 1450
1451 /** 1451 /**
1452 * @param {string} value 1452 * @param {string} value
1453 * @return {?WebInspector.NetworkLogView.Filter} 1453 * @return {?Network.NetworkLogView.Filter}
1454 */ 1454 */
1455 _createSizeFilter(value) { 1455 _createSizeFilter(value) {
1456 var multiplier = 1; 1456 var multiplier = 1;
1457 if (value.endsWith('k')) { 1457 if (value.endsWith('k')) {
1458 multiplier = 1024; 1458 multiplier = 1024;
1459 value = value.substring(0, value.length - 1); 1459 value = value.substring(0, value.length - 1);
1460 } else if (value.endsWith('m')) { 1460 } else if (value.endsWith('m')) {
1461 multiplier = 1024 * 1024; 1461 multiplier = 1024 * 1024;
1462 value = value.substring(0, value.length - 1); 1462 value = value.substring(0, value.length - 1);
1463 } 1463 }
1464 var quantity = Number(value); 1464 var quantity = Number(value);
1465 if (isNaN(quantity)) 1465 if (isNaN(quantity))
1466 return null; 1466 return null;
1467 return WebInspector.NetworkLogView._requestSizeLargerThanFilter.bind(null, q uantity * multiplier); 1467 return Network.NetworkLogView._requestSizeLargerThanFilter.bind(null, quanti ty * multiplier);
1468 } 1468 }
1469 1469
1470 _filterRequests() { 1470 _filterRequests() {
1471 this._removeAllHighlights(); 1471 this._removeAllHighlights();
1472 this._invalidateAllItems(); 1472 this._invalidateAllItems();
1473 } 1473 }
1474 1474
1475 /** 1475 /**
1476 * @override 1476 * @override
1477 */ 1477 */
(...skipping 13 matching lines...) Expand all
1491 var index = this._normalizeSearchResultIndex(this._currentMatchedRequestInde x + 1); 1491 var index = this._normalizeSearchResultIndex(this._currentMatchedRequestInde x + 1);
1492 this._highlightNthMatchedRequestForSearch(index, true); 1492 this._highlightNthMatchedRequestForSearch(index, true);
1493 } 1493 }
1494 1494
1495 /** 1495 /**
1496 * @override 1496 * @override
1497 */ 1497 */
1498 searchCanceled() { 1498 searchCanceled() {
1499 delete this._searchRegex; 1499 delete this._searchRegex;
1500 this._clearSearchMatchedList(); 1500 this._clearSearchMatchedList();
1501 this.dispatchEventToListeners(WebInspector.NetworkLogView.Events.SearchCount Updated, 0); 1501 this.dispatchEventToListeners(Network.NetworkLogView.Events.SearchCountUpdat ed, 0);
1502 } 1502 }
1503 1503
1504 /** 1504 /**
1505 * @param {!WebInspector.NetworkRequest} request 1505 * @param {!SDK.NetworkRequest} request
1506 */ 1506 */
1507 revealAndHighlightRequest(request) { 1507 revealAndHighlightRequest(request) {
1508 this.removeAllNodeHighlights(); 1508 this.removeAllNodeHighlights();
1509 1509
1510 var node = this._nodesByRequestId.get(request.requestId); 1510 var node = this._nodesByRequestId.get(request.requestId);
1511 if (node) { 1511 if (node) {
1512 node.reveal(); 1512 node.reveal();
1513 this._highlightNode(node); 1513 this._highlightNode(node);
1514 } 1514 }
1515 } 1515 }
1516 1516
1517 removeAllNodeHighlights() { 1517 removeAllNodeHighlights() {
1518 if (this._highlightedNode) { 1518 if (this._highlightedNode) {
1519 this._highlightedNode.element().classList.remove('highlighted-row'); 1519 this._highlightedNode.element().classList.remove('highlighted-row');
1520 delete this._highlightedNode; 1520 delete this._highlightedNode;
1521 } 1521 }
1522 } 1522 }
1523 1523
1524 /** 1524 /**
1525 * @param {!WebInspector.NetworkDataGridNode} node 1525 * @param {!Network.NetworkDataGridNode} node
1526 */ 1526 */
1527 _highlightNode(node) { 1527 _highlightNode(node) {
1528 WebInspector.runCSSAnimationOnce(node.element(), 'highlighted-row'); 1528 UI.runCSSAnimationOnce(node.element(), 'highlighted-row');
1529 this._highlightedNode = node; 1529 this._highlightedNode = node;
1530 } 1530 }
1531 1531
1532 /** 1532 /**
1533 * @param {!WebInspector.NetworkRequest} request 1533 * @param {!SDK.NetworkRequest} request
1534 * @param {string} platform 1534 * @param {string} platform
1535 * @return {string} 1535 * @return {string}
1536 */ 1536 */
1537 _generateCurlCommand(request, platform) { 1537 _generateCurlCommand(request, platform) {
1538 var command = ['curl']; 1538 var command = ['curl'];
1539 // These headers are derived from URL (except "version") and would be added by cURL anyway. 1539 // These headers are derived from URL (except "version") and would be added by cURL anyway.
1540 var ignoredHeaders = {'host': 1, 'method': 1, 'path': 1, 'scheme': 1, 'versi on': 1}; 1540 var ignoredHeaders = {'host': 1, 'method': 1, 'path': 1, 'scheme': 1, 'versi on': 1};
1541 1541
1542 function escapeStringWin(str) { 1542 function escapeStringWin(str) {
1543 /* If there are no new line characters do not escape the " characters 1543 /* If there are no new line characters do not escape the " characters
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 } 1641 }
1642 command = command.concat(data); 1642 command = command.concat(data);
1643 command.push('--compressed'); 1643 command.push('--compressed');
1644 1644
1645 if (request.securityState() === Protocol.Security.SecurityState.Insecure) 1645 if (request.securityState() === Protocol.Security.SecurityState.Insecure)
1646 command.push('--insecure'); 1646 command.push('--insecure');
1647 return command.join(' '); 1647 return command.join(' ');
1648 } 1648 }
1649 }; 1649 };
1650 1650
1651 WebInspector.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut'); 1651 Network.NetworkLogView._isFilteredOutSymbol = Symbol('isFilteredOut');
1652 WebInspector.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSea rchQuery'); 1652 Network.NetworkLogView._isMatchingSearchQuerySymbol = Symbol('isMatchingSearchQu ery');
1653 1653
1654 WebInspector.NetworkLogView.HTTPSchemas = { 1654 Network.NetworkLogView.HTTPSchemas = {
1655 'http': true, 1655 'http': true,
1656 'https': true, 1656 'https': true,
1657 'ws': true, 1657 'ws': true,
1658 'wss': true 1658 'wss': true
1659 }; 1659 };
1660 1660
1661 WebInspector.NetworkLogView._waterfallMinOvertime = 1; 1661 Network.NetworkLogView._waterfallMinOvertime = 1;
1662 WebInspector.NetworkLogView._waterfallMaxOvertime = 3; 1662 Network.NetworkLogView._waterfallMaxOvertime = 3;
1663 1663
1664 /** @enum {symbol} */ 1664 /** @enum {symbol} */
1665 WebInspector.NetworkLogView.Events = { 1665 Network.NetworkLogView.Events = {
1666 RequestSelected: Symbol('RequestSelected'), 1666 RequestSelected: Symbol('RequestSelected'),
1667 SearchCountUpdated: Symbol('SearchCountUpdated'), 1667 SearchCountUpdated: Symbol('SearchCountUpdated'),
1668 SearchIndexUpdated: Symbol('SearchIndexUpdated'), 1668 SearchIndexUpdated: Symbol('SearchIndexUpdated'),
1669 UpdateRequest: Symbol('UpdateRequest') 1669 UpdateRequest: Symbol('UpdateRequest')
1670 }; 1670 };
1671 1671
1672 /** @enum {string} */ 1672 /** @enum {string} */
1673 WebInspector.NetworkLogView.FilterType = { 1673 Network.NetworkLogView.FilterType = {
1674 Domain: 'domain', 1674 Domain: 'domain',
1675 HasResponseHeader: 'has-response-header', 1675 HasResponseHeader: 'has-response-header',
1676 Is: 'is', 1676 Is: 'is',
1677 LargerThan: 'larger-than', 1677 LargerThan: 'larger-than',
1678 Method: 'method', 1678 Method: 'method',
1679 MimeType: 'mime-type', 1679 MimeType: 'mime-type',
1680 MixedContent: 'mixed-content', 1680 MixedContent: 'mixed-content',
1681 Scheme: 'scheme', 1681 Scheme: 'scheme',
1682 SetCookieDomain: 'set-cookie-domain', 1682 SetCookieDomain: 'set-cookie-domain',
1683 SetCookieName: 'set-cookie-name', 1683 SetCookieName: 'set-cookie-name',
1684 SetCookieValue: 'set-cookie-value', 1684 SetCookieValue: 'set-cookie-value',
1685 StatusCode: 'status-code' 1685 StatusCode: 'status-code'
1686 }; 1686 };
1687 1687
1688 /** @enum {string} */ 1688 /** @enum {string} */
1689 WebInspector.NetworkLogView.MixedContentFilterValues = { 1689 Network.NetworkLogView.MixedContentFilterValues = {
1690 All: 'all', 1690 All: 'all',
1691 Displayed: 'displayed', 1691 Displayed: 'displayed',
1692 Blocked: 'blocked', 1692 Blocked: 'blocked',
1693 BlockOverridden: 'block-overridden' 1693 BlockOverridden: 'block-overridden'
1694 }; 1694 };
1695 1695
1696 /** @enum {string} */ 1696 /** @enum {string} */
1697 WebInspector.NetworkLogView.IsFilterType = { 1697 Network.NetworkLogView.IsFilterType = {
1698 Running: 'running' 1698 Running: 'running'
1699 }; 1699 };
1700 1700
1701 /** @type {!Array<string>} */ 1701 /** @type {!Array<string>} */
1702 WebInspector.NetworkLogView._searchKeys = 1702 Network.NetworkLogView._searchKeys =
1703 Object.keys(WebInspector.NetworkLogView.FilterType).map(key => WebInspector. NetworkLogView.FilterType[key]); 1703 Object.keys(Network.NetworkLogView.FilterType).map(key => Network.NetworkLog View.FilterType[key]);
1704 1704
1705 /** @typedef {function(!WebInspector.NetworkRequest): boolean} */ 1705 /** @typedef {function(!SDK.NetworkRequest): boolean} */
1706 WebInspector.NetworkLogView.Filter; 1706 Network.NetworkLogView.Filter;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698