[Devtools] NetworkLogView now uses NetworkLog as source of truth.

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

Index: third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js b/third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js
index 638f68d2d3cdf26fb202cb5a95c8589d33023537..9dbb21ef44a3623830f122a66312a181dc3dc401 100644
--- a/third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js
+++ b/third_party/WebKit/Source/devtools/front_end/network_log/NetworkLog.js
@@ -31,10 +31,11 @@
 /**
  * @implements {SDK.SDKModelObserver<!SDK.NetworkManager>}
  */
-NetworkLog.NetworkLog = class {
+NetworkLog.NetworkLog = class extends Common.Object {
   constructor() {
-    /** @type {!Array<!SDK.NetworkRequest>} */
-    this._requests = [];
+    super();
+    /** @type {!Set<!SDK.NetworkRequest>} */
+    this._requests = new Set();
     /** @type {!Map<!SDK.NetworkManager, !Map<string, !SDK.NetworkRequest>>} */
     this._requestsByManagerAndId = new Map();
     /** @type {!Map<!SDK.NetworkManager, !NetworkLog.PageLoad>} */
@@ -51,10 +52,16 @@ NetworkLog.NetworkLog = class {
     eventListeners.push(
         networkManager.addEventListener(SDK.NetworkManager.Events.RequestStarted, this._onRequestStarted, this));
     eventListeners.push(
+        networkManager.addEventListener(SDK.NetworkManager.Events.RequestUpdated, this._onRequestUpdated, this));
+    eventListeners.push(
         networkManager.addEventListener(SDK.NetworkManager.Events.RequestRedirected, this._onRequestRedirect, this));
+    eventListeners.push(
+        networkManager.addEventListener(SDK.NetworkManager.Events.RequestFinished, this._onRequestUpdated, this));
 
     var resourceTreeModel = networkManager.target().model(SDK.ResourceTreeModel);
     if (resourceTreeModel) {
+      eventListeners.push(
+          resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.WillReloadPage, this._willReloadPage, this));
       eventListeners.push(resourceTreeModel.addEventListener(
           SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this));
       eventListeners.push(resourceTreeModel.addEventListener(SDK.ResourceTreeModel.Events.Load, this._onLoad, this));
@@ -80,11 +87,15 @@ NetworkLog.NetworkLog = class {
    * @return {?SDK.NetworkRequest}
    */
   requestForURL(url) {
-    return this._requests.find(request => request.url() === url) || null;
+    for (var request of this._requests) {
+      if (request.url() === url)
+        return request;
+    }
+    return null;
   }
 
   /**
-   * @return {!Array<!SDK.NetworkRequest>}
+   * @return {!Set<!SDK.NetworkRequest>}
    */
   requests() {
     return this._requests;
@@ -236,6 +247,11 @@ NetworkLog.NetworkLog = class {
     return request[NetworkLog.NetworkLog._pageLoadForRequestSymbol];
   }
 
+  _willReloadPage() {
+    if (!Common.moduleSetting('network.preserve-log').get())

[dgozman, 2017/06/01 20:56:28]

The setting should move to network_log module.

[allada, 2017/06/02 01:02:44]

Done.

+      this.reset();
+  }
+
   /**
    * @param {!Common.Event} event
    */
@@ -245,9 +261,20 @@ NetworkLog.NetworkLog = class {
     if (!networkManager)
       return;
 
-    this._currentPageLoad.delete(networkManager);
     var oldRequests = this.requestsForManager(networkManager);
-    this._requests = this._requests.filter(request => request.networkManager() !== networkManager);
+    if (!Common.moduleSetting('network.preserve-log').get()) {
+      var filteredRequests = new Set();
+      var removedRequests = [];
+      for (var request of this._requests) {
+        if (request.networkManager() !== networkManager)
+          filteredRequests.add(request);
+        else
+          removedRequests.push(request);
+      }
+      this._requests = filteredRequests;
+      for (var request of removedRequests)
+        this.dispatchEventToListeners(NetworkLog.NetworkLog.Events.RequestRemoved, request);
+    }
     var idMap = new Map();
     this._requestsByManagerAndId.set(networkManager, idMap);
 
@@ -258,7 +285,8 @@ NetworkLog.NetworkLog = class {
       if (request.loaderId === mainFrame.loaderId) {
         if (!currentPageLoad)
           currentPageLoad = new NetworkLog.PageLoad(request);
-        this._requests.push(request);
+        this._requests.add(request);
+        this.dispatchEventToListeners(NetworkLog.NetworkLog.Events.RequestAdded, request);
         idMap.set(request.requestId(), request);
         request[NetworkLog.NetworkLog._pageLoadForRequestSymbol] = currentPageLoad;
       }
@@ -272,9 +300,20 @@ NetworkLog.NetworkLog = class {
    */
   _onRequestStarted(event) {
     var request = /** @type {!SDK.NetworkRequest} */ (event.data);
-    this._requests.push(request);
+    this._requests.add(request);
     this._requestsByManagerAndId.get(request.networkManager()).set(request.requestId(), request);
     request[NetworkLog.NetworkLog._pageLoadForRequestSymbol] = this._currentPageLoad.get(request.networkManager());
+    this.dispatchEventToListeners(NetworkLog.NetworkLog.Events.RequestAdded, request);
+  }
+
+  /**
+   * @param {!Common.Event} event
+   */
+  _onRequestUpdated(event) {
+    var request = /** @type {!SDK.NetworkRequest} */ (event.data);
+    if (!this._requests.has(request))
+      return;
+    this.dispatchEventToListeners(NetworkLog.NetworkLog.Events.RequestUpdated, request);
   }
 
   /**
@@ -315,6 +354,19 @@ NetworkLog.NetworkLog = class {
     var map = this._requestsByManagerAndId.get(networkManager);
     return map ? (map.get(requestId) || null) : null;
   }
+
+  reset() {

[dgozman, 2017/06/01 20:56:28]

Why is this public?

[allada, 2017/06/02 01:02:44]

NetworkPanel clears the log with a UI button.

+    this._requests.clear();
+    this._requestsByManagerAndId.forEach(map => map.clear());

[dgozman, 2017/06/01 20:56:28]

Just clear the map itself instead?

[allada, 2017/06/02 01:02:44]

This is going away in a (soon) followup patch. But for now it needs to keep the
current targets as keys.

+    var networkManagers = new Set(

[dgozman, 2017/06/01 20:56:28]

var networkManagers = SDK.targetManager.models(SDK.NetworkManager);

[allada, 2017/06/02 01:02:44]

Done.

+        SDK.targetManager.targets(SDK.Target.Capability.Network).map(target => target.model(SDK.NetworkManager)));
+    for (var networkManager of this._currentPageLoad.keys()) {
+      if (!networkManagers.has(networkManager))
+        this._currentPageLoad.delete(networkManager);
+    }
+
+    this.dispatchEventToListeners(NetworkLog.NetworkLog.Events.Reset);
+  }
 };
 
 NetworkLog.PageLoad = class {
@@ -329,6 +381,14 @@ NetworkLog.PageLoad = class {
     this.loadTime;
     /** @type {number} */
     this.contentLoadTime;
+    this._mainRequest = mainRequest;

[dgozman, 2017/06/01 20:56:28]

This is a struct, where all fields should be public.

[allada, 2017/06/02 01:02:44]

Done.

+  }
+
+  /**
+   * @return {!SDK.NetworkRequest}
+   */
+  mainRequest() {
+    return this._mainRequest;
   }
 };
 
@@ -337,6 +397,13 @@ NetworkLog.PageLoad._lastIdentifier = 0;
 /** @typedef {!{initiators: !Set<!SDK.NetworkRequest>, initiated: !Set<!SDK.NetworkRequest>}} */
 NetworkLog.NetworkLog.InitiatorGraph;
 
+NetworkLog.NetworkLog.Events = {
+  Reset: Symbol('Reset'),
+  RequestAdded: Symbol('RequestAdded'),
+  RequestRemoved: Symbol('RequestRemoved'),
+  RequestUpdated: Symbol('RequestUpdated')
+};
+
 /** @typedef {!{type: !SDK.NetworkRequest.InitiatorType, url: string, lineNumber: number, columnNumber: number, scriptId: ?string}} */
 NetworkLog.NetworkLog._InitiatorInfo;