DevTools: remove "type" getters in Resource and NetworkRequest.

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 196 matching lines @@
             networkRequest.fetchedViaServiceWorker = true;
 
         if (response.fromDiskCache)
             networkRequest.setFromDiskCache();
         networkRequest.timing = response.timing;
 
         if (!this._mimeTypeIsConsistentWithType(networkRequest)) {
             var consoleModel = this._manager._target.consoleModel;
             consoleModel.addMessage(new WebInspector.ConsoleMessage(consoleModel.target(), WebInspector.ConsoleMessage.MessageSource.Network,
                 WebInspector.ConsoleMessage.MessageLevel.Log,
-                WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s: \"%s\".", networkRequest.type.title(), networkRequest.mimeType, networkRequest.url),
+                WebInspector.UIString("Resource interpreted as %s but transferred with MIME type %s: \"%s\".", networkRequest.resourceType().title(), networkRequest.mimeType, networkRequest.url),
                 WebInspector.ConsoleMessage.MessageType.Log,
                 "",
                 0,
                 0,
                 networkRequest.requestId));
         }
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} networkRequest
      * @return {boolean}
      */
     _mimeTypeIsConsistentWithType: function(networkRequest)
     {
         // If status is an error, content is likely to be of an inconsistent type,
         // as it's going to be an error message. We do not want to emit a warning
         // for this, though, as this will already be reported as resource loading failure.
         // Also, if a URL like http://localhost/wiki/load.php?debug=true&lang=en produces text/css and gets reloaded,
         // it is 304 Not Modified and its guessed mime-type is text/php, which is wrong.
         // Don't check for mime-types in 304-resources.
         if (networkRequest.hasErrorStatusCode() || networkRequest.statusCode === 304 || networkRequest.statusCode === 204)
             return true;
 
-        if (typeof networkRequest.type === "undefined"
-            || networkRequest.type === WebInspector.resourceTypes.Other
-            || networkRequest.type === WebInspector.resourceTypes.Media
-            || networkRequest.type === WebInspector.resourceTypes.XHR
-            || networkRequest.type === WebInspector.resourceTypes.WebSocket)
+        var resourceType = networkRequest.resourceType();
+        if (resourceType === undefined
+            || resourceType === WebInspector.resourceTypes.Other
+            || resourceType === WebInspector.resourceTypes.Media
+            || resourceType === WebInspector.resourceTypes.XHR
+            || resourceType === WebInspector.resourceTypes.WebSocket)
             return true;
 
         if (!networkRequest.mimeType)
             return true; // Might be not known for cached resources with null responses.
 
         if (networkRequest.mimeType in WebInspector.NetworkManager._MIMETypes)
-            return networkRequest.type.name() in WebInspector.NetworkManager._MIMETypes[networkRequest.mimeType];
+            return resourceType.name() in WebInspector.NetworkManager._MIMETypes[networkRequest.mimeType];
 
         return false;
     },
 
     /**
      * @param {!NetworkAgent.RequestId} requestId
      * @param {!PageAgent.FrameId} frameId
      * @param {!NetworkAgent.LoaderId} loaderId
      * @param {string} documentURL
      * @param {!NetworkAgent.Request} request
@@ skipping 48 matching lines @@
             eventData.url = response.url;
             eventData.frameId = frameId;
             eventData.loaderId = loaderId;
             eventData.resourceType = resourceType;
             eventData.mimeType = response.mimeType;
             this._manager.dispatchEventToListeners(WebInspector.NetworkManager.EventTypes.RequestUpdateDropped, eventData);
             return;
         }
 
         networkRequest.responseReceivedTime = time;
-        networkRequest.type = WebInspector.resourceTypes[resourceType];
+        networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]);
 
         this._updateNetworkRequestWithResponse(networkRequest, response);
 
         this._updateNetworkRequest(networkRequest);
     },
 
     /**
      * @param {!NetworkAgent.RequestId} requestId
      * @param {!NetworkAgent.Timestamp} time
      * @param {number} dataLength
@@ skipping 33 matching lines @@
      * @param {string} localizedDescription
      * @param {boolean=} canceled
      */
     loadingFailed: function(requestId, time, resourceType, localizedDescription, canceled)
     {
         var networkRequest = this._inflightRequestsById[requestId];
         if (!networkRequest)
             return;
 
         networkRequest.failed = true;
-        networkRequest.type = WebInspector.resourceTypes[resourceType];
+        networkRequest.setResourceType(WebInspector.resourceTypes[resourceType]);
         networkRequest.canceled = canceled;
         networkRequest.localizedFailDescription = localizedDescription;
         this._finishNetworkRequest(networkRequest, time, -1);
     },
 
     /**
      * @param {!NetworkAgent.RequestId} requestId
      * @param {string} requestURL
      */
     webSocketCreated: function(requestId, requestURL)
     {
         // FIXME: WebSocket MUST have initiator info.
         var networkRequest = new WebInspector.NetworkRequest(this._manager._target, requestId, requestURL, "", "", "", null);
-        networkRequest.type = WebInspector.resourceTypes.WebSocket;
+        networkRequest.setResourceType(WebInspector.resourceTypes.WebSocket);
         this._startNetworkRequest(networkRequest);
     },
 
     /**
      * @param {!NetworkAgent.RequestId} requestId
      * @param {!NetworkAgent.Timestamp} time
      * @param {!NetworkAgent.WebSocketRequest} request
      */
     webSocketWillSendHandshakeRequest: function(requestId, time, request)
     {
@@ skipping 165 matching lines @@
      * @param {!NetworkAgent.LoaderId} loaderId
      * @param {string} url
      * @param {string} documentURL
      * @param {?NetworkAgent.Initiator} initiator
      */
     _createNetworkRequest: function(requestId, frameId, loaderId, url, documentURL, initiator)
     {
         return new WebInspector.NetworkRequest(this._manager._target, requestId, url, documentURL, frameId, loaderId, initiator);
     }
 }