Recovery: Implement focus recovery across root AutomationNodes

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

 // Copyright 2015 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 Handles automation from a desktop automation node.
  */
 
 goog.provide('DesktopAutomationHandler');
 
@@ skipping 245 matching lines @@
     // Discard focus events on embeddedObject.
     if (node.role == RoleType.embeddedObject)
       return;
 
     this.createTextEditHandlerIfNeeded_(evt.target);
 
     // Category flush speech triggered by events with no source. This includes
     // views.
     if (evt.eventFrom == '')
       Output.forceModeForNextSpeechUtterance(cvox.QueueMode.CATEGORY_FLUSH);
+    if (!node.root)
+      return;
+
+    var root = AutomationUtil.getTopLevelRoot(node.root);
+
+    // If we're crossing out of a root, save it in case it needs recovering.
+    var prevRange = ChromeVoxState.instance.currentRange;
+    var prevNode = prevRange ? prevRange.start.node : null;
+    if (prevNode) {
+    var prevRoot = AutomationUtil.getTopLevelRoot(prevNode);
+      if (prevRoot && prevRoot !== root)
+      ChromeVoxState.instance.focusRecoveryMap.set(prevRoot, prevNode);
+    }
+
+    // If a previous node was saved for this focus, restore it.
+    var savedNode = ChromeVoxState.instance.focusRecoveryMap.get(root);
+    ChromeVoxState.instance.focusRecoveryMap.delete(root);
+    node = savedNode ? savedNode : node;
+
     this.onEventDefault(new chrome.automation.AutomationEvent(
         EventType.focus, node, evt.eventFrom));
   },
 
   /**
    * Provides all feedback once a load complete event fires.
    * @param {!AutomationEvent} evt
    */
   onLoadComplete: function(evt) {
     // Don't process nodes inside of web content if ChromeVox Next is inactive.
@@ skipping 162 matching lines @@
       if (override || AutomationUtil.isDescendantOf(evt.target, focus))
         this.onEventDefault(evt);
     }.bind(this));
   },
 
   /**
    * Provides all feedback once a menu start event fires.
    * @param {!AutomationEvent} evt
    */
   onMenuStart: function(evt) {
-    ChromeVoxState.instance.startExcursion();
+    ChromeVoxState.instance.markCurrentRange();
     this.onEventDefault(evt);
   },
 
   /**
    * Provides all feedback once a menu end event fires.
    * @param {!AutomationEvent} evt
    */
   onMenuEnd: function(evt) {
     this.onEventDefault(evt);
-    ChromeVoxState.instance.endExcursion();
+
+    // This is a work around for Chrome context menus not firing a focus event
+    // after you close them.
+    chrome.automation.getFocus(function(focus) {
+      if (focus) {
+        this.onFocus(
+            new chrome.automation.AutomationEvent(
+                EventType.focus, focus, 'page'));
+      }
+    }.bind(this));
   },
 
   /**
    * Create an editable text handler for the given node if needed.
    * @param {!AutomationNode} node
    */
   createTextEditHandlerIfNeeded_: function(node) {
     if (!this.textEditHandler_ ||
         this.textEditHandler_.node !== node) {
       this.textEditHandler_ = editing.TextEditHandler.createForNode(node);
     }
   }
 };
 
 /**
  * Initializes global state for DesktopAutomationHandler.
  * @private
  */
 DesktopAutomationHandler.init_ = function() {
   chrome.automation.getDesktop(function(desktop) {
     ChromeVoxState.desktopAutomationHandler =
         new DesktopAutomationHandler(desktop);
   });
 };
 
 DesktopAutomationHandler.init_();
 
 });  // goog.scope