Add support for rich output inside of content editables.

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');
@@ skipping 1042 matching lines @@
                   node.textSelEnd));
             }
           }
           options.annotation.push(token);
           this.append_(buff, text, options);
         } else if (token == 'name') {
           options.annotation.push(token);
           var earcon = node ? this.findEarcon_(node, opt_prevNode) : null;
           if (earcon)
             options.annotation.push(earcon);
+
+          // Reflect the selection here except when we're dealing with a node
+          // that has a value.
+          var selStart, selEnd;
+          if (node == node.root.anchorObject && node == node.root.focusObject) {
+            selStart = node.root.anchorOffset;
+            selEnd = node.root.focusOffset;
+          } else if (node == node.root.anchorObject) {
+            selStart = node.root.anchorOffset;
+            selEnd = selStart;
+          } else if (node == node.root.focusObject) {
+            selStart = node.root.focusOffset;
+            selEnd = selStart;
+          }
+          if (!node.value && goog.isDef(selStart) && goog.isDef(selEnd))
+            options.annotation.push(new Output.SelectionSpan(selStart, selEnd));
+
           this.append_(buff, node.name, options);
         } else if (token == 'nameFromNode') {
           if (chrome.automation.NameFromType[node.nameFrom] ==
               'contents')
             return;
 
           options.annotation.push('name');
           this.append_(buff, node.name, options);
         } else if (token == 'nameOrDescendants') {
           options.annotation.push(token);
@@ skipping 577 matching lines @@
       });
       result.append(separator);
       result.append(cur);
       spansToExtend.forEach(function(elem) {
         result.setSpan(
             elem.span,
             result.getSpanStart(elem.span),
             elem.end);
       });
       spansToRemove.forEach(result.removeSpan.bind(result));
-      separator = Output.SPACE;
+
+      // No separator needed if the previous result did end with our separator.
+      if (cur.toString()[cur.length - 1] == Output.SPACE || result.length == 0)
+        separator = '';
+      else
+        separator = Output.SPACE;
     });
     return result;
   },
 
   /**
    * Find the earcon for a given node (including ancestry).
    * @param {!AutomationNode} node
    * @param {!AutomationNode=} opt_prevNode
    * @return {Output.Action}
    */
@@ skipping 16 matching lines @@
           break;
         }
         earconFinder = earconFinder.parent;
       }
     }
     return null;
   }
 };
 
 });  // goog.scope