Add <label> to items in Event Listener Breakpoint of Chrome Dev Tools

Source/devtools/blink/chromeServerProfile/Default/Cache/f_000063

Index: Source/devtools/blink/chromeServerProfile/Default/Cache/f_000063
diff --git a/Source/devtools/front_end/SearchableView.js b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_000063
similarity index 91%
copy from Source/devtools/front_end/SearchableView.js
copy to Source/devtools/blink/chromeServerProfile/Default/Cache/f_000063
index c0d8a718236c520a2c672fb37999086a84735a1d..f067bb2ff443098f5d0be0a0a1056aefe954a4b3 100644
--- a/Source/devtools/front_end/SearchableView.js
+++ b/Source/devtools/blink/chromeServerProfile/Default/Cache/f_000063
@@ -82,7 +82,7 @@ WebInspector.SearchableView = function(searchable)
     this._findButtonElement = this._firstRowElement.createChild("td").createChild("button", "hidden");
     this._findButtonElement.textContent = WebInspector.UIString("Find");
     this._findButtonElement.tabIndex = -1;
-    this._findButtonElement.addEventListener("click", this._onFindClick.bind(this), false);
+    this._findButtonElement.addEventListener("click", this._onNextButtonSearch.bind(this), false);
 
     this._replaceButtonElement = this._secondRowElement.createChild("td").createChild("button");
     this._replaceButtonElement.textContent = WebInspector.UIString("Replace");
@@ -93,8 +93,9 @@ WebInspector.SearchableView = function(searchable)
     // Column 3
     this._prevButtonElement = this._firstRowElement.createChild("td").createChild("button", "hidden");
     this._prevButtonElement.textContent = WebInspector.UIString("Previous");
+    this._prevButtonElement.disabled = true;
     this._prevButtonElement.tabIndex = -1;
-    this._prevButtonElement.addEventListener("click", this._onPreviousClick.bind(this), false);
+    this._prevButtonElement.addEventListener("click", this._onPrevButtonSearch.bind(this), false);
 
     this._replaceAllButtonElement = this._secondRowElement.createChild("td").createChild("button");
     this._replaceAllButtonElement.textContent = WebInspector.UIString("Replace All");
@@ -105,14 +106,12 @@ WebInspector.SearchableView = function(searchable)
 
     this._replaceCheckboxElement = this._replaceElement.createChild("input");
     this._replaceCheckboxElement.type = "checkbox";
-    this._uniqueId = ++WebInspector.SearchableView._lastUniqueId;
-    var replaceCheckboxId = "search-replace-trigger" + this._uniqueId;
-    this._replaceCheckboxElement.id = replaceCheckboxId;
+    this._replaceCheckboxElement.id = "search-replace-trigger";
     this._replaceCheckboxElement.addEventListener("change", this._updateSecondRowVisibility.bind(this), false);
 
     this._replaceLabelElement = this._replaceElement.createChild("label");
     this._replaceLabelElement.textContent = WebInspector.UIString("Replace");
-    this._replaceLabelElement.setAttribute("for", replaceCheckboxId);
+    this._replaceLabelElement.setAttribute("for", "search-replace-trigger");
 
     // Column 5
     var cancelButtonElement = this._firstRowElement.createChild("td").createChild("button");
@@ -124,8 +123,6 @@ WebInspector.SearchableView = function(searchable)
     this._registerShortcuts();
 }
 
-WebInspector.SearchableView._lastUniqueId = 0;
-
 WebInspector.SearchableView.findShortcuts = function()
 {
     if (WebInspector.SearchableView._findShortcuts)
@@ -166,20 +163,6 @@ WebInspector.SearchableView.findPreviousShortcuts = function()
 
 WebInspector.SearchableView.prototype = {
     /**
-     * @return {!Element}
-     */
-    defaultFocusedElement: function()
-    {
-        var children = this.children();
-        for (var i = 0; i < children.length; ++i) {
-            var element = children[i].defaultFocusedElement();
-            if (element)
-                return element;
-        }
-        return WebInspector.View.prototype.defaultFocusedElement.call(this);
-    },
-
-    /**
      * @param {!KeyboardEvent} event
      */
     _onKeyDown: function(event)
@@ -256,7 +239,7 @@ WebInspector.SearchableView.prototype = {
     {
         this.cancelSearch();
         if (WebInspector.currentFocusElement().isDescendant(this._footerElementContainer))
-            this.focus();
+            WebInspector.setCurrentFocusElement(WebInspector.previousFocusElement());
     },
 
     _toggleSearchBar: function(toggled)
@@ -329,6 +312,7 @@ WebInspector.SearchableView.prototype = {
     _updateSearchNavigationButtonState: function(enabled)
     {
         this._replaceButtonElement.disabled = !enabled;
+        this._prevButtonElement.disabled = !enabled;
         if (enabled) {
             this._searchNavigationPrevElement.classList.add("enabled");
             this._searchNavigationNextElement.classList.add("enabled");
@@ -399,13 +383,13 @@ WebInspector.SearchableView.prototype = {
      */
     _onSearchKeyDown: function(event)
     {
-        if (!isEnterKey(event))
-            return;
-
-        if (!this._currentQuery)
-            this._performSearch(true, true, event.shiftKey);
-        else
-            this._jumpToNextSearchResult(event.shiftKey);
+        if (isEnterKey(event)) {
+            // FIXME: This won't start backwards search with Shift+Enter correctly.
+            if (!this._currentQuery)
+                this._performSearch(true, true);
+            else
+                this._jumpToNextSearchResult(event.shiftKey);
+        }
     },
 
     /**
@@ -435,6 +419,7 @@ WebInspector.SearchableView.prototype = {
     {
         if (!this._searchNavigationNextElement.classList.contains("enabled"))
             return;
+        // Simulate next search on search-navigation-button click.
         this._jumpToNextSearchResult();
         this._searchInputElement.focus();
     },
@@ -443,28 +428,11 @@ WebInspector.SearchableView.prototype = {
     {
         if (!this._searchNavigationPrevElement.classList.contains("enabled"))
             return;
+        // Simulate previous search on search-navigation-button click.
         this._jumpToNextSearchResult(true);
         this._searchInputElement.focus();
     },
 
-    _onFindClick: function(event)
-    {
-        if (!this._currentQuery)
-            this._performSearch(true, true);
-        else
-            this._jumpToNextSearchResult();
-        this._searchInputElement.focus();
-    },
-
-    _onPreviousClick: function(event)
-    {
-        if (!this._currentQuery)
-            this._performSearch(true, true, true);
-        else
-            this._jumpToNextSearchResult(true);
-        this._searchInputElement.focus();
-    },
-
     _clearSearch: function()
     {
         delete this._currentQuery;
@@ -478,9 +446,8 @@ WebInspector.SearchableView.prototype = {
     /**
      * @param {boolean} forceSearch
      * @param {boolean} shouldJump
-     * @param {boolean=} jumpBackwards
      */
-    _performSearch: function(forceSearch, shouldJump, jumpBackwards)
+    _performSearch: function(forceSearch, shouldJump)
     {
         var query = this._searchInputElement.value;
         if (!query || (!forceSearch && query.length < this._minimalSearchQuerySize && !this._currentQuery)) {
@@ -490,7 +457,7 @@ WebInspector.SearchableView.prototype = {
 
         this._currentQuery = query;
         this._searchProvider.currentQuery = query;
-        this._searchProvider.performSearch(query, shouldJump, jumpBackwards);
+        this._searchProvider.performSearch(query, shouldJump);
     },
 
     _updateSecondRowVisibility: function()
@@ -548,9 +515,8 @@ WebInspector.Searchable.prototype = {
     /**
      * @param {string} query
      * @param {boolean} shouldJump
-     * @param {boolean=} jumpBackwards
      */
-    performSearch: function(query, shouldJump, jumpBackwards) { },
+    performSearch: function(query, shouldJump) { },
 
     jumpToNextSearchResult: function() { },