Fix ChromeVox's detection of whether the current document has focus.

Added a new helper function to determine whether the document has focus,
taking into account whether an iframe or webview element has focus
and whether the document is hidden.

This fixes issues where there were two ChromeVox active indicators showing,
one on the outer frame and one inside the inner frame or webview. It also
fixes issues with other speech-generating events being processed in both
frames at once.

BUG=484904

Review URL: https://codereview.chromium.org/1137403003

Cr-Commit-Position: refs/heads/master@{#329956}

chrome/browser/resources/chromeos/chromevox/chromevox/injected/active_indicator.js

@@ -474,7 +474,7 @@ cvox.ActiveIndicator.prototype.moveIndicator_ = function(
   var now = new Date().getTime();
   var delta = now - this.lastMoveTime_;
   this.container_.className = 'cvox_indicator_container';
-  if (!document.hasFocus() || this.blurred_) {
+  if (!cvox.ChromeVox.documentHasFocus() || this.blurred_) {
     this.container_.classList.add('cvox_indicator_window_not_focused');
   }
   if (delta > cvox.ActiveIndicator.NORMAL_ANIM_DELAY_MS) {

chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js

@@ -255,8 +255,14 @@ cvox.ChromeVoxEventWatcher.readFrom = function(store) {
  */
 cvox.ChromeVoxEventWatcher.addEvent = function(evt) {
   // Don't add any events to the events queue if ChromeVox is inactive or the
-  // page is hidden.
-  if (!cvox.ChromeVox.isActive || document.webkitHidden) {
+  // document isn't focused.
+  if (!cvox.ChromeVox.isActive || !cvox.ChromeVox.documentHasFocus()) {
+    if (evt.type == 'focus') {
+      // If it's a focus event, update the active indicator so that it
+      // properly shows and hides as focus moves to iframe and webview
+      // elements.
+      cvox.ChromeVox.navigationManager.activeIndicator.syncToNode(evt.target);
+    }
     return;
   }
   cvox.ChromeVoxEventWatcher.events_.push(evt);
@@ -871,7 +877,7 @@ cvox.ChromeVoxEventWatcher.clipboardEventWatcher = function(evt) {
   // Don't announce anything unless this document has focus and the
   // editable element that's the target of the clipboard event is visible.
   var targetNode = /** @type {Node} */(evt.target);
-  if (!document.hasFocus() ||
+  if (!cvox.ChromeVox.documentHasFocus() ||
       !targetNode ||
       !cvox.DomUtil.isVisible(targetNode) ||
       cvox.AriaUtil.isHidden(targetNode)) {

chrome/browser/resources/chromeos/chromevox/chromevox/injected/initial_speech.js

@@ -62,7 +62,8 @@ cvox.InitialSpeech.speak = function() {
   // actually happens inside of NavigationManager.reset, which doesn't get
   // called until AbstractHost.onPageLoad, but we need to speak and braille the
   // initial node here.
-  if (document.hasFocus() && document.activeElement == document.body) {
+  if (cvox.ChromeVox.documentHasFocus() &&
+      document.activeElement == document.body) {
     cvox.ChromeVox.navigationManager.syncToBeginning();
   }
 
@@ -74,7 +75,7 @@ cvox.InitialSpeech.speak = function() {
   }
 
   // If this iframe has focus, speak and braille the current focused element.
-  if (document.hasFocus()) {
+  if (cvox.ChromeVox.documentHasFocus()) {
     if (!disableSpeak) {
       cvox.ChromeVoxEventSuspender.withSuspendedEvents(function() {
         cvox.ChromeVox.navigationManager.finishNavCommand(

chrome/browser/resources/chromeos/chromevox/chromevox/injected/live_regions.js

@@ -82,7 +82,7 @@ cvox.LiveRegions.nodesAlreadyHandled = [];
 cvox.LiveRegions.init = function(pageLoadTime, queueMode, disableSpeak) {
   cvox.LiveRegions.pageLoadTime = pageLoadTime;
 
-  if (disableSpeak || !document.hasFocus()) {
+  if (disableSpeak || !cvox.ChromeVox.documentHasFocus()) {
     return false;
   }
 
@@ -379,7 +379,7 @@ cvox.LiveRegions.announceChange = function(
   cvox.LiveRegions.lastAnnouncedMap[key] = now;
 
   var assertive = cvox.AriaUtil.getAriaLive(liveRoot) == 'assertive';
-  if (cvox.Interframe.isIframe() && !document.hasFocus()) {
+  if (cvox.Interframe.isIframe() && !cvox.ChromeVox.documentHasFocus()) {
     cvox.Interframe.sendMessageToParentWindow(
         {'command': 'speakLiveRegion',
          'content': JSON.stringify(navDescriptions),

chrome/browser/resources/chromeos/chromevox/common/chromevox.js

@@ -275,3 +275,20 @@ function $(id) {
  * @param {Array} tabs
  */
 cvox.ChromeVox.injectChromeVoxIntoTabs = function(tabs) {};
+
+/**
+ * Returns whether the document has focus, taking into account whether
+ * it's hidden and also that if an iframe or webview element has focus,
+ * the focus is really inside that frame and not in this document.
+ * @return {boolean} True if the document has focus.
+ */
+cvox.ChromeVox.documentHasFocus = function() {
+  if (!document.hasFocus() || document.hidden) {
+    return false;
+  }
+  if (document.activeElement.tagName == 'IFRAME' ||
+      document.activeElement.tagName == 'WEBVIEW') {
+    return false;
+  }
+  return true;
+};

chrome/browser/resources/chromeos/chromevox/host/chrome/braille.js

@@ -49,7 +49,7 @@ cvox.ChromeBraille = function() {
     // within the iframe even though the containing document also has focus.
     // Don't process the event if this document isn't focused or focus lies in
     // a descendant.
-    if (!document.hasFocus() || document.activeElement.tagName == 'IFRAME') {
+    if (!cvox.ChromeVox.documentHasFocus()) {
       return;
     }
     if (msg['message'] == 'BRAILLE' && msg['args']) {

chrome/browser/resources/chromeos/chromevox/host/interface/abstract_host.js

@@ -143,7 +143,7 @@ cvox.AbstractHost.prototype.onStateChanged_ = function(state) {
       cvox.ChromeVox.navigationManager.showOrHideIndicator(true);
       cvox.ChromeVoxEventWatcher.init(window);
       if (document.activeElement) {
-        var speakNodeAlso = document.hasFocus() && !document.webkitHidden;
+        var speakNodeAlso = cvox.ChromeVox.documentHasFocus();
         cvox.ApiImplementation.syncToNode(
             document.activeElement, speakNodeAlso);
       } else {