DevTools: remove WI.SourcesView._currentUISourceCode

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 173 matching lines @@
         if (!(view instanceof WebInspector.UISourceCodeFrame))
             return null;
         return /** @type {!WebInspector.UISourceCodeFrame} */ (view);
     },
 
     /**
      * @return {?WebInspector.UISourceCode}
      */
     currentUISourceCode: function()
     {
-        return this._currentUISourceCode;
+        return this._editorContainer.currentFile();
     },
 
     /**
      * @param {!Event=} event
      */
     _onCloseEditorTab: function(event)
     {
-        var uiSourceCode = this.currentUISourceCode();
+        var uiSourceCode = this._editorContainer.currentFile();
         if (!uiSourceCode)
             return false;
         this._editorContainer.closeFile(uiSourceCode);
         return true;
     },
 
     /**
      * @param {!Event=} event
      */
     _onJumpToPreviousLocation: function(event)
@@ skipping 22 matching lines @@
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _addUISourceCode: function(uiSourceCode)
     {
         if (uiSourceCode.isFromServiceProject())
             return;
         this._editorContainer.addUISourceCode(uiSourceCode);
         // Replace debugger script-based uiSourceCode with a network-based one.
-        var currentUISourceCode = this._currentUISourceCode;
+        var currentUISourceCode = this._editorContainer.currentFile();
         if (!currentUISourceCode)
             return;
         var networkURL = WebInspector.networkMapping.networkURL(uiSourceCode);
         var currentNetworkURL = WebInspector.networkMapping.networkURL(currentUISourceCode);
         if (currentUISourceCode.isFromServiceProject() && currentUISourceCode !== uiSourceCode && currentNetworkURL === networkURL && networkURL) {
             this._editorContainer.showFile(uiSourceCode);
             this._editorContainer.removeUISourceCode(currentUISourceCode);
         }
     },
 
@@ skipping 163 matching lines @@
 
     /**
      * @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;
+        if (!this._editorContainer.currentFile())
             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)
     {
-        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(!!currentSourceFrame && currentSourceFrame.canEditSource());
         this._searchableView.refreshSearch();
         this._updateScriptViewToolbarItems();
 
-        this.dispatchEventToListeners(WebInspector.SourcesView.Events.EditorSelected, this._currentUISourceCode);
+        this.dispatchEventToListeners(WebInspector.SourcesView.Events.EditorSelected, this._editorContainer.currentFile());
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     sourceRenamed: function(uiSourceCode)
     {
         this._recreateSourceFrameIfNeeded(uiSourceCode);
     },
 
@@ skipping 147 matching lines @@
             this._openResourceDialogHistory = [];
         WebInspector.OpenResourceDialog.show(this, query || "", defaultScores, this._openResourceDialogHistory);
     },
 
     /**
      * @param {!Event=} event
      * @return {boolean}
      */
     _showGoToLineDialog: function(event)
     {
-        if (this._currentUISourceCode)
+        if (this._editorContainer.currentFile())
             this.showOpenResourceDialog(":");
         return true;
     },
 
     /**
      * @return {boolean}
      */
     _save: function()
     {
         this._saveSourceFrame(this.currentSourceFrame());
@@ skipping 147 matching lines @@
      */
     handleAction: function(context, actionId)
     {
         var sourcesView = WebInspector.context.flavor(WebInspector.SourcesView);
         if (!sourcesView)
             return false;
         sourcesView._editorContainer.closeAllFiles();
         return true;
     }
 }