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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js

Issue 2109813003: [DevTools] No NetworkManager and NetworkLog for v8only mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass NetworkManager as a ctor parameter, to ensure proper initialization order. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
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..d0cbf50c409e81a4978a6eb0061180515c0070e4 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,30 @@
* @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) {
dgozman 2016/06/29 18:37:57 style: { on next line
eostroukhov-old 2016/06/29 22:54:20 Done.
+ return target[WebInspector.NetworkLog._symbol] || null;
}
/**
@@ -52,7 +65,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 +80,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;
}

Powered by Google App Engine
This is Rietveld 408576698