Fix reset and focus issues in OOBE

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.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.
 
 /**
  * @fileoverview The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
@@ skipping 409 matching lines @@
   /**
    * Navigate to the given range - it both sets the range and outputs it.
    * @param {!cursors.Range} range The new range.
    * @param {boolean=} opt_focus Focus the range; defaults to true.
    * @param {Object=} opt_speechProps Speech properties.
    * @private
    */
   navigateToRange: function(range, opt_focus, opt_speechProps) {
     opt_focus = opt_focus === undefined ? true : opt_focus;
     opt_speechProps = opt_speechProps || {};
+    var prevRange = this.currentRange_;
+    if (opt_focus)
+      this.setFocusToRange_(range, prevRange);
 
-    if (opt_focus)
-      this.setFocusToRange_(range);
-
-    var prevRange = this.currentRange_;
     this.setCurrentRange(range);
 
     var o = new Output();
     var selectedRange;
     if (this.pageSel_ &&
         this.pageSel_.isValid() &&
         range.isValid()) {
       // Compute the direction of the endpoints of each range.
 
       // Casts are ok because isValid checks node start and end nodes are
@@ skipping 308 matching lines @@
     chrome.automation.getFocus(function(focus) {
       if (focus)
         this.setCurrentRange(cursors.Range.fromNode(focus));
       else
         this.setCurrentRange(null);
     }.bind(this));
   },
 
   /**
    * @param {!cursors.Range} range
+   * @param {cursors.Range} prevRange
    * @private
    */
-  setFocusToRange_: function(range) {
+  setFocusToRange_: function(range, prevRange) {
     var start = range.start.node;
     var end = range.end.node;
     if (start.state.focused || end.state.focused)
       return;
 
     var isFocusableLinkOrControl = function(node) {
       return node.state.focusable &&
           AutomationPredicate.linkOrControl(node);
     };
 
-    // First, try to focus the start or end node.
+    // First, see if we've crossed a root. Remove once webview handles focus
+    // correctly.
+    if (prevRange && prevRange.start.node) {
+      var entered = AutomationUtil.getUniqueAncestors(
+          prevRange.start.node, start);
+      var embeddedObject = entered.find(function(f) {
+        return f.role == RoleType.embeddedObject; });
+      if (embeddedObject)
+        embeddedObject.focus();
+    }
+
+    // Next, try to focus the start or end node.
     if (isFocusableLinkOrControl(start)) {
       if (!start.state.focused)
         start.focus();
       return;
     } else if (isFocusableLinkOrControl(end)) {
       if (!end.state.focused)
         end.focus();
       return;
     }
 
@@ skipping 26 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope