Correctly resolve active descendant when describing change events.

chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.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 Watches for events in the browser such as focus changes.
  *
  */
 
 goog.provide('cvox.ChromeVoxEventWatcher');
@@ skipping 1099 matching lines @@
       default:
         break;
     }
   }
 
   // Always announce changes for anything with an ARIA role.
   if (control.hasAttribute && control.hasAttribute('role')) {
     announceChange = true;
   }
 
+  var activeDescendant = cvox.AriaUtil.getActiveDescendant(control);
   if ((parentControl &&
       parentControl != control &&
       document.activeElement == control)) {
-    // If focus has been set on a child of the parent control, we need to
-    // sync to that node so that ChromeVox navigation will be in sync with
-    // focus navigation.
+    // Sync ChromeVox to the newly selected control.
     cvox.ApiImplementation.syncToNode(
-        control, true,
+        activeDescendant || control, true,
         cvox.ChromeVoxEventWatcher.queueMode_());
     announceChange = false;
-  } else if (cvox.AriaUtil.getActiveDescendant(control)) {
+  } else if (activeDescendant) {
     cvox.ChromeVox.navigationManager.updateSelToArbitraryNode(
-        cvox.AriaUtil.getActiveDescendant(control),
+        activeDescendant,
         true);
 
     announceChange = true;
   }
 
   if (announceChange && !cvox.ChromeVoxEventSuspender.areEventsSuspended()) {
     cvox.ChromeVox.tts.speak(newValue,
                              cvox.ChromeVoxEventWatcher.queueMode_(),
                              null);
     cvox.ChromeVox.braille.write(cvox.NavBraille.fromText(newValue));
@@ skipping 364 matching lines @@
       ((currentFocus.type == 'date') ||
       (currentFocus.type == 'month') ||
       (currentFocus.type == 'week'))) {
     cvox.ChromeVoxEventWatcher.currentDateHandler =
         new cvox.ChromeVoxHTMLDateWidget(currentFocus, cvox.ChromeVox.tts);
     } else {
       cvox.ChromeVoxEventWatcher.currentDateHandler = null;
     }
   return (null != cvox.ChromeVoxEventWatcher.currentDateHandler);
 };