[Devtools] Removed getters/setters for NetworkRequest requestId

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

 /*
  * Copyright (C) 2011 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 150 matching lines @@
 };
 
 
 /**
  * @implements {Protocol.NetworkDispatcher}
  * @unrestricted
  */
 SDK.NetworkDispatcher = class {
   constructor(manager) {
     this._manager = manager;
+    /** @type {!Object<string, !SDK.NetworkRequest>} */

[allada, 2017/01/07 00:55:26]

Closure did not catch stuff in this file, so I fixed this and it and closure
found more bugs which I also fixed in this patch.

[luoe, 2017/01/09 20:23:00]

Why not "@type {!Object<!Protocol.Network.RequestId, !SDK.NetworkRequest>}" ?

     this._inflightRequestsById = {};
+    /** @type {!Object<string, !SDK.NetworkRequest>} */
     this._inflightRequestsByURL = {};
   }
 
   /**
    * @param {!Protocol.Network.Headers} headersMap
    * @return {!Array.<!SDK.NetworkRequest.NameValue>}
    */
   _headersMapToHeadersArray(headersMap) {
     var result = [];
     for (var name in headersMap) {
@@ skipping 52 matching lines @@
 
     networkRequest.setSecurityState(response.securityState);
 
     if (!this._mimeTypeIsConsistentWithType(networkRequest)) {
       var consoleModel = this._manager._target.consoleModel;
       consoleModel.addMessage(new SDK.ConsoleMessage(
           consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network, SDK.ConsoleMessage.MessageLevel.Log,
           Common.UIString(
               'Resource interpreted as %s but transferred with MIME type %s: "%s".',
               networkRequest.resourceType().title(), networkRequest.mimeType, networkRequest.url),
-          SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId));
+          SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId()));
     }
 
     if (response.securityDetails)
       networkRequest.setSecurityDetails(response.securityDetails);
   }
 
   /**
    * @param {!SDK.NetworkRequest} networkRequest
    * @return {boolean}
    */
@@ skipping 172 matching lines @@
    * @param {boolean=} canceled
    * @param {!Protocol.Network.BlockedReason=} blockedReason
    */
   loadingFailed(requestId, time, resourceType, localizedDescription, canceled, blockedReason) {
     var networkRequest = this._inflightRequestsById[requestId];
     if (!networkRequest)
       return;
 
     networkRequest.failed = true;
     networkRequest.setResourceType(Common.resourceTypes[resourceType]);
-    networkRequest.canceled = canceled;
+    networkRequest.canceled = !!canceled;
     if (blockedReason) {
       networkRequest.setBlockedReason(blockedReason);
       if (blockedReason === Protocol.Network.BlockedReason.Inspector) {
         var consoleModel = this._manager._target.consoleModel;
         consoleModel.addMessage(new SDK.ConsoleMessage(
             consoleModel.target(), SDK.ConsoleMessage.MessageSource.Network, SDK.ConsoleMessage.MessageLevel.Warning,
             Common.UIString('Request was blocked by DevTools: "%s".', networkRequest.url),
-            SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId));
+            SDK.ConsoleMessage.MessageType.Log, '', 0, 0, networkRequest.requestId()));
       }
     }
     networkRequest.localizedFailDescription = localizedDescription;
     this._finishNetworkRequest(networkRequest, time, -1);
   }
 
   /**
    * @override
    * @param {!Protocol.Network.RequestId} requestId
    * @param {string} requestURL
@@ skipping 32 matching lines @@
    * @param {!Protocol.Network.WebSocketResponse} response
    */
   webSocketHandshakeResponseReceived(requestId, time, response) {
     var networkRequest = this._inflightRequestsById[requestId];
     if (!networkRequest)
       return;
 
     networkRequest.statusCode = response.status;
     networkRequest.statusText = response.statusText;
     networkRequest.responseHeaders = this._headersMapToHeadersArray(response.headers);
-    networkRequest.responseHeadersText = response.headersText;
+    networkRequest.responseHeadersText = response.headersText || '';
     if (response.requestHeaders)
       networkRequest.setRequestHeaders(this._headersMapToHeadersArray(response.requestHeaders));
     if (response.requestHeadersText)
       networkRequest.setRequestHeadersText(response.requestHeadersText);
     networkRequest.responseReceivedTime = time;
     networkRequest.protocol = 'websocket';
 
     this._updateNetworkRequest(networkRequest);
   }
 
   /**
    * @override
    * @param {!Protocol.Network.RequestId} requestId
    * @param {!Protocol.Network.Timestamp} time
    * @param {!Protocol.Network.WebSocketFrame} response
    */
   webSocketFrameReceived(requestId, time, response) {
     var networkRequest = this._inflightRequestsById[requestId];
     if (!networkRequest)
       return;
 
-    networkRequest.addFrame(response, time);
+    networkRequest.addFrame(response, time, false);
     networkRequest.responseReceivedTime = time;
 
     this._updateNetworkRequest(networkRequest);
   }
 
   /**
    * @override
    * @param {!Protocol.Network.RequestId} requestId
    * @param {!Protocol.Network.Timestamp} time
    * @param {!Protocol.Network.WebSocketFrame} response
@@ skipping 55 matching lines @@
 
   /**
    * @param {!Protocol.Network.RequestId} requestId
    * @param {!Protocol.Network.Timestamp} time
    * @param {string} redirectURL
    * @return {!SDK.NetworkRequest}
    */
   _appendRedirect(requestId, time, redirectURL) {
     var originalNetworkRequest = this._inflightRequestsById[requestId];
     var previousRedirects = originalNetworkRequest.redirects || [];
-    originalNetworkRequest.requestId = requestId + ':redirected.' + previousRedirects.length;
+    originalNetworkRequest.setRequestId(requestId + ':redirected.' + previousRedirects.length);
     delete originalNetworkRequest.redirects;
     if (previousRedirects.length > 0)
       originalNetworkRequest.redirectSource = previousRedirects[previousRedirects.length - 1];
     this._finishNetworkRequest(originalNetworkRequest, time, -1);
     var newNetworkRequest = this._createNetworkRequest(
         requestId, originalNetworkRequest.frameId, originalNetworkRequest.loaderId, redirectURL,
         originalNetworkRequest.documentURL, originalNetworkRequest.initiator());
     newNetworkRequest.redirects = previousRedirects.concat(originalNetworkRequest);
     return newNetworkRequest;
   }
 
   /**
    * @param {!SDK.NetworkRequest} networkRequest
    */
   _startNetworkRequest(networkRequest) {
-    this._inflightRequestsById[networkRequest.requestId] = networkRequest;
+    this._inflightRequestsById[networkRequest.requestId()] = networkRequest;
     this._inflightRequestsByURL[networkRequest.url] = networkRequest;
     this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestStarted, networkRequest);
   }
 
   /**
    * @param {!SDK.NetworkRequest} networkRequest
    */
   _updateNetworkRequest(networkRequest) {
     this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestUpdated, networkRequest);
   }
 
   /**
    * @param {!SDK.NetworkRequest} networkRequest
    * @param {!Protocol.Network.Timestamp} finishTime
    * @param {number} encodedDataLength
    */
   _finishNetworkRequest(networkRequest, finishTime, encodedDataLength) {
     networkRequest.endTime = finishTime;
     networkRequest.finished = true;
     if (encodedDataLength >= 0)
       networkRequest.setTransferSize(encodedDataLength);
     this._dispatchEventToListeners(SDK.NetworkManager.Events.RequestFinished, networkRequest);
-    delete this._inflightRequestsById[networkRequest.requestId];
+    delete this._inflightRequestsById[networkRequest.requestId()];
     delete this._inflightRequestsByURL[networkRequest.url];
   }
 
   /**
    * @param {string} eventType
    * @param {!SDK.NetworkRequest} networkRequest
    */
   _dispatchEventToListeners(eventType, networkRequest) {
     this._manager.dispatchEventToListeners(eventType, networkRequest);
   }
@@ skipping 248 matching lines @@
 SDK.MultitargetNetworkManager.Events = {
   ConditionsChanged: Symbol('ConditionsChanged'),
   UserAgentChanged: Symbol('UserAgentChanged')
 };
 
 
 /**
  * @type {!SDK.MultitargetNetworkManager}
  */
 SDK.multitargetNetworkManager;