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

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.js

Issue 2749043005: [DevTools] Make NetworkLog a singleton, and not an SDKModel (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) 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 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (!target.parentTarget()) { 393 if (!target.parentTarget()) {
394 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target); 394 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
395 if (resourceTreeModel) { 395 if (resourceTreeModel) {
396 resourceTreeModel.addEventListener( 396 resourceTreeModel.addEventListener(
397 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this); 397 SDK.ResourceTreeModel.Events.MainFrameNavigated, this._mainFrameNavi gated, this);
398 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th is._loadEventFired, this); 398 resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, th is._loadEventFired, this);
399 resourceTreeModel.addEventListener( 399 resourceTreeModel.addEventListener(
400 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this); 400 SDK.ResourceTreeModel.Events.DOMContentLoaded, this._domContentLoade dEventFired, this);
401 } 401 }
402 } 402 }
403 var networkLog = SDK.NetworkLog.fromTarget(target); 403 SDK.networkLog.requestsForTarget(target).forEach(this._appendRequest.bind(th is));
404 if (networkLog)
405 networkLog.requests().forEach(this._appendRequest.bind(this));
406 } 404 }
407 405
408 /** 406 /**
409 * @override 407 * @override
410 * @param {!SDK.Target} target 408 * @param {!SDK.Target} target
411 */ 409 */
412 targetRemoved(target) { 410 targetRemoved(target) {
413 if (!target.parentTarget()) { 411 if (!target.parentTarget()) {
414 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target); 412 var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target);
415 if (resourceTreeModel) { 413 if (resourceTreeModel) {
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 */ 1017 */
1020 _mainFrameNavigated(event) { 1018 _mainFrameNavigated(event) {
1021 if (!this._recording) 1019 if (!this._recording)
1022 return; 1020 return;
1023 1021
1024 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data); 1022 var frame = /** @type {!SDK.ResourceTreeFrame} */ (event.data);
1025 var loaderId = frame.loaderId; 1023 var loaderId = frame.loaderId;
1026 1024
1027 // Pick provisional load requests. 1025 // Pick provisional load requests.
1028 var requestsToPick = []; 1026 var requestsToPick = [];
1029 var networkLog = SDK.NetworkLog.fromTarget(frame.target()); 1027 var requests = SDK.networkLog.requestsForTarget(frame.target());
1030 var requests = networkLog ? networkLog.requests() : [];
1031 for (var i = 0; i < requests.length; ++i) { 1028 for (var i = 0; i < requests.length; ++i) {
1032 var request = requests[i]; 1029 var request = requests[i];
1033 if (request.loaderId === loaderId) 1030 if (request.loaderId === loaderId)
1034 requestsToPick.push(request); 1031 requestsToPick.push(request);
1035 } 1032 }
1036 1033
1037 if (!this._preserveLog) { 1034 if (!this._preserveLog) {
1038 this.reset(); 1035 this.reset();
1039 for (var i = 0; i < requestsToPick.length; ++i) 1036 for (var i = 0; i < requestsToPick.length; ++i)
1040 this._appendRequest(requestsToPick[i]); 1037 this._appendRequest(requestsToPick[i]);
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1795 */ 1792 */
1796 Network.NetworkGroupLookupInterface = function() {}; 1793 Network.NetworkGroupLookupInterface = function() {};
1797 1794
1798 Network.NetworkGroupLookupInterface.prototype = { 1795 Network.NetworkGroupLookupInterface.prototype = {
1799 /** 1796 /**
1800 * @param {!SDK.NetworkRequest} request 1797 * @param {!SDK.NetworkRequest} request
1801 * @return {?string} 1798 * @return {?string}
1802 */ 1799 */
1803 lookup(request) {} 1800 lookup(request) {}
1804 }; 1801 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698