Try focusing embeddedObject first unconditionally

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 748 matching lines @@
   },
 
   /**
    * @param {!cursors.Range} range
    * @param {cursors.Range} prevRange
    * @private
    */
   setFocusToRange_: function(range, prevRange) {
     var start = range.start.node;
     var end = range.end.node;
+
+    // First, see if we've crossed a root. Remove once webview handles focus
+    // correctly.
+    if (prevRange && prevRange.start.node && start) {
+      var entered = AutomationUtil.getUniqueAncestors(
+          prevRange.start.node, start);
+      var embeddedObject = entered.find(function(f) {
+        return f.role == RoleType.embeddedObject; });
+      if (embeddedObject && !embeddedObject.state.focused)
+        embeddedObject.focus();
+    }
+
     if (start.state.focused || end.state.focused)
       return;
 
     var isFocusableLinkOrControl = function(node) {
       return node.state.focusable &&
           AutomationPredicate.linkOrControl(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 (!AutomationPredicate.structuralContainer(start) &&
         start.state.focusable) {
       if (!start.state.focused)
         start.focus();
       return;
     } else if (!AutomationPredicate.structuralContainer(end) &&
         end.state.focusable) {
       if (!end.state.focused)
         end.focus();
@@ skipping 29 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope