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 f779fe57416d0113e211e1fd504319d706ce7e31..90a9472d7d42468a7f13dd1392b80f3bc33afcb8 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js |
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js |
@@ -100,21 +100,6 @@ SDK.TargetManager = class extends Common.Object { |
} |
/** |
- * @param {boolean=} bypassCache |
- * @param {string=} injectedScript |
- */ |
- reloadPage(bypassCache, injectedScript) { |
- if (!this._targets.length) |
- return; |
- |
- var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(this._targets[0]); |
- if (!resourceTreeModel) |
- return; |
- |
- resourceTreeModel.reloadPage(bypassCache, injectedScript); |
- } |
- |
- /** |
* @param {function(new:T,!SDK.Target)} modelClass |
* @param {!SDK.SDKModelObserver<T>} observer |
* @template T |
@@ -245,7 +230,7 @@ SDK.TargetManager = class extends Common.Object { |
this._pendingTargets.add(target); |
target.model(SDK.NetworkManager); |
- var resourceTreeModel = target.model(SDK.ResourceTreeModel); |
+ target.model(SDK.ResourceTreeModel); |
/** @type {!SDK.RuntimeModel} */ |
target.runtimeModel = /** @type {!SDK.RuntimeModel} */ (target.model(SDK.RuntimeModel)); |
target.model(SDK.DebuggerModel); |
@@ -256,7 +241,7 @@ SDK.TargetManager = class extends Common.Object { |
target.model(SDK.ServiceWorkerManager); |
if (target.hasTargetCapability()) |
- this._childTargetManagers.set(target, new SDK.ChildTargetManager(this, target, resourceTreeModel)); |
+ this._childTargetManagers.set(target, new SDK.ChildTargetManager(this, target)); |
// Force creation of models which have observers. |
for (var modelClass of this._modelObservers.keys()) |
@@ -265,23 +250,6 @@ SDK.TargetManager = class extends Common.Object { |
this._targets.push(target); |
- if (resourceTreeModel && !target.parentTarget()) { |
- resourceTreeModel[SDK.TargetManager._listenersSymbol] = [ |
- resourceTreeModel.addEventListener( |
- SDK.ResourceTreeModel.Events.MainFrameNavigated, |
- event => this.dispatchEventToListeners(SDK.TargetManager.Events.MainFrameNavigated, event.data)), |
- resourceTreeModel.addEventListener( |
- SDK.ResourceTreeModel.Events.Load, |
- event => this.dispatchEventToListeners(SDK.TargetManager.Events.Load, event.data)), |
- resourceTreeModel.addEventListener( |
- SDK.ResourceTreeModel.Events.PageReloadRequested, |
- event => this.dispatchEventToListeners(SDK.TargetManager.Events.PageReloadRequested, event.data)), |
- resourceTreeModel.addEventListener( |
- SDK.ResourceTreeModel.Events.WillReloadPage, |
- event => this.dispatchEventToListeners(SDK.TargetManager.Events.WillReloadPage, event.data)), |
- ]; |
- } |
- |
var copy = this._observersForTarget(target); |
for (var i = 0; i < copy.length; ++i) |
copy[i].targetAdded(target); |
@@ -323,10 +291,6 @@ SDK.TargetManager = class extends Common.Object { |
childTargetManager.dispose(); |
this._targets.remove(target); |
- var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(target); |
- var treeModelListeners = resourceTreeModel && resourceTreeModel[SDK.TargetManager._listenersSymbol]; |
- if (treeModelListeners) |
- Common.EventTarget.removeEventListeners(treeModelListeners); |
for (var modelClass of target.models().keys()) |
this._modelRemoved(target, modelClass, target.models().get(modelClass)); |
@@ -391,7 +355,7 @@ SDK.TargetManager = class extends Common.Object { |
this, 'main', Common.UIString('Node'), SDK.Target.Capability.Target, this._createMainConnection.bind(this), |
null); |
target.setInspectedURL('Node'); |
- this._childTargetManagers.set(target, new SDK.ChildTargetManager(this, target, null)); |
+ this._childTargetManagers.set(target, new SDK.ChildTargetManager(this, target)); |
Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSFromFrontend); |
return; |
} |
@@ -454,9 +418,8 @@ SDK.ChildTargetManager = class { |
/** |
* @param {!SDK.TargetManager} targetManager |
* @param {!SDK.Target} parentTarget |
- * @param {?SDK.ResourceTreeModel} resourceTreeModel |
*/ |
- constructor(targetManager, parentTarget, resourceTreeModel) { |
+ constructor(targetManager, parentTarget) { |
this._targetManager = targetManager; |
this._parentTarget = parentTarget; |
this._targetAgent = parentTarget.targetAgent(); |
@@ -638,17 +601,11 @@ SDK.ChildConnection = class { |
/** @enum {symbol} */ |
SDK.TargetManager.Events = { |
InspectedURLChanged: Symbol('InspectedURLChanged'), |
- Load: Symbol('Load'), |
- MainFrameNavigated: Symbol('MainFrameNavigated'), |
NameChanged: Symbol('NameChanged'), |
- PageReloadRequested: Symbol('PageReloadRequested'), |
- WillReloadPage: Symbol('WillReloadPage'), |
- TargetDisposed: Symbol('TargetDisposed'), |
SuspendStateChanged: Symbol('SuspendStateChanged'), |
AvailableNodeTargetsChanged: Symbol('AvailableNodeTargetsChanged') |
}; |
-SDK.TargetManager._listenersSymbol = Symbol('SDK.TargetManager.Listeners'); |
SDK.TargetManager._isWorkerSymbol = Symbol('SDK.TargetManager.IsWorker'); |
/** |