Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js |
| index 7c0afd8307e6dc21e6597585369ab1fe4dc6c1d3..e7ab517c89fba77cea52daacace58a0d54ee082c 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js |
| @@ -32,17 +32,31 @@ |
| * @constructor |
| * @extends {WebInspector.SDKObject} |
| * @param {!WebInspector.Target} target |
| + * @param {!WebInspector.NetworkManager} networkManager |
| */ |
| -WebInspector.NetworkLog = function(target) |
| +WebInspector.NetworkLog = function(target, networkManager) |
| { |
| WebInspector.SDKObject.call(this, target); |
| this._requests = []; |
| this._requestForId = {}; |
| - target.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestStarted, this._onRequestStarted, this); |
| + networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestStarted, this._onRequestStarted, this); |
| target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._onMainFrameNavigated, this); |
| target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._onLoad, this); |
| target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.DOMContentLoaded, this._onDOMContentLoaded, this); |
| + console.assert(!target[WebInspector.NetworkLog._symbol]); |
| + target[WebInspector.NetworkLog._symbol] = this; |
| +} |
| + |
| +WebInspector.NetworkLog._symbol = Symbol("NetworkLog"); |
| + |
| +/** |
| + * @param {!WebInspector.Target} target |
| + * @return {?WebInspector.NetworkLog} |
| + */ |
| +WebInspector.NetworkLog.fromTarget = function(target) |
| +{ |
| + return target[WebInspector.NetworkLog._symbol] || null; |
|
dgozman
2016/07/05 17:54:31
Let's use target.model(WebInspector.NetworkLog). S
eostroukhov-old
2016/07/06 20:37:53
Done. Note that this required changing the supercl
|
| } |
| /** |
| @@ -52,7 +66,8 @@ WebInspector.NetworkLog = function(target) |
| WebInspector.NetworkLog.requestForURL = function(url) |
| { |
| for (var target of WebInspector.targetManager.targets()) { |
| - var result = target.networkLog.requestForURL(url); |
| + var networkLog = WebInspector.NetworkLog.fromTarget(target); |
| + var result = networkLog && networkLog.requestForURL(url); |
| if (result) |
| return result; |
| } |
| @@ -66,7 +81,9 @@ WebInspector.NetworkLog.requests = function() |
| { |
| var result = []; |
| for (var target of WebInspector.targetManager.targets()) { |
| - result = result.concat(target.networkLog.requests()); |
| + var networkLog = WebInspector.NetworkLog.fromTarget(target); |
| + if (networkLog) |
| + result = result.concat(networkLog.requests()); |
| } |
| return result; |
| } |