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

Source/devtools/front_end/resources/ResourcesPanel.js

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 463 matching lines @@
      */
     _resourceViewForResource: function(resource)
     {
         if (resource.hasTextContent()) {
             var treeElement = this._findTreeElementForResource(resource);
             if (!treeElement)
                 return null;
             return treeElement.sourceView();
         }
 
-        switch (resource.type) {
+        switch (resource.resourceType()) {
         case WebInspector.resourceTypes.Image:
             return new WebInspector.ImageView(resource.url, resource.mimeType, resource);
         case WebInspector.resourceTypes.Font:
             return new WebInspector.FontView(resource.url);
         default:
             return new WebInspector.EmptyView(resource.url);
         }
     },
 
     /**
@@ skipping 583 matching lines @@
     {
         if (hovered) {
             this.listItemElement.classList.add("hovered");
             DOMAgent.highlightFrame(this._frameId, WebInspector.Color.PageHighlight.Content.toProtocolRGBA(), WebInspector.Color.PageHighlight.ContentOutline.toProtocolRGBA());
         } else {
             this.listItemElement.classList.remove("hovered");
             DOMAgent.hideHighlight();
         }
     },
 
+    /**
+     * @param {!WebInspector.Resource} resource
+     */
     appendResource: function(resource)
     {
         if (resource.isHidden())
             return;
-        var categoryName = resource.type.name();
-        var categoryElement = resource.type === WebInspector.resourceTypes.Document ? this : this._categoryElements[categoryName];
+        var resourceType = resource.resourceType();
+        var categoryName = resourceType.name();
+        var categoryElement = resourceType === WebInspector.resourceTypes.Document ? this : this._categoryElements[categoryName];
         if (!categoryElement) {
-            categoryElement = new WebInspector.StorageCategoryTreeElement(this._storagePanel, resource.type.categoryTitle(), categoryName, null, true);
-            this._categoryElements[resource.type.name()] = categoryElement;
+            categoryElement = new WebInspector.StorageCategoryTreeElement(this._storagePanel, resource.resourceType().categoryTitle(), categoryName, null, true);
+            this._categoryElements[resourceType.name()] = categoryElement;
             this._insertInPresentationOrder(this, categoryElement);
         }
         var resourceTreeElement = new WebInspector.FrameResourceTreeElement(this._storagePanel, resource);
         this._insertInPresentationOrder(categoryElement, resourceTreeElement);
         this._treeElementForResource[resource.url] = resourceTreeElement;
     },
 
     /**
      * @param {string} url
      * @return {?WebInspector.Resource}
@@ skipping 47 matching lines @@
         }
         parentTreeElement.insertChild(childTreeElement, i);
     },
 
     __proto__: WebInspector.BaseStorageTreeElement.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.BaseStorageTreeElement}
+ * @param {!WebInspector.ResourcesPanel} storagePanel
+ * @param {!WebInspector.Resource} resource
  */
 WebInspector.FrameResourceTreeElement = function(storagePanel, resource)
 {
-    WebInspector.BaseStorageTreeElement.call(this, storagePanel, resource, resource.displayName, ["resource-sidebar-tree-item", "resources-type-" + resource.type.name()]);
+    WebInspector.BaseStorageTreeElement.call(this, storagePanel, resource, resource.displayName, ["resource-sidebar-tree-item", "resources-type-" + resource.resourceType().name()]);
+    /** @type {!WebInspector.Resource} */
     this._resource = resource;
     this._resource.addEventListener(WebInspector.Resource.Events.MessageAdded, this._consoleMessageAdded, this);
     this._resource.addEventListener(WebInspector.Resource.Events.MessagesCleared, this._consoleMessagesCleared, this);
     this.tooltip = resource.url;
 }
 
 WebInspector.FrameResourceTreeElement.prototype = {
     get itemURL()
     {
         return this._resource.url;
@@ skipping 20 matching lines @@
         return false;
     },
 
     /**
      * @override
      */
     onattach: function()
     {
         WebInspector.BaseStorageTreeElement.prototype.onattach.call(this);
 
-        if (this._resource.type === WebInspector.resourceTypes.Image) {
+        if (this._resource.resourceType() === WebInspector.resourceTypes.Image) {
             var iconElement = createElementWithClass("div", "icon");
             var previewImage = iconElement.createChild("img", "image-resource-icon-preview");
             this._resource.populateImageSource(previewImage);
             this.listItemElement.replaceChild(iconElement, this.imageElement);
         }
 
         this._statusElement = createElementWithClass("div", "status");
         this.listItemElement.insertBefore(this._statusElement, this.titleElement);
 
         this.listItemElement.draggable = true;
         this.listItemElement.addEventListener("dragstart", this._ondragstart.bind(this), false);
         this.listItemElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
 
         this._updateErrorsAndWarningsBubbles();
     },
 
     /**
      * @param {!MouseEvent} event
      * @return {boolean}
      */
     _ondragstart: function(event)
     {
-        event.dataTransfer.setData("text/plain", this._resource.content);
+        event.dataTransfer.setData("text/plain", this._resource.content || "");
         event.dataTransfer.effectAllowed = "copy";
         return true;
     },
 
     _handleContextMenuEvent: function(event)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
         contextMenu.appendApplicableItems(this._resource);
         contextMenu.show();
     },
@@ skipping 18 matching lines @@
     },
 
     _updateErrorsAndWarningsBubbles: function()
     {
         if (this._storagePanel.currentQuery)
             return;
 
         this._resetBubble();
 
         if (this._resource.warnings || this._resource.errors)
-            this._setBubbleText(this._resource.warnings + this._resource.errors);
+            this._setBubbleText((this._resource.warnings + this._resource.errors) + "");

[apavlov, 2014/10/22 07:40:05]

String(this._resource.warnings + this._resource.errors) would be more readable,
I believe

[eustas, 2014/10/22 08:23:00]

Done. Thanks.

 
         if (this._resource.warnings)
             this._bubbleElement.classList.add("warning");
 
         if (this._resource.errors)
             this._bubbleElement.classList.add("error");
     },
 
     _consoleMessagesCleared: function()
     {
@@ skipping 899 matching lines @@
 
 WebInspector.ResourcesPanelFactory.prototype = {
     /**
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.ResourcesPanel._instance();
     }
 }