Revert of [DevTools] Added keyboard search while in sources

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

 /*
  * Copyright (C) 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 25 matching lines @@
     this._createRootElement();
 
     this.selectedTreeElement = null;
     this.expandTreeElementsWhenArrowing = false;
     /** @type {?function(!TreeElement, !TreeElement):number} */
     this._comparator = null;
 
     this._contentElement = this._rootElement._childrenListNode;
     this._contentElement.addEventListener("keydown", this._treeKeyDown.bind(this), true);
 
-    this.element = this._contentElement;
-
     this.setFocusable(!nonFocusable);
 
-    this.element.addEventListener("keypress", this._handleKeyPressForHighlighting.bind(this), true);
-    this.element.addEventListener("blur", this._clearFilter.bind(this), true);
-    this.element.addEventListener("click", this._clearFilter.bind(this), true);
-
-    this._currentSelectionFilterString = "";
-    this._interactiveFilterEnabled = false;
-    /** @type {!Array.<!TreeElement>} */
-    this._highlightedNodes = []
+    this.element = this._contentElement;
 }
 
 TreeOutline.Events = {
     ElementAttached: "ElementAttached",
     ElementExpanded: "ElementExpanded",
     ElementCollapsed: "ElementCollapsed",
     ElementSelected: "ElementSelected"
 }
 
 TreeOutline.prototype = {
     _createRootElement: function()
     {
         this._rootElement = new TreeElement();
         this._rootElement.treeOutline = this;
         this._rootElement.root = true;
         this._rootElement.selectable = false;
         this._rootElement.expanded = true;
         this._rootElement._childrenListNode.classList.remove("children");
     },
 
     /**
      * @return {!TreeElement}
      */
     rootElement: function()
     {
         return this._rootElement;
     },
 
     /**
-     * @param {boolean} enable
-     */
-    setInteractiveFilterable: function(enable)
-    {
-        if (enable === this._interactiveFilterEnabled)
-            return;
-        if (!enable)
-            this._setCurrentSelectionFilterString("");
-        this._interactiveFilterEnabled = enable;
-    },
-
-    /**
-     * @param {string} filterString
-     */
-    _setCurrentSelectionFilterString: function(filterString)
-    {
-        this._currentSelectionFilterString = filterString;
-        this._refreshHighlighting();
-    },
-
-    /**
-     * @param {string} filterString
-     * @return {!RegExp}
-     */
-    _makeFilterRegexFromString: function(filterString)
-    {
-        return new RegExp(filterString.escapeForRegExp(), "gi")
-    },
-
-    _refreshHighlighting: function()
-    {
-        if (!this._rootElement)
-            return;
-
-        for (var changedNode of this._highlightedNodes)
-            changedNode._revertHighlightChanges();
-
-        this._highlightedNodes = [];
-
-        if (!this._currentSelectionFilterString)
-            return;
-
-        if (this.selectedTreeElement && !this.selectedTreeElement.selectable) {
-            if (!this.selectNext())
-                this.selectPrevious();
-        }
-
-        var filterRegex = this._makeFilterRegexFromString(this._currentSelectionFilterString);
-        var node = this._rootElement.firstChild();
-        while (node) {
-            if (node._applyHighlightFilter(filterRegex))
-                this._highlightedNodes.push(node);
-            node = node.traverseNextTreeElement(true, null, true);
-        }
-    },
-
-    _clearFilter: function()
-    {
-        if (this._interactiveFilterEnabled)
-            this._setCurrentSelectionFilterString("");
-    },
-
-    /**
-     * @param {!Event} event
-     */
-    _handleKeyPressForHighlighting: function(event)
-    {
-        if (!this._interactiveFilterEnabled)
-            return;
-
-        if (event.target !== this._contentElement)
-            return;
-
-        if (!this.selectedTreeElement || event.shiftKey || event.metaKey || event.ctrlKey)
-            return;
-
-        var currentFilterString = this._currentSelectionFilterString;
-        var key = event.data;
-        if (key !== "\r" && key !== "\n" && (key !== " " || currentFilterString))
-            this._setCurrentSelectionFilterString(currentFilterString + event.data);
-    },
-
-    /**
      * @return {?TreeElement}
      */
     firstChild: function()
     {
         return this._rootElement.firstChild();
     },
 
     /**
      * @param {!TreeElement} child
      */
@@ skipping 57 matching lines @@
     {
         this._comparator = comparator;
     },
 
     /**
      * @param {boolean} focusable
      */
     setFocusable: function(focusable)
     {
         if (focusable)
-            this.element.setAttribute("tabIndex", 0);
+            this._contentElement.setAttribute("tabIndex", 0);
         else
-            this.element.removeAttribute("tabIndex");
+            this._contentElement.removeAttribute("tabIndex");
     },
 
     focus: function()
     {
         this._contentElement.focus();
     },
 
     /**
      * @param {!TreeElement} element
      */
@@ skipping 54 matching lines @@
      * @param {!Event} event
      */
     _treeKeyDown: function(event)
     {
         if (event.target !== this._contentElement)
             return;
 
         if (!this.selectedTreeElement || event.shiftKey || event.metaKey || event.ctrlKey)
             return;
 
-        var currentFilterString = this._currentSelectionFilterString;
         var handled = false;
-        var key = event.keyCode;
         var nextSelectedElement;
-
-        switch (key) {
-        case WebInspector.KeyboardShortcut.Keys.Up.code:
-            if (!event.altKey)
-                handled = this.selectPrevious();
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Down.code:
-            if (!event.altKey)
-                handled = this.selectNext();
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Left.code:
-            if (this._interactiveFilterEnabled)
-                this._clearFilter();
-
+        if (event.keyIdentifier === "Up" && !event.altKey) {
+            handled = this.selectPrevious();
+        } else if (event.keyIdentifier === "Down" && !event.altKey) {
+            handled = this.selectNext();
+        } else if (event.keyIdentifier === "Left") {
             if (this.selectedTreeElement.expanded) {
                 if (event.altKey)
                     this.selectedTreeElement.collapseRecursively();
                 else
                     this.selectedTreeElement.collapse();
                 handled = true;
             } else if (this.selectedTreeElement.parent && !this.selectedTreeElement.parent.root) {
                 handled = true;
                 if (this.selectedTreeElement.parent.selectable) {
                     nextSelectedElement = this.selectedTreeElement.parent;
                     while (nextSelectedElement && !nextSelectedElement.selectable)
                         nextSelectedElement = nextSelectedElement.parent;
                     handled = nextSelectedElement ? true : false;
-                } else if (this.selectedTreeElement.parent) {
+                } else if (this.selectedTreeElement.parent)
                     this.selectedTreeElement.parent.collapse();
-                }
             }
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Right.code:
-            if (this._interactiveFilterEnabled)
-                this._clearFilter();
-
+        } else if (event.keyIdentifier === "Right") {
             if (!this.selectedTreeElement.revealed()) {
                 this.selectedTreeElement.reveal();
                 handled = true;
             } else if (this.selectedTreeElement._expandable) {
                 handled = true;
                 if (this.selectedTreeElement.expanded) {
                     nextSelectedElement = this.selectedTreeElement.firstChild();
                     while (nextSelectedElement && !nextSelectedElement.selectable)
                         nextSelectedElement = nextSelectedElement.nextSibling;
                     handled = nextSelectedElement ? true : false;
                 } else {
                     if (event.altKey)
                         this.selectedTreeElement.expandRecursively();
                     else
                         this.selectedTreeElement.expand();
                 }
             }
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Backspace.code:
-            if (this._interactiveFilterEnabled && currentFilterString) {
-                handled = true;
-                this._setCurrentSelectionFilterString(currentFilterString.substr(0, currentFilterString.length - 1));
-            } else {
-                handled = this.selectedTreeElement.ondelete();
-            }
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Delete.code:
-            if (this._interactiveFilterEnabled && currentFilterString) {
-                handled = true;
-                this._clearFilter();
-            } else
-                handled = this.selectedTreeElement.ondelete();
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Esc.code:
-            if (this._interactiveFilterEnabled) {
-                if (currentFilterString)
-                    handled = true;
-                this._clearFilter();
-            }
-            break;
-        case WebInspector.KeyboardShortcut.Keys.Space.code:
-            if (!currentFilterString)
-                handled = this.selectedTreeElement.onspace();
-            break;
-        default:
-            if (isEnterKey(event)) {
-                if (this._interactiveFilterEnabled)
-                    this._clearFilter();
-
-                handled = this.selectedTreeElement.onenter();
-            }
-        }
+        } else if (event.keyCode === 8 /* Backspace */ || event.keyCode === 46 /* Delete */)
+            handled = this.selectedTreeElement.ondelete();
+        else if (isEnterKey(event))
+            handled = this.selectedTreeElement.onenter();
+        else if (event.keyCode === WebInspector.KeyboardShortcut.Keys.Space.code)
+            handled = this.selectedTreeElement.onspace();
 
         if (nextSelectedElement) {
             nextSelectedElement.reveal();
             nextSelectedElement.select(false, true);
         }
 
         if (handled)
             event.consume(true);
     },
 
@@ skipping 81 matching lines @@
     this._childrenListNode = createElement("ol");
     this._childrenListNode.parentTreeElement = this;
     this._childrenListNode.classList.add("children");
 
     this._hidden = false;
     this._selectable = true;
     this.expanded = false;
     this.selected = false;
     this.setExpandable(expandable || false);
     this._collapsible = true;
-
-    /** @type {!Array.<!Object>} */
-    this._highlightChanges = [];
 }
 
 /** @const */
 TreeElement._ArrowToggleWidth = 10;
 
 TreeElement.prototype = {
     /**
-     * @return {boolean}
-     */
-    _checkFilter: function()
-    {
-        return this.treeOutline._currentSelectionFilterString ? this.treeOutline._makeFilterRegexFromString(this.treeOutline._currentSelectionFilterString).test(this._titleElement.textContent) : true;
-    },
-
-    /**
-     * @param {!RegExp} regex
-     * @return {boolean}
-     */
-    _applyHighlightFilter: function(regex) {
-        var textContent = this._listItemNode.textContent;
-        var ranges = [];
-
-        this._revertHighlightChanges();
-
-        var match = regex.exec(textContent);
-        while (match) {
-            ranges.push(new WebInspector.SourceRange(match.index, match[0].length));
-            match = regex.exec(textContent);
-        }
-        if (ranges.length)
-            WebInspector.highlightRangesWithStyleClass(this._listItemNode, ranges, "tree-text-interactive-highlight", this._highlightChanges);
-
-        return !!this._highlightChanges.length
-    },
-
-    _revertHighlightChanges: function()
-    {
-        WebInspector.revertDomChanges(this._highlightChanges);
-        this._highlightChanges = [];
-    },
-
-    /**
      * @param {?TreeElement} ancestor
      * @return {boolean}
      */
     hasAncestor: function(ancestor)
     {
         if (!ancestor)
             return false;
 
         var currentNode = this.parent;
         while (currentNode) {
@@ skipping 199 matching lines @@
                 this.treeOutline._unbindTreeElement(child);
             for (var current = child.firstChild(); this.treeOutline && current; current = current.traverseNextTreeElement(false, child, true))
                 this.treeOutline._unbindTreeElement(current);
             child._detach();
         }
         this._children = [];
     },
 
     get selectable()
     {
-        if (this._hidden || !this._checkFilter())
+        if (this._hidden)
             return false;
         return this._selectable;
     },
 
     set selectable(x)
     {
         this._selectable = x;
     },
 
     get listItemElement()
@@ skipping 535 matching lines @@
     isEventWithinDisclosureTriangle: function(event)
     {
         // FIXME: We should not use getComputedStyle(). For that we need to get rid of using ::before for disclosure triangle. (http://webk.it/74446)
         var paddingLeftValue = window.getComputedStyle(this._listItemNode).paddingLeft;
         console.assert(paddingLeftValue.endsWith("px"));
         var computedLeftPadding = parseFloat(paddingLeftValue);
         var left = this._listItemNode.totalOffsetLeft() + computedLeftPadding;
         return event.pageX >= left && event.pageX <= left + TreeElement._ArrowToggleWidth && this._expandable;
     }
 }