Remove unnecessary _profileTypesByIdMap map

Source/devtools/front_end/ProfilesPanel.js

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 366 matching lines @@
     this.registerRequiredCSS("profilesPanel.css");
 
     this.createSidebarViewWithTree();
 
     this._searchableView = new WebInspector.SearchableView(this);
     this.splitView.setMainView(this._searchableView);
 
     this.profilesItemTreeElement = new WebInspector.ProfilesSidebarTreeElement(this);
     this.sidebarTree.appendChild(this.profilesItemTreeElement);
 
-    this._profileTypesByIdMap = {};
-
     this.profileViews = document.createElement("div");
     this.profileViews.id = "profile-views";
     this.profileViews.classList.add("vbox");
     this._searchableView.element.appendChild(this.profileViews);
 
     var statusBarContainer = this.splitView.mainElement().createChild("div", "profiles-status-bar");
     this._statusBarElement = statusBarContainer.createChild("div", "status-bar");
 
     var sidebarTreeBox = this.splitView.sidebarElement().createChild("div", "profiles-sidebar-tree-box");
     sidebarTreeBox.appendChild(this.sidebarTreeElement);
@@ skipping 91 matching lines @@
     /**
      * @return {!WebInspector.ProfileLauncherView}
      */
     _createLauncherView: function()
     {
         return new WebInspector.ProfileLauncherView(this);
     },
 
     _findProfileTypeByExtension: function(fileName)
     {
-        for (var id in this._profileTypesByIdMap) {
-            var type = this._profileTypesByIdMap[id];
+        var types = WebInspector.ProfileTypeRegistry.instance.profileTypes();
+        for (var i = 0; i < types.length; i++) {
+            var type = types[i];
             var extension = type.fileExtension();
             if (!extension)
                 continue;
             if (fileName.endsWith(type.fileExtension()))
                 return type;
         }
         return null;
     },
 
     _registerShortcuts: function()
@@ skipping 15 matching lines @@
     /**
      * @param {!File} file
      */
     _loadFromFile: function(file)
     {
         this._createFileSelectorElement();
 
         var profileType = this._findProfileTypeByExtension(file.name);
         if (!profileType) {
             var extensions = [];
-            for (var id in this._profileTypesByIdMap) {
-                var extension = this._profileTypesByIdMap[id].fileExtension();
+            var types = WebInspector.ProfileTypeRegistry.instance.profileTypes();
+            for (var i = 0; i < types.length; i++) {
+                var extension = types[i].fileExtension();
                 if (!extension)
                     continue;
                 extensions.push(extension);
             }
             WebInspector.log(WebInspector.UIString("Can't load file. Only files with extensions '%s' can be loaded.", extensions.join("', '")));
             return;
         }
 
         if (!!profileType.profileBeingRecorded()) {
             WebInspector.log(WebInspector.UIString("Can't load profile when other profile is recording."));
             return;
         }
 
         profileType.loadFromFile(file);
     },
 
     /**
      * @return {boolean}
      */
     toggleRecordButton: function()
     {
         var type = this._selectedProfileType;
         var isProfiling = type.buttonClicked();
         this.recordButton.toggled = isProfiling;
         this.recordButton.title = type.buttonTooltip;
         if (isProfiling) {
             this._launcherView.profileStarted();
             if (type.hasTemporaryView())
-                this._showProfile(type.profileBeingRecorded());
+                this.showProfile(type.profileBeingRecorded());
         } else {
             this._launcherView.profileFinished();
         }
         return true;
     },
 
     _profileBeingRecordedRemoved: function()
     {
         this.recordButton.toggled = false;
         this.recordButton.title = this._selectedProfileType.buttonTooltip;
@@ skipping 18 matching lines @@
         if (statusBarItems) {
             for (var i = 0; i < statusBarItems.length; ++i)
                 this._profileTypeStatusBarItemsContainer.appendChild(statusBarItems[i]);
         }
     },
 
     _reset: function()
     {
         WebInspector.Panel.prototype.reset.call(this);
 
-        for (var typeId in this._profileTypesByIdMap)
-            this._profileTypesByIdMap[typeId]._reset();
+        var types = WebInspector.ProfileTypeRegistry.instance.profileTypes();
+        for (var i = 0; i < types.length; i++)
+            types[i]._reset();
 
         delete this.visibleView;
         delete this.currentQuery;
         this.searchCanceled();
 
         this._profileGroups = {};
         this.recordButton.toggled = false;
         if (this._selectedProfileType)
             this.recordButton.title = this._selectedProfileType.buttonTooltip;
         this._launcherView.profileFinished();
@@ skipping 30 matching lines @@
     _garbageCollectButtonClicked: function()
     {
         HeapProfilerAgent.collectGarbage();
     },
 
     /**
      * @param {!WebInspector.ProfileType} profileType
      */
     _registerProfileType: function(profileType)
     {
-        this._profileTypesByIdMap[profileType.id] = profileType;
         this._launcherView.addProfileType(profileType);
         profileType.treeElement = new WebInspector.SidebarSectionTreeElement(profileType.treeItemTitle, null, true);
         profileType.treeElement.hidden = true;
         this.sidebarTree.appendChild(profileType.treeElement);
         profileType.treeElement.childrenListElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
 
         /**
          * @this {WebInspector.ProfilesPanel}
          */
         function onAddProfileHeader(event)
@@ skipping 103 matching lines @@
 
         var profileTreeElement = profile.createSidebarTreeElement();
         profile.sidebarElement = profileTreeElement;
         profileTreeElement.small = small;
         if (alternateTitle)
             profileTreeElement.mainTitle = alternateTitle;
         profile._profilesTreeElement = profileTreeElement;
 
         sidebarParent.appendChild(profileTreeElement);
         if (!this.visibleView || this.visibleView === this._launcherView)
-            this._showProfile(profile);
+            this.showProfile(profile);
     },
 
     /**
      * @param {!WebInspector.ProfileHeader} profile
      */
     _removeProfileHeader: function(profile)
     {
         if (profile.profileType()._profileBeingRecorded === profile)
             this._profileBeingRecordedRemoved();
 
@@ skipping 23 matching lines @@
             this.profilesItemTreeElement.select();
             this._showLauncherView();
             sidebarParent.hidden = true;
         }
     },
 
     /**
      * @param {?WebInspector.ProfileHeader} profile
      * @return {?WebInspector.View}
      */
-    _showProfile: function(profile)
+    showProfile: function(profile)
     {
         if (!profile || (profile.profileType().profileBeingRecorded() === profile) && !profile.profileType().hasTemporaryView())
             return null;
 
         var view = profile.view(this);
         if (view === this.visibleView)
             return view;
 
         this.closeVisibleView();
 
@@ skipping 14 matching lines @@
 
         return view;
     },
 
     /**
      * @param {!HeapProfilerAgent.HeapSnapshotObjectId} snapshotObjectId
      * @param {string} viewName
      */
     showObject: function(snapshotObjectId, viewName)
     {
-        var heapProfiles = this.getProfileType(WebInspector.HeapSnapshotProfileType.TypeId).getProfiles();
+        var heapProfiles = WebInspector.ProfileTypeRegistry.instance.heapSnapshotProfileType.getProfiles();
         for (var i = 0; i < heapProfiles.length; i++) {
             var profile = heapProfiles[i];
             // FIXME: allow to choose snapshot if there are several options.
             if (profile.maxJSObjectId >= snapshotObjectId) {
-                this._showProfile(profile);
+                this.showProfile(profile);
                 var view = profile.view(this);
                 view.changeView(viewName, function() {
                     function didHighlightObject(found) {
                         if (!found)
                             WebInspector.log("Cannot find corresponding heap snapshot node", WebInspector.ConsoleMessage.MessageLevel.Error, true);
                     }
                     view.dataGrid.highlightObjectByHeapSnapshotId(snapshotObjectId, didHighlightObject.bind(this));
                 });
                 break;
             }
         }
     },
 
-    /**
-     * @param {string} typeId
-     * @param {number} uid
-     * @return {?WebInspector.ProfileHeader}
-     */
-    getProfile: function(typeId, uid)
-    {
-        return this.getProfileType(typeId).getProfile(uid);
-    },
-
-    /**
-     * @param {!WebInspector.View} view
-     */
-    showView: function(view)
-    {
-        this._showProfile(view.profile);
-    },
-
-    /**
-     * @param {string} typeId
-     * @return {!WebInspector.ProfileType}
-     */
-    getProfileType: function(typeId)
-    {
-        return this._profileTypesByIdMap[typeId];
-    },
-
-    /**
-     * @param {string} typeId
-     * @param {string} uid
-     * @return {?WebInspector.View}
-     */
-    showProfile: function(typeId, uid)
-    {
-        return this._showProfile(this.getProfile(typeId, Number(uid)));
-    },
-
     closeVisibleView: function()
     {
         if (this.visibleView)
             this.visibleView.detach();
         delete this.visibleView;
     },
 
     /**
      * @param {string} query
      * @param {boolean} shouldJump
@@ skipping 38 matching lines @@
     jumpToPreviousSearchResult: function()
     {
         if (!this._searchResultsView)
             return;
         if (this._searchResultsView !== this.visibleView)
             return;
         this._searchResultsView.jumpToPreviousSearchResult();
         this._searchableView.updateCurrentMatchIndex(this._searchResultsView.currentSearchResultIndex());
     },
 
-    /**
-     * @return {!Array.<!WebInspector.ProfileHeader>}
-     */
-    _getAllProfiles: function()
-    {
-        var profiles = [];
-        for (var typeId in this._profileTypesByIdMap)
-            profiles = profiles.concat(this._profileTypesByIdMap[typeId].getProfiles());
-        return profiles;
-    },
-
     searchCanceled: function()
     {
         if (this._searchResultsView) {
             if (this._searchResultsView.searchCanceled)
                 this._searchResultsView.searchCanceled();
             this._searchResultsView.currentQuery = null;
             this._searchResultsView = null;
         }
         this._searchableView.updateSearchMatchesCount(0);
     },
@@ skipping 19 matching lines @@
             return;
 
         if (WebInspector.inspectorView.currentPanel() !== this)
             return;
 
         var object = /** @type {!WebInspector.RemoteObject} */ (target);
         var objectId = object.objectId;
         if (!objectId)
             return;
 
-        var heapProfiles = this.getProfileType(WebInspector.HeapSnapshotProfileType.TypeId).getProfiles();
+        var heapProfiles = WebInspector.ProfileTypeRegistry.instance.heapSnapshotProfileType.getProfiles();
         if (!heapProfiles.length)
             return;
 
         /**
          * @this {WebInspector.ProfilesPanel}
          */
         function revealInView(viewName)
         {
             HeapProfilerAgent.getHeapObjectId(objectId, didReceiveHeapObjectId.bind(this, viewName));
         }
@@ skipping 45 matching lines @@
 {
     this.profile = profile;
     WebInspector.SidebarTreeElement.call(this, className, "", "", profile, false);
     this.refreshTitles();
 }
 
 WebInspector.ProfileSidebarTreeElement.prototype = {
     onselect: function()
     {
         if (!this._suppressOnSelect)
-            this.treeOutline.panel._showProfile(this.profile);
+            this.treeOutline.panel.showProfile(this.profile);
     },
 
     /**
      * @return {boolean}
      */
     ondelete: function()
     {
         this.profile.profileType().removeProfile(this.profile);
         return true;
     },
@@ skipping 40 matching lines @@
 WebInspector.ProfileGroupSidebarTreeElement = function(panel, title, subtitle)
 {
     WebInspector.SidebarTreeElement.call(this, "profile-group-sidebar-tree-item", title, subtitle, null, true);
     this._panel = panel;
 }
 
 WebInspector.ProfileGroupSidebarTreeElement.prototype = {
     onselect: function()
     {
         if (this.children.length > 0)
-            this._panel._showProfile(this.children[this.children.length - 1].profile);
+            this._panel.showProfile(this.children[this.children.length - 1].profile);
     },
 
     __proto__: WebInspector.SidebarTreeElement.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.SidebarTreeElement}
  * @param {!WebInspector.ProfilesPanel} panel
  */
@@ skipping 27 matching lines @@
 importScript("HeapSnapshotProxy.js");
 importScript("HeapSnapshotDataGrids.js");
 importScript("HeapSnapshotGridNodes.js");
 importScript("HeapSnapshotView.js");
 importScript("ProfileLauncherView.js");
 importScript("TopDownProfileDataGridTree.js");
 importScript("CanvasProfileView.js");
 importScript("CanvasReplayStateView.js");
 
 WebInspector.ProfileTypeRegistry.instance = new WebInspector.ProfileTypeRegistry();