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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js

Issue 2758963002: [DevTools] Remove dependency from TargetManager to ResourceTreeModel (Closed)
Patch Set: review comments addressed Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 modelAdded(networkManager) { 49 modelAdded(networkManager) {
50 var eventListeners = []; 50 var eventListeners = [];
51 eventListeners.push( 51 eventListeners.push(
52 networkManager.addEventListener(SDK.NetworkManager.Events.RequestStarted , this._onRequestStarted, this)); 52 networkManager.addEventListener(SDK.NetworkManager.Events.RequestStarted , this._onRequestStarted, this));
53 eventListeners.push(networkManager.on(SDK.NetworkManager.RequestRedirectEven t, this._onRequestRedirect, this)); 53 eventListeners.push(networkManager.on(SDK.NetworkManager.RequestRedirectEven t, this._onRequestRedirect, this));
54 54
55 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel) ; 55 var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel) ;
56 if (resourceTreeModel) { 56 if (resourceTreeModel) {
57 eventListeners.push(resourceTreeModel.addEventListener( 57 eventListeners.push(resourceTreeModel.addEventListener(
58 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavi gated, this)); 58 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavi gated, this));
59 eventListeners.push(resourceTreeModel.addEventListener( 59 eventListeners.push(resourceTreeModel.addEventListener(SDK.ResourceTreeMod el.Events.Load, this._onLoad, this));
60 SDK.ResourceTreeModel.Events.Load, this._onLoad.bind(this, resourceTre eModel)));
61 eventListeners.push(resourceTreeModel.addEventListener( 60 eventListeners.push(resourceTreeModel.addEventListener(
62 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._onDOMContentLoade d.bind(this, resourceTreeModel))); 61 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._onDOMContentLoade d.bind(this, resourceTreeModel)));
63 } 62 }
64 63
65 networkManager[NetworkLog.NetworkLog._events] = eventListeners; 64 networkManager[NetworkLog.NetworkLog._events] = eventListeners;
66 this._requestsByTargetAndId.set(networkManager.target(), new Map()); 65 this._requestsByTargetAndId.set(networkManager.target(), new Map());
67 } 66 }
68 67
69 /** 68 /**
70 * @override 69 * @override
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 * @param {!SDK.ResourceTreeModel} resourceTreeModel 284 * @param {!SDK.ResourceTreeModel} resourceTreeModel
286 * @param {!Common.Event} event 285 * @param {!Common.Event} event
287 */ 286 */
288 _onDOMContentLoaded(resourceTreeModel, event) { 287 _onDOMContentLoaded(resourceTreeModel, event) {
289 var pageLoad = this._currentPageLoad.get(resourceTreeModel.target()); 288 var pageLoad = this._currentPageLoad.get(resourceTreeModel.target());
290 if (pageLoad) 289 if (pageLoad)
291 pageLoad.contentLoadTime = /** @type {number} */ (event.data); 290 pageLoad.contentLoadTime = /** @type {number} */ (event.data);
292 } 291 }
293 292
294 /** 293 /**
295 * @param {!SDK.ResourceTreeModel} resourceTreeModel
296 * @param {!Common.Event} event 294 * @param {!Common.Event} event
297 */ 295 */
298 _onLoad(resourceTreeModel, event) { 296 _onLoad(event) {
299 var pageLoad = this._currentPageLoad.get(resourceTreeModel.target()); 297 var pageLoad = this._currentPageLoad.get(event.data.resourceTreeModel.target ());
300 if (pageLoad) 298 if (pageLoad)
301 pageLoad.loadTime = /** @type {number} */ (event.data); 299 pageLoad.loadTime = /** @type {number} */ (event.data.loadTime);
302 } 300 }
303 301
304 /** 302 /**
305 * @param {!SDK.Target} target 303 * @param {!SDK.Target} target
306 * @param {!Protocol.Network.RequestId} requestId 304 * @param {!Protocol.Network.RequestId} requestId
307 * @return {?SDK.NetworkRequest} 305 * @return {?SDK.NetworkRequest}
308 */ 306 */
309 requestForId(target, requestId) { 307 requestForId(target, requestId) {
310 var map = this._requestsByTargetAndId.get(target); 308 var map = this._requestsByTargetAndId.get(target);
311 return map ? (map.get(requestId) || null) : null; 309 return map ? (map.get(requestId) || null) : null;
(...skipping 22 matching lines...) Expand all
334 332
335 /** @typedef {!{type: !SDK.NetworkRequest.InitiatorType, url: string, lineNumber : number, columnNumber: number, scriptId: ?string}} */ 333 /** @typedef {!{type: !SDK.NetworkRequest.InitiatorType, url: string, lineNumber : number, columnNumber: number, scriptId: ?string}} */
336 NetworkLog.NetworkLog._InitiatorInfo; 334 NetworkLog.NetworkLog._InitiatorInfo;
337 335
338 NetworkLog.NetworkLog._initiatorDataSymbol = Symbol('InitiatorData'); 336 NetworkLog.NetworkLog._initiatorDataSymbol = Symbol('InitiatorData');
339 NetworkLog.NetworkLog._pageLoadForRequestSymbol = Symbol('PageLoadForRequest'); 337 NetworkLog.NetworkLog._pageLoadForRequestSymbol = Symbol('PageLoadForRequest');
340 NetworkLog.NetworkLog._events = Symbol('NetworkLog.NetworkLog.events'); 338 NetworkLog.NetworkLog._events = Symbol('NetworkLog.NetworkLog.events');
341 339
342 /** @type {!NetworkLog.NetworkLog} */ 340 /** @type {!NetworkLog.NetworkLog} */
343 NetworkLog.networkLog; 341 NetworkLog.networkLog;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698