Make "three snapshot technique" work on heap snapshots loaded from files

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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const UserInitiatedProfileName = "org.webkit.profiles.user-initiated";
-
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @param {string} id
  * @param {string} name
  */
 WebInspector.ProfileType = function(id, name)
 {
     this._id = id;
     this._name = name;
@@ skipping 468 matching lines @@
             }
             WebInspector.log(WebInspector.UIString("Can't load file. Only files with extensions '%s' can be loaded.", extensions.join("', '")));
             return;
         }
 
         if (!!profileType.findTemporaryProfile()) {
             WebInspector.log(WebInspector.UIString("Can't load profile when other profile is recording."));
             return;
         }
 
-        var temporaryProfile = profileType.createTemporaryProfile(WebInspector.ProfilesPanelDescriptor.UserInitiatedProfileName + "." + file.name);
+        var name = file.name;
+        if (name.endsWith(profileType.fileExtension()))
+            name = name.substr(0, name.length - profileType.fileExtension().length);
+        var temporaryProfile = profileType.createTemporaryProfile(name);
         temporaryProfile.setFromFile();
         profileType.addProfile(temporaryProfile);
         temporaryProfile.loadFromFile(file);
     },
 
     get statusBarItems()
     {
         return this._statusBarButtons.select("element").concat(this._profileTypeStatusBarItemsContainer, this._profileViewStatusBarItemsContainer);
     },
 
@@ skipping 167 matching lines @@
      */
     _addProfileHeader: function(profile)
     {
         var profileType = profile.profileType();
         var typeId = profileType.id;
         var sidebarParent = profileType.treeElement;
         sidebarParent.hidden = false;
         var small = false;
         var alternateTitle;
 
-        if (!WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(profile.title) && !profile.isTemporary) {
+        if (!profile.fromFile() && !profile.isTemporary) {
             var profileTitleKey = this._makeTitleKey(profile.title, typeId);
             if (!(profileTitleKey in this._profileGroups))
                 this._profileGroups[profileTitleKey] = [];
 
             var group = this._profileGroups[profileTitleKey];
             group.push(profile);
             if (group.length === 2) {
                 // Make a group TreeElement now that there are 2 profiles.
                 group._profilesTreeElement = new WebInspector.ProfileGroupSidebarTreeElement(this, profile.title);
 
@@ skipping 508 matching lines @@
  * @constructor
  * @extends {WebInspector.SidebarTreeElement}
  * @param {!WebInspector.ProfileHeader} profile
  * @param {string} titleFormat
  * @param {string} className
  */
 WebInspector.ProfileSidebarTreeElement = function(profile, titleFormat, className)
 {
     this.profile = profile;
     this._titleFormat = titleFormat;
-
-    if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(this.profile.title))
-        this._profileNumber = WebInspector.ProfilesPanelDescriptor.userInitiatedProfileIndex(this.profile.title);
-
     WebInspector.SidebarTreeElement.call(this, className, "", "", profile, false);
-
     this.refreshTitles();
 }
 
 WebInspector.ProfileSidebarTreeElement.prototype = {
     onselect: function()
     {
         if (!this._suppressOnSelect)
             this.treeOutline.panel._showProfile(this.profile);
     },
 
     ondelete: function()
     {
         this.treeOutline.panel._removeProfileHeader(this.profile);
         return true;
     },
 
     get mainTitle()
     {
         if (this._mainTitle)
             return this._mainTitle;
-        if (WebInspector.ProfilesPanelDescriptor.isUserInitiatedProfile(this.profile.title))
-            return WebInspector.UIString(this._titleFormat, this._profileNumber);
         return this.profile.title;
     },
 
     set mainTitle(x)
     {
         this._mainTitle = x;
         this.refreshTitles();
     },
 
     set searchMatches(matches)
@@ skipping 142 matching lines @@
 importScript("HeapSnapshotGridNodes.js");
 importScript("HeapSnapshotLoader.js");
 importScript("HeapSnapshotProxy.js");
 importScript("HeapSnapshotView.js");
 importScript("HeapSnapshotWorkerDispatcher.js");
 importScript("JSHeapSnapshot.js");
 importScript("ProfileLauncherView.js");
 importScript("TopDownProfileDataGridTree.js");
 importScript("CanvasProfileView.js");
 importScript("CanvasReplayStateView.js");