[DevTools] Remove dependency from TargetManager to ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 SDK.TargetManager = class extends Common.Object {
   constructor() {
     super();
     /** @type {!Array.<!SDK.Target>} */
@@ skipping 82 matching lines @@
   }
 
   /**
    * @return {string}
    */
   inspectedURL() {
     return this._targets[0] ? this._targets[0].inspectedURL() : '';
   }
 
   /**
-   * @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
    */
   observeModels(modelClass, observer) {
     if (!this._modelObservers.has(modelClass))
       this._modelObservers.set(modelClass, []);
     this._modelObservers.get(modelClass).push(observer);
     for (var model of this.models(modelClass))
       observer.modelAdded(model);
@@ skipping 110 matching lines @@
    * @param {number} capabilitiesMask
    * @param {!Protocol.InspectorBackend.Connection.Factory} connectionFactory
    * @param {?SDK.Target} parentTarget
    * @return {!SDK.Target}
    */
   createTarget(id, name, capabilitiesMask, connectionFactory, parentTarget) {
     var target = new SDK.Target(this, id, name, capabilitiesMask, connectionFactory, parentTarget);
     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);
     target.model(SDK.LogModel);
     target.model(SDK.DOMModel);
     target.model(SDK.CSSModel);
     target.model(SDK.CPUProfilerModel);
     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())
       target.model(modelClass);
     this._pendingTargets.delete(target);
 
     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);
 
     for (var modelClass of target.models().keys())
       this.modelAdded(target, modelClass, target.models().get(modelClass));
 
     for (var pair of this._modelListeners) {
       var listeners = pair[1];
       for (var i = 0; i < listeners.length; ++i) {
@@ skipping 21 matching lines @@
   removeTarget(target) {
     if (!this._targets.includes(target))
       return;
 
     var childTargetManager = this._childTargetManagers.get(target);
     this._childTargetManagers.delete(target);
     if (childTargetManager)
       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));
 
     var copy = this._observersForTarget(target);
     for (var i = 0; i < copy.length; ++i)
       copy[i].targetRemoved(target);
 
     for (var pair of this._modelListeners) {
       var listeners = pair[1];
@@ skipping 44 matching lines @@
     this._webSocketConnectionLostCallback = webSocketConnectionLostCallback;
     this._connectAndCreateMainTarget();
   }
 
   _connectAndCreateMainTarget() {
     if (Runtime.queryParam('nodeFrontend')) {
       var target = new SDK.Target(
           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;
     }
 
     var capabilities = SDK.Target.Capability.Browser | SDK.Target.Capability.DOM | SDK.Target.Capability.JS |
         SDK.Target.Capability.Log | SDK.Target.Capability.Network | SDK.Target.Capability.Target |
         SDK.Target.Capability.ScreenCapture | SDK.Target.Capability.Tracing | SDK.Target.Capability.TouchEmulation;
     if (Runtime.queryParam('isSharedWorker')) {
       capabilities = SDK.Target.Capability.Browser | SDK.Target.Capability.Log | SDK.Target.Capability.Network |
           SDK.Target.Capability.Target;
@@ skipping 42 matching lines @@
   }
 };
 
 /**
  * @implements {Protocol.TargetDispatcher}
  */
 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();
 
     /** @type {!Map<string, !SDK.ChildConnection>} */
     this._childConnections = new Map();
 
     parentTarget.registerTargetDispatcher(this);
     this._targetAgent.invoke_setAutoAttach({autoAttach: true, waitForDebuggerOnStart: true});
     if (Runtime.experiments.isEnabled('autoAttachToCrossProcessSubframes'))
@@ skipping 161 matching lines @@
    * @return {!Promise}
    */
   disconnect() {
     throw 'Not implemented';
   }
 };
 
 /** @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');
 
 /**
  * @interface
  */
 SDK.TargetManager.Observer = function() {};
 
 SDK.TargetManager.Observer.prototype = {
   /**
    * @param {!SDK.Target} target
@@ skipping 21 matching lines @@
   /**
    * @param {!T} model
    */
   modelRemoved(model) {},
 };
 
 /**
  * @type {!SDK.TargetManager}
  */
 SDK.targetManager = new SDK.TargetManager();