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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.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/TargetManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
index 51994bd45836a1a8bf30624777aca45b1700640e..b73346c9da3c4bd60f48546d0830481a7a89956e 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
@@ -196,12 +196,18 @@ WebInspector.TargetManager.prototype = {
/** @type {!WebInspector.ConsoleModel} */
target.consoleModel = new WebInspector.ConsoleModel(target);
- /** @type {!WebInspector.NetworkManager} */
- target.networkManager = new WebInspector.NetworkManager(target);
+
+ var networkManager = null;
+ if (!target.isV8Inspector()) {
dgozman 2016/06/29 18:37:58 style: extra {}
eostroukhov-old 2016/06/29 22:54:21 Done.
+ networkManager = new WebInspector.NetworkManager(target);
+ }
+
/** @type {!WebInspector.ResourceTreeModel} */
- target.resourceTreeModel = new WebInspector.ResourceTreeModel(target);
- /** @type {!WebInspector.NetworkLog} */
- target.networkLog = new WebInspector.NetworkLog(target);
+ target.resourceTreeModel = new WebInspector.ResourceTreeModel(target, networkManager);
+
+ if (networkManager) {
+ new WebInspector.NetworkLog(target, networkManager);
+ }
/** @type {!WebInspector.RuntimeModel} */
target.runtimeModel = new WebInspector.RuntimeModel(target);
@@ -214,7 +220,8 @@ WebInspector.TargetManager.prototype = {
}
/** @type {?WebInspector.WorkerManager} */
- target.workerManager = !target.isDedicatedWorker() ? new WebInspector.WorkerManager(target) : null;
+ target.workerManager =
+ target.isDedicatedWorker() || target.isV8Inspector() ? null : new WebInspector.WorkerManager(target);
dgozman 2016/06/29 18:37:58 Let's introduce Target.supportsWorkers().
eostroukhov-old 2016/06/29 22:54:21 Done.
/** @type {!WebInspector.CPUProfilerModel} */
target.cpuProfilerModel = new WebInspector.CPUProfilerModel(target);
/** @type {!WebInspector.HeapProfilerModel} */
@@ -248,6 +255,7 @@ WebInspector.TargetManager.prototype = {
*/
addTarget: function(target)
{
+ console.assert(target);
dgozman 2016/06/29 18:37:58 Remove?
eostroukhov-old 2016/06/29 22:54:20 Done.
this._targets.push(target);
if (this._targets.length === 1) {
target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._redispatchEvent, this);

Powered by Google App Engine
This is Rietveld 408576698