[Devtools] Reverse dependency of ResourceTreeModel and NetworkLog

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js
index e162859868860c63d68faf3243166eef773f1e45..d4a28e729ce9b6a5b273a5f0f1ec72d5e4b0a9c2 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkLog.js
@@ -34,19 +34,14 @@
 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);
   }
 
   /**
@@ -112,10 +107,9 @@ SDK.NetworkLog = class extends SDK.SDKModel {
   }
 
   /**
-   * @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);
@@ -143,19 +137,19 @@ SDK.NetworkLog = class extends SDK.SDKModel {
   }
 
   /**
-   * @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;
   }
 
   /**