DevTools: proper management of ResourceTreeModel in NetworkProject

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * @unrestricted
- */
 SDK.ResourceTreeModel = class extends SDK.SDKModel {
   /**
    * @param {!SDK.Target} target
    */
   constructor(target) {
     super(target);
 
     var networkManager = target.model(SDK.NetworkManager);
     if (networkManager) {
       networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this);
       networkManager.addEventListener(
           SDK.NetworkManager.Events.RequestUpdateDropped, this._onRequestUpdateDropped, this);
     }
-
     this._agent = target.pageAgent();
     this._agent.enable();
     this._securityOriginManager = target.model(SDK.SecurityOriginManager);
 
-    this._fetchResourceTree();
-
     target.registerPageDispatcher(new SDK.PageDispatcher(this));
 
+    /** @type {!Map<string, !SDK.ResourceTreeFrame>} */
+    this._frames = new Map();
+    this._cachedResourcesProcessed = false;
     this._pendingReloadOptions = null;
     this._reloadSuspensionCount = 0;
     this._isInterstitialShowing = false;
+    this.mainFrame = null;
+
+    this._fetchResourceTree();
   }
 
   /**
    * @return {!Array.<!SDK.ResourceTreeFrame>}
    */
   static frames() {
     var result = [];
     for (var resourceTreeModel of SDK.targetManager.models(SDK.ResourceTreeModel))
       result = result.concat(resourceTreeModel._frames.valuesArray());
     return result;
@@ skipping 25 matching lines @@
   }
 
   /**
    * @return {!SDK.DOMModel}
    */
   domModel() {
     return /** @type {!SDK.DOMModel} */ (this.target().model(SDK.DOMModel));
   }
 
   _fetchResourceTree() {
-    /** @type {!Map<string, !SDK.ResourceTreeFrame>} */
     this._frames = new Map();

[dgozman, 2017/04/20 17:23:17]

You can just remove this - it's only called from constructor. I'd just inline
the method.

[lushnikov, 2017/04/21 00:51:27]

it is also called from test - i preferred to keep it as is.

     this._cachedResourcesProcessed = false;
     this._agent.getResourceTree(this._processCachedResources.bind(this));
   }
 
   _processCachedResources(error, mainFramePayload) {
     if (!error) {
       this.dispatchEventToListeners(SDK.ResourceTreeModel.Events.WillLoadCachedResources);
       this._addFramesRecursively(null, mainFramePayload);
       this.target().setInspectedURL(mainFramePayload.frame.url);
     }
@@ skipping 767 matching lines @@
     this._resourceTreeModel.dispatchEventToListeners(SDK.ResourceTreeModel.Events.InterstitialHidden);
   }
 
   /**
    * @override
    */
   navigationRequested() {
     // Frontend is not interested in when navigations are requested.
   }
 };