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

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

Issue 2122353002: [DevTools] Make resource tree model optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 5 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 7e09dff47441da4e36f267bab42c7633ea003b02..d54189a02c65d0c43a1479f21ea122c798c41891 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
@@ -85,7 +85,11 @@ WebInspector.TargetManager.prototype = {
if (!this._targets.length)
return "";
- return this._targets[0].resourceTreeModel.inspectedPageURL();
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._targets[0]);
+ if (!resourceTreeModel)
+ return "";
+
+ return resourceTreeModel.inspectedPageURL();
},
/**
@@ -96,7 +100,11 @@ WebInspector.TargetManager.prototype = {
if (!this._targets.length)
return "";
- return this._targets[0].resourceTreeModel.inspectedPageDomain();
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._targets[0]);
+ if (!resourceTreeModel)
+ return "";
+
+ return resourceTreeModel.inspectedPageDomain();
},
/**
@@ -113,8 +121,14 @@ WebInspector.TargetManager.prototype = {
*/
reloadPage: function(bypassCache, injectedScript)
{
- if (this._targets.length)
- this._targets[0].resourceTreeModel.reloadPage(bypassCache, injectedScript);
+ if (!this._targets.length)
+ return;
+
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(this._targets[0]);
+ if (!resourceTreeModel)
+ return;
+
+ resourceTreeModel.reloadPage(bypassCache, injectedScript);
},
/**
@@ -197,15 +211,11 @@ WebInspector.TargetManager.prototype = {
/** @type {!WebInspector.ConsoleModel} */
target.consoleModel = new WebInspector.ConsoleModel(target);
- var networkManager = null;
- if (!target.isJSInspector())
- networkManager = new WebInspector.NetworkManager(target);
-
- /** @type {!WebInspector.ResourceTreeModel} */
- target.resourceTreeModel = new WebInspector.ResourceTreeModel(target, networkManager);
-
- if (networkManager)
- new WebInspector.NetworkLog(target, networkManager);
+ if (!target.isJSInspector()) {
+ var networkManager = new WebInspector.NetworkManager(target);
+ var resourceTreeModel = new WebInspector.ResourceTreeModel(target, networkManager);
+ new WebInspector.NetworkLog(target, networkManager, resourceTreeModel);
+ }
/** @type {!WebInspector.RuntimeModel} */
target.runtimeModel = new WebInspector.RuntimeModel(target);
@@ -254,11 +264,14 @@ WebInspector.TargetManager.prototype = {
{
this._targets.push(target);
if (this._targets.length === 1) {
- target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._redispatchEvent, this);
- target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._redispatchEvent, this);
- target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._redispatchEvent, this);
- target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.PageReloadRequested, this._redispatchEvent, this);
- target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._redispatchEvent, this);
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+ if (resourceTreeModel) {
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._redispatchEvent, this);
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._redispatchEvent, this);
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._redispatchEvent, this);
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.PageReloadRequested, this._redispatchEvent, this);
+ resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._redispatchEvent, this);
+ }
}
var copy = this._observersByType(target.type());
for (var i = 0; i < copy.length; ++i)
@@ -281,10 +294,13 @@ WebInspector.TargetManager.prototype = {
{
this._targets.remove(target);
if (this._targets.length === 0) {
- target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._redispatchEvent, this);
- target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._redispatchEvent, this);
- target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._redispatchEvent, this);
- target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._redispatchEvent, this);
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+ if (resourceTreeModel) {
+ resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._redispatchEvent, this);
+ resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._redispatchEvent, this);
+ resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._redispatchEvent, this);
+ resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._redispatchEvent, this);
+ }
}
var copy = this._observersByType(target.type());
for (var i = 0; i < copy.length; ++i)

Powered by Google App Engine
This is Rietveld 408576698