[DevTools] SourceFrame implements Search interface

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 298 matching lines @@
     /**
      * @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;
@@ skipping 158 matching lines @@
     },
 
     /**
      * @override
      * @param {!WebInspector.SearchableView.SearchConfig} searchConfig
      * @param {boolean} shouldJump
      * @param {boolean=} jumpBackwards
      */
     performSearch: function(searchConfig, shouldJump, jumpBackwards)
     {
-        this._searchableView.updateSearchMatchesCount(0);
-
         var sourceFrame = this.currentSourceFrame();
         if (!sourceFrame)
             return;
 
         this._searchView = sourceFrame;

[allada, 2016/03/23 23:04:33]

These are still in place to ensure if current sourceFrame has not been searched
yet (ie: performSearch() has not been executed on it) and jumpToNext (or
previous) was executed on it, it will search it for the first time instead of
trying to jumpToNext when there is no searchData sent to the sourceFrame (ie: it
wouldn't know what to search).

         this._searchConfig = searchConfig;
 
-        /**
-         * @param {!WebInspector.Widget} view
-         * @param {number} searchMatches
-         * @this {WebInspector.SourcesView}
-         */
-        function finishedCallback(view, searchMatches)
-        {
-            if (!searchMatches)
-                return;
-
-            this._searchableView.updateSearchMatchesCount(searchMatches);
-        }
-
-        /**
-         * @param {number} currentMatchIndex
-         * @this {WebInspector.SourcesView}
-         */
-        function currentMatchChanged(currentMatchIndex)
-        {
-            this._searchableView.updateCurrentMatchIndex(currentMatchIndex);
-        }
-
-        /**
-         * @this {WebInspector.SourcesView}
-         */
-        function searchResultsChanged()
-        {
-            this.performSearch(this._searchConfig, false, false);
-        }
-
-        this._searchView.performSearch(this._searchConfig, shouldJump, !!jumpBackwards, finishedCallback.bind(this), currentMatchChanged.bind(this), searchResultsChanged.bind(this));
+        this._searchView.performSearch(this._searchConfig, shouldJump, jumpBackwards);
     },
 
     /**
      * @override
      */
     jumpToNextSearchResult: function()
     {
         if (!this._searchView)
             return;
 
@@ skipping 252 matching lines @@
         var currentUISourceCode = sourcesView.currentUISourceCode();
         if (!currentUISourceCode)
             return false;
         var nextUISourceCode = WebInspector.SourcesView.SwitchFileActionDelegate._nextFile(currentUISourceCode);
         if (!nextUISourceCode)
             return false;
         sourcesView.showSourceLocation(nextUISourceCode);
         return true;
     }
 }