[DevTools] Rework some focus code.

third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  * 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:
  *
@@ skipping 76 matching lines @@
     this._searchNavigationElement = this._searchControlElement.createChild("div", "toolbar-search-navigation-controls");
 
     this._searchNavigationPrevElement = this._searchNavigationElement.createChild("div", "toolbar-search-navigation toolbar-search-navigation-prev");
     this._searchNavigationPrevElement.addEventListener("click", this._onPrevButtonSearch.bind(this), false);
     this._searchNavigationPrevElement.title = WebInspector.UIString("Search Previous");
 
     this._searchNavigationNextElement = this._searchNavigationElement.createChild("div", "toolbar-search-navigation toolbar-search-navigation-next");
     this._searchNavigationNextElement.addEventListener("click", this._onNextButtonSearch.bind(this), false);
     this._searchNavigationNextElement.title = WebInspector.UIString("Search Next");
 
-    this._searchInputElement.addEventListener("mousedown", this._onSearchFieldManualFocus.bind(this), false); // when the search field is manually selected
     this._searchInputElement.addEventListener("keydown", this._onSearchKeyDown.bind(this), true);
     this._searchInputElement.addEventListener("input", this._onInput.bind(this), false);
 
     this._replaceInputElement = this._secondRowElement.createChild("td").createChild("input", "search-replace toolbar-replace-control");
     this._replaceInputElement.addEventListener("keydown", this._onReplaceKeyDown.bind(this), true);
     this._replaceInputElement.placeholder = WebInspector.UIString("Replace");
 
     // Column 2
     this._findButtonElement = this._firstRowElement.createChild("td").createChild("button", "search-action-button hidden");
     this._findButtonElement.textContent = WebInspector.UIString("Find");
@@ skipping 135 matching lines @@
      * @return {boolean}
      */
     isSearchVisible: function()
     {
         return this._searchIsVisible;
     },
 
     closeSearch: function()
     {
         this.cancelSearch();
-        if (WebInspector.currentFocusElement() && WebInspector.currentFocusElement().isDescendant(this._footerElementContainer))
+        if (this._footerElementContainer.hasFocus())
             this.focus();
     },
 
     _toggleSearchBar: function(toggled)
     {
         this._footerElementContainer.classList.toggle("hidden", !toggled);
         this.doResize();
     },
 
     cancelSearch: function()
@@ skipping 93 matching lines @@
             this._matchesElement.textContent = WebInspector.UIString("%d matches", matches);
         this._updateSearchNavigationButtonState(matches > 0);
     },
 
     showSearchField: function()
     {
         if (this._searchIsVisible)
             this.cancelSearch();
 
         var queryCandidate;
-        if (WebInspector.currentFocusElement() !== this._searchInputElement) {
+        if (!this._searchInputElement.hasFocus()) {
             var selection = this._searchInputElement.getComponentSelection();
             if (selection.rangeCount)
                 queryCandidate = selection.toString().replace(/\r?\n.*/, "");
         }
 
         this._toggleSearchBar(true);
         this._updateReplaceVisibility();
         if (queryCandidate)
             this._searchInputElement.value = queryCandidate;
         this._performSearch(false, false);
         this._searchInputElement.focus();
         this._searchInputElement.select();
         this._searchIsVisible = true;
     },
 
     _updateReplaceVisibility: function()
     {
         this._replaceElement.classList.toggle("hidden", !this._replaceable);
         if (!this._replaceable) {
             this._replaceCheckboxElement.checked = false;
             this._updateSecondRowVisibility();
         }
     },
 
     /**
      * @param {!Event} event
      */
-    _onSearchFieldManualFocus: function(event)
-    {
-        WebInspector.setCurrentFocusElement(/** @type {?Node} */ (event.target));
-    },
-
-    /**
-     * @param {!Event} event
-     */
     _onSearchKeyDown: function(event)
     {
         if (isEscKey(event)) {
             this.closeSearch();
             event.consume(true);
             return;
         }
         if (!isEnterKey(event))
             return;
 
@@ skipping 244 matching lines @@
             // Silent catch.
         }
 
         // Otherwise just do a plain text search.
         if (!regex)
             regex = createPlainTextSearchRegex(query, modifiers);
 
         return regex;
     }
 }