[DevTools] Make resource tree model optional

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.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  */
@@ skipping 67 matching lines @@
     },
 
     /**
      * @return {string}
      */
     inspectedPageURL: function()
     {
         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();
     },
 
     /**
      * @return {string}
      */
     inspectedPageDomain: function()
     {
         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();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _redispatchEvent: function(event)
     {
         this.dispatchEventToListeners(event.type, event.data);
     },
 
     /**
      * @param {boolean=} bypassCache
      * @param {string=} injectedScript
      */
     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);
     },
 
     /**
      * @param {!Function} modelClass
      * @param {string} eventType
      * @param {function(!WebInspector.Event)} listener
      * @param {!Object=} thisObject
      */
     addModelListener: function(modelClass, eventType, listener, thisObject)
     {
@@ skipping 64 matching lines @@
      */
     createTarget: function(name, capabilitiesMask, connection, parentTarget)
     {
         var target = new WebInspector.Target(this, name, capabilitiesMask, connection, parentTarget);
 
         /** @type {!WebInspector.ConsoleModel} */
         target.consoleModel = new WebInspector.ConsoleModel(target);
         /** @type {!WebInspector.RuntimeModel} */
         target.runtimeModel = new WebInspector.RuntimeModel(target);
 
-        var networkManager = null;
-        if (target.hasNetworkCapability())
-            networkManager = new WebInspector.NetworkManager(target);
+        var resourceTreeModel = null;
 
-        /** @type {!WebInspector.ResourceTreeModel} */
-        target.resourceTreeModel = new WebInspector.ResourceTreeModel(target, networkManager);
-
-        if (networkManager)
-            new WebInspector.NetworkLog(target, networkManager);
+        if (target.hasNetworkCapability()) {
+            var networkManager = new WebInspector.NetworkManager(target);
+            resourceTreeModel = new WebInspector.ResourceTreeModel(target, networkManager);

[dgozman, 2016/07/14 16:29:29]

This is browser capability, not network.

[eostroukhov-old, 2016/07/20 23:46:16]

Apparently, it requires both... I updated it.

+            new WebInspector.NetworkLog(target, networkManager, resourceTreeModel);
+        }
 
         if (target.hasJSCapability())
             new WebInspector.DebuggerModel(target);
 
         if (target.hasBrowserCapability()) {
-            new WebInspector.DOMModel(target);
-            new WebInspector.CSSModel(target);
+            var domModel = new WebInspector.DOMModel(target);
+            new WebInspector.CSSModel(target, domModel, /** @type {!WebInspector.ResourceTreeModel} */ (resourceTreeModel));
         }
 
         /** @type {?WebInspector.WorkerManager} */
         target.workerManager = target.hasWorkerCapability() ? new WebInspector.WorkerManager(target) : null;
         /** @type {!WebInspector.CPUProfilerModel} */
         target.cpuProfilerModel = new WebInspector.CPUProfilerModel(target);
         /** @type {!WebInspector.HeapProfilerModel} */
         target.heapProfilerModel = new WebInspector.HeapProfilerModel(target);
 
         target.tracingManager = new WebInspector.TracingManager(target);
@@ skipping 14 matching lines @@
         return this._observers.filter((observer) => target.hasAllCapabilities(observer[this._observerCapabiliesMaskSymbol] || 0));
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     addTarget: function(target)
     {
         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);

[dgozman, 2016/07/14 16:29:29]

nit: while you are here, save the results of addEventListener calls into an
array, and do WebInspector.EventListener.removeEventListener(array) in
removeTarget.

[eostroukhov-old, 2016/07/20 23:46:16]

Done.

+                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._observersForTarget(target);
         for (var i = 0; i < copy.length; ++i)
             copy[i].targetAdded(target);
 
         for (var eventType in this._modelListeners) {
             var listeners = this._modelListeners[eventType];
             for (var i = 0; i < listeners.length; ++i) {
                 var model = target.model(listeners[i].modelClass);
                 if (model)
                     model.addEventListener(eventType, listeners[i].listener, listeners[i].thisObject);
             }
         }
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     removeTarget: function(target)
     {
         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.PageReloadRequested, this._redispatchEvent, this);
+                resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillReloadPage, this._redispatchEvent, this);
+            }
         }
         var copy = this._observersForTarget(target);
         for (var i = 0; i < copy.length; ++i)
             copy[i].targetRemoved(target);
 
         for (var eventType in this._modelListeners) {
             var listeners = this._modelListeners[eventType];
             for (var i = 0; i < listeners.length; ++i) {
                 var model = target.model(listeners[i].modelClass);
                 if (model)
@@ skipping 55 matching lines @@
     /**
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target) { },
 }
 
 /**
  * @type {!WebInspector.TargetManager}
  */
 WebInspector.targetManager = new WebInspector.TargetManager();