[Devtools] Move initiator data into NetworkLog from NetworkRequest

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

 /*
  * Copyright (C) 2012 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 26 matching lines @@
    * @param {!SDK.Target} target
    * @param {string} url
    * @param {string} documentURL
    * @param {!Protocol.Page.FrameId} frameId
    * @param {!Protocol.Network.LoaderId} loaderId
    * @param {?Protocol.Network.Initiator} initiator
    */
   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);
     this._documentURL = documentURL;
     this._frameId = frameId;
     this._loaderId = loaderId;
     /** @type {?Protocol.Network.Initiator} */
     this._initiator = initiator;
     this._issueTime = -1;
     this._startTime = -1;
@@ skipping 538 matching lines @@
     if (this.redirects && this.redirects.length > 0)
       return this.redirects[this.redirects.length - 1];
     return this._redirectSource;
   }
 
   /**
    * @param {?SDK.NetworkRequest} x
    */
   set redirectSource(x) {
     this._redirectSource = x;
-    delete this._initiatorInfo;
   }
 
   /**
    * @return {!Array.<!SDK.NetworkRequest.NameValue>}
    */
   requestHeaders() {
     return this._requestHeaders || [];
   }
 
   /**
@@ skipping 423 matching lines @@
   }
 
   /**
    * @return {?Protocol.Network.Initiator}
    */
   initiator() {
     return this._initiator;
   }
 
   /**
-   * @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() {
     return this._frames;
   }
 
   /**
    * @param {string} errorMessage
    * @param {number} time
    */
@@ skipping 48 matching lines @@
     var message = {time: this.pseudoWallTime(time), eventName: eventName, eventId: eventId, data: data};
     this._eventSourceMessages.push(message);
     this.dispatchEventToListeners(SDK.NetworkRequest.Events.EventSourceMessageAdded, message);
   }
 
   replayXHR() {
     this.target().networkAgent().replayXHR(this._requestId);
   }
 
   /**
-   * @return {!SDK.NetworkLog}
-   */
-  networkLog() {
-    return this._networkLog;
-  }
-
-  /**
    * @return {!SDK.NetworkManager}
    */
   networkManager() {
     return this._networkManager;
   }
 };
 
 /** @enum {symbol} */
 SDK.NetworkRequest.Events = {
   FinishedLoading: Symbol('FinishedLoading'),
@@ skipping 21 matching lines @@
   Send: 'send',
   Receive: 'receive',
   Error: 'error'
 };
 
 /** @typedef {!{type: SDK.NetworkRequest.WebSocketFrameType, time: number, text: string, opCode: number, mask: boolean}} */
 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;