DevTools: kill WI.SourcesView._showFile method

third_party/WebKit/Source/devtools/front_end/sources/SourcesView.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.TabbedEditorContainerDelegate}
  * @implements {WebInspector.Searchable}
  * @implements {WebInspector.Replaceable}
  * @extends {WebInspector.VBox}
@@ skipping 230 matching lines @@
         if (uiSourceCode.isFromServiceProject())
             return;
         this._editorContainer.addUISourceCode(uiSourceCode);
         // Replace debugger script-based uiSourceCode with a network-based one.
         var currentUISourceCode = this._currentUISourceCode;
         if (!currentUISourceCode)
             return;
         var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);
         var currentNetworkURL = WebInspector.networkMapping.networkURL(currentUISourceCode);
         if (currentUISourceCode.isFromServiceProject() && currentUISourceCode !== uiSourceCode && currentNetworkURL === networkURL && networkURL) {
-            this._showFile(uiSourceCode);
+            this._editorContainer.showFile(uiSourceCode);
             this._editorContainer.removeUISourceCode(currentUISourceCode);
         }
     },
 
     _uiSourceCodeRemoved: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         this._removeUISourceCodes([uiSourceCode]);
     },
 
@@ skipping 29 matching lines @@
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {number=} lineNumber 0-based
      * @param {number=} columnNumber
      * @param {boolean=} omitFocus
      * @param {boolean=} omitHighlight
      */
     showSourceLocation: function(uiSourceCode, lineNumber, columnNumber, omitFocus, omitHighlight)
     {
         this._historyManager.updateCurrentState();
-        var sourceView = this._showFile(uiSourceCode);
-        if (typeof lineNumber === "number" && sourceView instanceof WebInspector.UISourceCodeFrame)
-            /** @type {!WebInspector.UISourceCodeFrame} */(sourceView).revealPosition(lineNumber, columnNumber, !omitHighlight);
+        this._editorContainer.showFile(uiSourceCode)
+        var currentSourceFrame = this.currentSourceFrame();
+        if (currentSourceFrame && typeof lineNumber === "number")
+            currentSourceFrame.revealPosition(lineNumber, columnNumber, !omitHighlight);
         this._historyManager.pushNewState();
         if (!omitFocus)
-            sourceView.focus();
+            this.visibleView().focus();
     },
 
     /**
-     * @param {!WebInspector.UISourceCode} uiSourceCode
-     * @return {!WebInspector.Widget}
-     */
-    _showFile: function(uiSourceCode)
-    {
-        var sourceView = this._getOrCreateSourceView(uiSourceCode);
-        if (this._currentUISourceCode === uiSourceCode)
-            return sourceView;
-
-        var currentFrame = this.currentSourceFrame();
-        if (currentFrame)
-            currentFrame.setSearchableView(null);
-
-        this._currentUISourceCode = uiSourceCode;
-        this._editorContainer.showFile(uiSourceCode);
-        this._updateScriptViewToolbarItems();
-
-        currentFrame = this.currentSourceFrame();
-        if (currentFrame)
-            currentFrame.setSearchableView(this._searchableView);
-
-        return sourceView;
-    },
-
-    /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {!WebInspector.Widget}
      */
     _createSourceView: function(uiSourceCode)
     {
         var sourceFrame;
         var sourceView;
         var contentType = uiSourceCode.contentType();
 
         if (contentType.hasScripts())
@@ skipping 89 matching lines @@
     setExecutionLocation: function(uiLocation)
     {
         var sourceView = this._getOrCreateSourceView(uiLocation.uiSourceCode);
         if (sourceView instanceof WebInspector.UISourceCodeFrame) {
             var sourceFrame = /** @type {!WebInspector.UISourceCodeFrame} */(sourceView);
             sourceFrame.setExecutionLocation(uiLocation);
             this._executionSourceFrame = sourceFrame;
         }
     },
 
+    /**
+     * @param {!WebInspector.Event} event
+     */
     _editorClosed: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         this._historyManager.removeHistoryForSourceCode(uiSourceCode);
 
         var wasSelected = false;
         if (this._currentUISourceCode === uiSourceCode) {
             delete this._currentUISourceCode;
             wasSelected = true;
         }
 
         // SourcesNavigator does not need to update on EditorClosed.
         this._updateScriptViewToolbarItems();
         this._searchableView.resetSearch();
 
         var data = {};
         data.uiSourceCode = uiSourceCode;
         data.wasSelected = wasSelected;
         this.dispatchEventToListeners(WebInspector.SourcesView.Events.EditorClosed, data);
     },
 
+    /**
+     * @param {!WebInspector.Event} event
+     */
     _editorSelected: function(event)
     {
-        var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data.currentFile);
-        var shouldUseHistoryManager = uiSourceCode !== this._currentUISourceCode && event.data.userGesture;
-        if (shouldUseHistoryManager)
-            this._historyManager.updateCurrentState();
-        var sourceView = this._showFile(uiSourceCode);
-        if (shouldUseHistoryManager)
-            this._historyManager.pushNewState();
+        this._currentUISourceCode = /** @type {!WebInspector.UISourceCode} */(event.data.currentFile);
+        var previousSourceFrame = event.data.previousView instanceof WebInspector.UISourceCodeFrame ? event.data.previousView : null;
+        if (previousSourceFrame)
+            previousSourceFrame.setSearchableView(null);
+        var currentSourceFrame = event.data.currentView instanceof WebInspector.UISourceCodeFrame ? event.data.currentView : null;
+        if (currentSourceFrame)
+            currentSourceFrame.setSearchableView(this._searchableView);
 
-        this._searchableView.setReplaceable(sourceView instanceof WebInspector.UISourceCodeFrame && /** @type {!WebInspector.UISourceCodeFrame} */(sourceView).canEditSource());
+        this._searchableView.setReplaceable(!!currentSourceFrame && currentSourceFrame.canEditSource());
         this._searchableView.refreshSearch();
+        this._updateScriptViewToolbarItems();
 
-        this.dispatchEventToListeners(WebInspector.SourcesView.Events.EditorSelected, uiSourceCode);
+        this.dispatchEventToListeners(WebInspector.SourcesView.Events.EditorSelected, this._currentUISourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     sourceRenamed: function(uiSourceCode)
     {
         this._recreateSourceFrameIfNeeded(uiSourceCode);
     },
 
@@ skipping 315 matching lines @@
      */
     handleAction: function(context, actionId)
     {
         var sourcesView = WebInspector.context.flavor(WebInspector.SourcesView);
         if (!sourcesView)
             return false;
         sourcesView._editorContainer.closeAllFiles();
         return true;
     }
 }