[Devtools] Removed getters/setters for NetworkRequest requestId

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

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
index 6965ab59197e00b4834ee48334b433c5c384520f..dc56085fbfafe8a515d73cf50f5d751dfc93232c 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
@@ -168,7 +168,9 @@ SDK.NetworkManager.OfflineConditions = {
 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 = {};
   }
 
@@ -241,7 +243,7 @@ SDK.NetworkDispatcher = class {
           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)
@@ -434,7 +436,7 @@ SDK.NetworkDispatcher = class {
 
     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) {
@@ -442,7 +444,7 @@ SDK.NetworkDispatcher = class {
         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;
@@ -495,7 +497,7 @@ SDK.NetworkDispatcher = class {
     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)
@@ -517,7 +519,7 @@ SDK.NetworkDispatcher = class {
     if (!networkRequest)
       return;
 
-    networkRequest.addFrame(response, time);
+    networkRequest.addFrame(response, time, false);
     networkRequest.responseReceivedTime = time;
 
     this._updateNetworkRequest(networkRequest);
@@ -593,7 +595,7 @@ SDK.NetworkDispatcher = class {
   _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];
@@ -609,7 +611,7 @@ SDK.NetworkDispatcher = class {
    * @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);
   }
@@ -632,7 +634,7 @@ SDK.NetworkDispatcher = class {
     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];
   }