DevTools: [Persistence] tabs should not change order during reload

third_party/WebKit/Source/devtools/front_end/sources/TabbedEditorContainer.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 83 matching lines @@
         if (networkTabId)
             this._tabbedPane.changeTabTitle(networkTabId, this._titleForFile(binding.fileSystem), this._tooltipForFile(binding.fileSystem));
         if (!fileSystemTabId)
             return;
 
         var wasSelectedInFileSystem = this._currentFile === binding.fileSystem;
         var currentSelectionRange = this._history.selectionRange(binding.fileSystem.url());
         var currentScrollLineNumber = this._history.scrollLineNumber(binding.fileSystem.url());
 
         var tabIndex = this._tabbedPane.tabIndex(fileSystemTabId);
-        this._closeTabs([fileSystemTabId], true);
-        if (!networkTabId)
-            networkTabId = this._appendFileTab(binding.network, false, tabIndex);
+        var tabsToClose = [fileSystemTabId];
+        if (networkTabId)
+            tabsToClose.push(networkTabId);
+        this._closeTabs(tabsToClose, true);
+        networkTabId = this._appendFileTab(binding.network, false, tabIndex);
         this._updateHistory();
 
         if (wasSelectedInFileSystem)
             this._tabbedPane.selectTab(networkTabId, false);
 
         var networkTabView = /** @type {!WebInspector.Widget} */(this._tabbedPane.tabView(networkTabId));
         this._restoreEditorProperties(networkTabView, currentSelectionRange, currentScrollLineNumber);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onBindingRemoved: function(event)
     {
         var binding = /** @type {!WebInspector.PersistenceBinding} */(event.data);
         var networkTabId = this._tabIds.get(binding.network);
         if (!networkTabId)
             return;
+        var tabIndex = this._tabbedPane.tabIndex(networkTabId);
+        var wasSelected = this._currentFile === binding.network;
+        var fileSystemTabId = this._appendFileTab(binding.fileSystem, false, tabIndex);
+        this._updateHistory();
 
-        var fileSystemTabId = this._appendFileTab(binding.fileSystem, false);
-        this._updateHistory();
+        if (wasSelected)
+            this._tabbedPane.selectTab(fileSystemTabId, false);
 
         var fileSystemTabView = /** @type {!WebInspector.Widget} */(this._tabbedPane.tabView(fileSystemTabId));
         var savedSelectionRange = this._history.selectionRange(binding.network.url());
         var savedScrollLineNumber = this._history.scrollLineNumber(binding.network.url());
         this._restoreEditorProperties(fileSystemTabView, savedSelectionRange, savedScrollLineNumber);
     },
 
     /**
      * @return {!WebInspector.Widget}
      */
@@ skipping 706 matching lines @@
     /**
      * @override
      * @param {string} tabId
      * @param {!WebInspector.ContextMenu} contextMenu
      */
     onContextMenu: function(tabId, contextMenu)
     {
         this._editorContainer._onContextMenu(tabId, contextMenu);
     }
 };