[Devtools] Reverse dependency of ResourceTreeModel and NetworkLog

third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.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 16 matching lines @@
  * (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.NetworkLog = class extends SDK.SDKModel {
   /**
    * @param {!SDK.Target} target
-   * @param {!SDK.ResourceTreeModel} resourceTreeModel
    * @param {!SDK.NetworkManager} networkManager
    */
-  constructor(target, resourceTreeModel, networkManager) {
+  constructor(target, networkManager) {
     super(SDK.NetworkLog, target);
 
     this._requests = [];
     this._requestForId = {};
     networkManager.addEventListener(SDK.NetworkManager.Events.RequestStarted, this._onRequestStarted, this);
-    resourceTreeModel.addEventListener(
-        SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
-    resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, this._onLoad, this);
-    resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.DOMContentLoaded, this._onDOMContentLoaded, this);
   }
 
   /**
    * @param {!SDK.Target} target
    * @return {?SDK.NetworkLog}
    */
   static fromTarget(target) {
     return target.model(SDK.NetworkLog);
   }
 
@@ skipping 45 matching lines @@
 
   /**
    * @param {!SDK.NetworkRequest} request
    * @return {!SDK.PageLoad}
    */
   pageLoadForRequest(request) {
     return request.__page;
   }
 
   /**
-   * @param {!Common.Event} event
+   * @param {!SDK.ResourceTreeFrame} mainFrame
    */
-  _onMainFrameNavigated(event) {
-    var mainFrame = /** type {SDK.ResourceTreeFrame} */ event.data;
+  mainFrameNavigated(mainFrame) {

[caseq, 2017/01/06 01:40:48]

Let's take this one step further and make sure NetworkLog does not logically
depend on any page stuff, i.e. perhaps move this logic elsewhere?

     // Preserve requests from the new session.
     this._currentPageLoad = null;
     var oldRequests = this._requests.splice(0, this._requests.length);
     this._requestForId = {};
     for (var i = 0; i < oldRequests.length; ++i) {
       var request = oldRequests[i];
       if (request.loaderId === mainFrame.loaderId) {
         if (!this._currentPageLoad)
           this._currentPageLoad = new SDK.PageLoad(request);
         this._requests.push(request);
         this._requestForId[request.requestId] = request;
         request.__page = this._currentPageLoad;
       }
     }
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onRequestStarted(event) {
     var request = /** @type {!SDK.NetworkRequest} */ (event.data);
     this._requests.push(request);
     this._requestForId[request.requestId] = request;
     request.__page = this._currentPageLoad;
   }
 
   /**
-   * @param {!Common.Event} event
+   * @param {number} time
    */
-  _onDOMContentLoaded(event) {
+  domContentLoaded(time) {

[caseq, 2017/01/06 01:40:48]

ditto.

     if (this._currentPageLoad)
-      this._currentPageLoad.contentLoadTime = event.data;
+      this._currentPageLoad.contentLoadTime = time;
   }
 
   /**
-   * @param {!Common.Event} event
+   * @param {number} time
    */
-  _onLoad(event) {
+  pageLoaded(time) {

[caseq, 2017/01/06 01:40:48]

ditto.

     if (this._currentPageLoad)
-      this._currentPageLoad.loadTime = event.data;
+      this._currentPageLoad.loadTime = time;
   }
 
   /**
    * @param {!Protocol.Network.RequestId} requestId
    * @return {?SDK.NetworkRequest}
    */
   requestForId(requestId) {
     return this._requestForId[requestId];
   }
 };
 
 
 /**
  * @unrestricted
  */
 SDK.PageLoad = class {
   /**
    * @param {!SDK.NetworkRequest} mainRequest
    */
   constructor(mainRequest) {
     this.id = ++SDK.PageLoad._lastIdentifier;
     this.url = mainRequest.url;
     this.startTime = mainRequest.startTime;
   }
 };
 
 SDK.PageLoad._lastIdentifier = 0;