Fix ISearch regressions

chrome/browser/resources/chromeos/chromevox/cvox2/background/i_search.js

 // Copyright 2016 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.
 
 /**
  * @fileoverview Objects related to incremental search.
  */
 
 goog.provide('ISearch');
 goog.provide('ISearchHandler');
@@ skipping 27 matching lines @@
 
   /**
    * Called when search result node changes.
    * @param {!AutomationNode} node The new search result.
    */
   onSearchResultChanged: function(node) {}
 };
 
 /**
  * Controls an incremental search.
- * @param {!AutomationNode} initialNode
+ * @param {!cursors.Cursor} cursor
  * @constructor
  */
-ISearch = function(initialNode) {
+ISearch = function(cursor) {
+  if (!cursor.node)
+    throw 'Incremental search started from invalid range.';
+
   var leaf = AutomationUtil.findNodePre(
-      initialNode, Dir.FORWARD, AutomationPredicate.leaf) || initialNode;
+      cursor.node, Dir.FORWARD, AutomationPredicate.leaf) || cursor.node;
 
-  /** @type {!AutomationNode} @private */
-  this.node_ = leaf;
+  /** @type {!cursors.Cursor} */
+  this.cursor = cursors.Cursor.fromNode(leaf);
 
   /**
    * This tracks the id of a search that is in progress.
    * @type {number} @private
    */
   this.pendingSearchId_ = 0;
 
   // Global exports.
   /** Exported for this background script. */
   cvox.ChromeVox = chrome.extension.getBackgroundPage()['cvox']['ChromeVox'];
@@ skipping 16 matching lines @@
     searchStr = searchStr.toLocaleLowerCase();
     // Keep things responsive by chunking cursor moves up into discrete
     // blocks. We can, if needed, simulate getting interrupted by the enter key.
     var currentSearchId = ++this.pendingSearchId_;
     var move = function(curNode) {
       var cur = cursors.Cursor.fromNode(curNode);
       var prev = cur;
       cur =
           cur.move(cursors.Unit.NODE, cursors.Movement.DIRECTIONAL, dir);
       if (prev.equals(cur)) {
-        this.handler_.onSearchReachedBoundary(this.node_);
+        this.handler_.onSearchReachedBoundary(this.cursor.node);
         return;
       }
 
       if (cur.getText().toLocaleLowerCase().indexOf(searchStr) != -1) {
-        this.node_ = cur.node;
-        this.handler_.onSearchResultChanged(this.node_);
+        this.cursor = cur;
+        this.handler_.onSearchResultChanged(this.cursor.node);
         return;
       }
       if (this.pendingSearchId_ == currentSearchId)
         window.setTimeout(move.bind(this, cur.node), 0);
     };
-    window.setTimeout(move.bind(this, this.node_), 0);
+    window.setTimeout(move.bind(this, this.cursor.node), 0);
   }
 };
 
 /**
  * @param {Element} input
  * @constructor
  * @implements {ISearchHandler}
  */
 ISearchUI = function(input) {
   /** @type {ChromeVoxState} @private */
   this.background_ =
       chrome.extension.getBackgroundPage()['ChromeVoxState']['instance'];
-  this.iSearch_ = new ISearch(this.background_.currentRange.start.node);
+  this.iSearch_ = new ISearch(this.background_.currentRange.start);
   this.input_ = input;
   this.dir_ = Dir.FORWARD;
   this.iSearch_.handler = this;
 
   this.onKeyDown = this.onKeyDown.bind(this);
   this.onTextInput = this.onTextInput.bind(this);
 
   input.addEventListener('keydown', this.onKeyDown, true);
   input.addEventListener('textInput', this.onTextInput, true);
 };
 
 /**
  * @param {Element} input
  * @return {ISearchUI}
  */
-ISearchUI.get = function(input) {
+ISearchUI.init = function(input) {
   if (ISearchUI.instance_)
     ISearchUI.instance_.destroy();
+
+  if (!input)
+    return null;
+
   ISearchUI.instance_ = new ISearchUI(input);
   input.focus();
+  input.select();
   return ISearchUI.instance_;
 };
 
 ISearchUI.prototype = {
   /**
    * Listens to key down events.
    * @param {Event} evt
    * @return {boolean}
    */
   onKeyDown: function(evt) {
     switch (evt.key) {
       case 'ArrowUp':
         this.dir_ = Dir.BACKWARD;
         break;
       case 'ArrowDown':
         this.dir_ = Dir.FORWARD;
         break;
       case 'Escape':
         this.pendingSearchId_ = 0;
         Panel.closeMenusAndRestoreFocus();
         return false;
       case 'Enter':
         this.pendingSearchId_ = 0;
+        Panel.setPendingCallback(function() {
+          var node = this.iSearch_.cursor.node;
+          if (!node)
+            return;
+          chrome.extension.getBackgroundPage().ChromeVoxState.instance[
+            'navigateToRange'](
+                cursors.Range.fromNode(node));
+        }.bind(this));
         Panel.closeMenusAndRestoreFocus();
         return false;
       default:
         this.pendingSearchId_ = 0;
         return false;
     }
     this.iSearch_.search(this.input_.value, this.dir_);
     evt.preventDefault();
     evt.stopPropagation();
     return false;
@@ skipping 41 matching lines @@
     this.iSearch_.handler_ = null;
     this.iSearch_ = null;
     var input = this.input_;
     this.input_ = null;
     input.removeEventListener('keydown', this.onKeyDown, true);
     input.removeEventListener('textInput', this.onTextInput, true);
   }
 };
 
 });  // goog.scope