[Devtools] Removed NetworkRequest dependency on NetworkManager

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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * @implements {Common.ContentProvider}
  * @unrestricted
  */
 SDK.NetworkRequest = class extends Common.Object {
   /**
-   * @param {!SDK.NetworkManager} networkManager
    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} url
    * @param {string} documentURL
    * @param {!Protocol.Page.FrameId} frameId
    * @param {!Protocol.Network.LoaderId} loaderId
    * @param {?Protocol.Network.Initiator} initiator
    */
-  constructor(networkManager, requestId, url, documentURL, frameId, loaderId, initiator) {
+  constructor(requestId, url, documentURL, frameId, loaderId, initiator) {
     super();
 
-    this._networkManager = networkManager;
     this._requestId = requestId;
     this.setUrl(url);
     this._documentURL = documentURL;
     this._frameId = frameId;
     this._loaderId = loaderId;
     /** @type {?Protocol.Network.Initiator} */
     this._initiator = initiator;
     /** @type {?SDK.NetworkRequest} */
     this._redirectSource = null;
     this._issueTime = -1;
@@ skipping 468 matching lines @@
   _parseNameAndPathFromURL() {
     if (this._parsedURL.isDataURL()) {
       this._name = this._parsedURL.dataURLDisplayName();
       this._path = '';
     } else if (this._parsedURL.isAboutBlank()) {
       this._name = this._parsedURL.url;
       this._path = '';
     } else {
       this._path = this._parsedURL.host + this._parsedURL.folderPathComponents;
 
-      var inspectedURL = this._networkManager.target().inspectedURL().asParsedURL();
+      var networkManager = SDK.NetworkManager.managerForRequest(this);
+      var inspectedURL = networkManager ? networkManager.target().inspectedURL().asParsedURL() : null;
       this._path = this._path.trimURL(inspectedURL ? inspectedURL.host : '');
       if (this._parsedURL.lastPathComponent || this._parsedURL.queryParams) {
         this._name =
             this._parsedURL.lastPathComponent + (this._parsedURL.queryParams ? '?' + this._parsedURL.queryParams : '');
       } else if (this._parsedURL.folderPathComponents) {
         this._name =
             this._parsedURL.folderPathComponents.substring(this._parsedURL.folderPathComponents.lastIndexOf('/') + 1) +
             '/';
         this._path = this._path.substring(0, this._path.lastIndexOf('/'));
       } else {
@@ skipping 462 matching lines @@
     if (!this._contentEncoded) {
       content = content.toBase64();
       charset = 'utf-8';
     }
     return Common.ContentProvider.contentAsDataURL(content, this.mimeType, true, charset);
   }
 
   _innerRequestContent() {
     if (this._contentRequested)
       return;
+    var networkManager = SDK.NetworkManager.managerForRequest(this);
+    if (!networkManager)
+      return;
     this._contentRequested = true;
+    // TODO(allada) This should be moved into NetworkManager.

[dgozman, 2017/06/06 20:54:41]

This should actually be abstracted away to work with HAR.

[allada, 2017/06/08 00:42:06]

Well HAR import will set the content of the request while it's
generating them, and then it'll try to look it up from networkmanager
assuming it exists for the request.

+    networkManager.target().networkAgent().getResponseBody(this._requestId, onResourceContent.bind(this));
 
     /**
      * @param {?Protocol.Error} error
      * @param {string} content
      * @param {boolean} contentEncoded
      * @this {SDK.NetworkRequest}
      */
     function onResourceContent(error, content, contentEncoded) {
       this._content = error ? null : content;
       this._contentError = error;
       this._contentEncoded = contentEncoded;
       var callbacks = this._pendingContentCallbacks.slice();
       for (var i = 0; i < callbacks.length; ++i)
         callbacks[i](this._content);
       this._pendingContentCallbacks.length = 0;
       delete this._contentRequested;
     }
-    this._networkManager.target().networkAgent().getResponseBody(this._requestId, onResourceContent.bind(this));
   }
 
   /**
    * @return {?Protocol.Network.Initiator}
    */
   initiator() {
     return this._initiator;
   }
 
   /**
@@ skipping 52 matching lines @@
    * @param {number} time
    * @param {string} eventName
    * @param {string} eventId
    * @param {string} data
    */
   addEventSourceMessage(time, eventName, eventId, data) {
     var message = {time: this.pseudoWallTime(time), eventName: eventName, eventId: eventId, data: data};
     this._eventSourceMessages.push(message);
     this.dispatchEventToListeners(SDK.NetworkRequest.Events.EventSourceMessageAdded, message);
   }
-
-  /**
-   * @return {!SDK.NetworkManager}
-   */
-  networkManager() {
-    return this._networkManager;
-  }
 };
 
 /** @enum {symbol} */
 SDK.NetworkRequest.Events = {
   FinishedLoading: Symbol('FinishedLoading'),
   TimingChanged: Symbol('TimingChanged'),
   RemoteAddressChanged: Symbol('RemoteAddressChanged'),
   RequestHeadersChanged: Symbol('RequestHeadersChanged'),
   ResponseHeadersChanged: Symbol('ResponseHeadersChanged'),
   WebsocketFrameAdded: Symbol('WebsocketFrameAdded'),
@@ skipping 17 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;