Reland: Further refine div output when a div receives focus

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.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 Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
 
+goog.require('AutomationTreeWalker');
 goog.require('EarconEngine');
 goog.require('Spannable');
 goog.require('Stubs');
 goog.require('constants');
 goog.require('cursors.Cursor');
 goog.require('cursors.Range');
 goog.require('cursors.Unit');
 goog.require('cvox.AbstractEarcons');
 goog.require('cvox.ChromeVox');
 goog.require('cvox.NavBraille');
@@ skipping 418 matching lines @@
       speak: '$name'
     },
     date: {
       enter: '$nameFromNode $role $description'
     },
     dialog: {
       enter: '$nameFromNode $role $description'
     },
     div: {
       enter: '$nameFromNode',
-      speak: '$name $description $descendants'
+      speak: '$nameOrTextContent $description'
     },
     embeddedObject: {
       speak: '$name'
     },
     grid: {
       enter: '$nameFromNode $role $description'
     },
     group: {
       enter: '$nameFromNode $state $description',
       speak: '$nameOrDescendants $value $state $description',
@@ skipping 69 matching lines @@
           '@describe_radio_unselected($name)) $description'
     },
     radioGroup: {
       enter: '$name $role $description'
     },
     rootWebArea: {
       enter: '$name',
       speak: '$if($name, $name, $docUrl)'
     },
     region: {
-      speak: '$descendants'
+      speak: '$nameOrTextContent'
     },
     row: {
       enter: '$node(tableRowHeader)'
     },
     rowHeader: {
       speak: '$descendants $state'
     },
     slider: {
       speak: '$earcon(SLIDER) @describe_slider($value, $name) $description ' +
           '$state'
@@ skipping 641 matching lines @@
           if (value == undefined)
             return;
           value = String(value + 1);
           options.annotation.push(token);
           this.append_(buff, value, options);
         } else if (token == 'node') {
           if (!tree.firstChild || !node[tree.firstChild.value])
             return;
           var related = node[tree.firstChild.value];
           this.node_(related, related, Output.EventType.NAVIGATE, buff);
+        } else if (token == 'nameOrTextContent') {
+          if (node.name) {
+            this.format_(node, '$name', buff);
+          } else {
+            var walker = new AutomationTreeWalker(node,
+                Dir.FORWARD,
+                {visit: AutomationPredicate.leafOrStaticText,
+                 leaf: AutomationPredicate.leafOrStaticText});
+            while (walker.next().node &&
+                walker.phase == AutomationTreeWalkerPhase.DESCENDANT) {
+              if (walker.node.name)
+                this.append_(buff, walker.node.name, options);
+            }
+          }
         } else if (node[token] !== undefined) {
           options.annotation.push(token);
           var value = node[token];
           if (typeof value == 'number')
             value = String(value);
           this.append_(buff, value, options);
         } else if (Output.STATE_INFO_[token]) {
           options.annotation.push('state');
           var stateInfo = Output.STATE_INFO_[token];
           var resolvedInfo = {};
@@ skipping 542 matching lines @@
   /**
    * Gets the output buffer for braille.
    * @return {!Spannable}
    */
   get brailleOutputForTest() {
     return this.createBrailleOutput_();
   }
 };
 
 });  // goog.scope