[Devtools] Move initiator data into NetworkLog from NetworkRequest

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
index 1a92cface00bf3d516148439bb774c903a7623a3..a40828f558b012e4e76cb3747acf3c597513c8fb 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkRequest.js
@@ -44,7 +44,6 @@ SDK.NetworkRequest = class extends SDK.SDKObject {
   constructor(target, requestId, url, documentURL, frameId, loaderId, initiator) {
     super(target);
 
-    this._networkLog = /** @type {!SDK.NetworkLog} */ (SDK.NetworkLog.fromTarget(target));
     this._networkManager = /** @type {!SDK.NetworkManager} */ (SDK.NetworkManager.fromTarget(target));
     this._requestId = requestId;
     this.setUrl(url);
@@ -603,7 +602,6 @@ SDK.NetworkRequest = class extends SDK.SDKObject {
    */
   set redirectSource(x) {
     this._redirectSource = x;
-    delete this._initiatorInfo;
   }
 
   /**
@@ -1047,86 +1045,6 @@ SDK.NetworkRequest = class extends SDK.SDKObject {
   }
 
   /**
-   * @return {!{type: !SDK.NetworkRequest.InitiatorType, url: string, lineNumber: number, columnNumber: number, scriptId: ?string}}
-   */
-  initiatorInfo() {
-    if (this._initiatorInfo)
-      return this._initiatorInfo;
-
-    var type = SDK.NetworkRequest.InitiatorType.Other;
-    var url = '';
-    var lineNumber = -Infinity;
-    var columnNumber = -Infinity;
-    var scriptId = null;
-    var initiator = this._initiator;
-
-    if (this.redirectSource) {
-      type = SDK.NetworkRequest.InitiatorType.Redirect;
-      url = this.redirectSource.url();
-    } else if (initiator) {
-      if (initiator.type === Protocol.Network.InitiatorType.Parser) {
-        type = SDK.NetworkRequest.InitiatorType.Parser;
-        url = initiator.url ? initiator.url : url;
-        lineNumber = initiator.lineNumber ? initiator.lineNumber : lineNumber;
-      } else if (initiator.type === Protocol.Network.InitiatorType.Script) {
-        for (var stack = initiator.stack; stack; stack = stack.parent) {
-          var topFrame = stack.callFrames.length ? stack.callFrames[0] : null;
-          if (!topFrame)
-            continue;
-          type = SDK.NetworkRequest.InitiatorType.Script;
-          url = topFrame.url || Common.UIString('<anonymous>');
-          lineNumber = topFrame.lineNumber;
-          columnNumber = topFrame.columnNumber;
-          scriptId = topFrame.scriptId;
-          break;
-        }
-      }
-    }
-
-    this._initiatorInfo =
-        {type: type, url: url, lineNumber: lineNumber, columnNumber: columnNumber, scriptId: scriptId};
-    return this._initiatorInfo;
-  }
-
-  /**
-   * @return {?SDK.NetworkRequest}
-   */
-  initiatorRequest() {
-    if (this._initiatorRequest === undefined)
-      this._initiatorRequest = this._networkLog.requestForURL(this.initiatorInfo().url);
-    return this._initiatorRequest;
-  }
-
-  /**
-   * @return {!SDK.NetworkRequest.InitiatorGraph}
-   */
-  initiatorGraph() {
-    var initiated = new Set();
-    var requests = this._networkLog.requests();
-    for (var request of requests) {
-      var localInitiators = request._initiatorChain();
-      if (localInitiators.has(this))
-        initiated.add(request);
-    }
-    return {initiators: this._initiatorChain(), initiated: initiated};
-  }
-
-  /**
-   * @return {!Set<!SDK.NetworkRequest>}
-   */
-  _initiatorChain() {
-    if (this._initiatorChainCache)
-      return this._initiatorChainCache;
-    this._initiatorChainCache = new Set();
-    var request = this;
-    while (request) {
-      this._initiatorChainCache.add(request);
-      request = request.initiatorRequest();
-    }
-    return this._initiatorChainCache;
-  }
-
-  /**
    * @return {!Array.<!SDK.NetworkRequest.WebSocketFrame>}
    */
   frames() {
@@ -1195,13 +1113,6 @@ SDK.NetworkRequest = class extends SDK.SDKObject {
   }
 
   /**
-   * @return {!SDK.NetworkLog}
-   */
-  networkLog() {
-    return this._networkLog;
-  }
-
-  /**
    * @return {!SDK.NetworkManager}
    */
   networkManager() {
@@ -1243,6 +1154,3 @@ SDK.NetworkRequest.WebSocketFrame;
 
 /** @typedef {!{time: number, eventName: string, eventId: string, data: string}} */
 SDK.NetworkRequest.EventSourceMessage;
-
-/** @typedef {!{initiators: !Set<!SDK.NetworkRequest>, initiated: !Set<!SDK.NetworkRequest>}} */
-SDK.NetworkRequest.InitiatorGraph;