Add support for rich output inside of content editables.

chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.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 Classes related to cursors that point to and select parts of
  * the automation tree.
  */
 
 goog.provide('cursors.Cursor');
@@ skipping 122 matching lines @@
 
   /**
    * A node appropriate for making selections.
    * @return {AutomationNode}
    * @private
    */
   get selectionNode_() {
     if (!this.node)
       return null;
 
-    if (this.node.role == RoleType.inlineTextBox)
+    if (this.node.role == RoleType.inlineTextBox ||
+        this.index_ == cursors.NODE_INDEX)
       return this.node.parent;
 
     return this.node;
   },
 
   /**
    * An index appropriate for making selections.  If this cursor has a
    * cursors.NODE_INDEX index, the selection index is a node offset e.g. the
    * index in parent. If not, the index is a character offset.
    * @return {number}
    * @private
    */
   get selectionIndex_() {
     var adjustedIndex = this.index_;
     if (this.node.role == RoleType.inlineTextBox) {
       if (adjustedIndex == cursors.NODE_INDEX)
         adjustedIndex = 0;
 
       var sibling = this.node.previousSibling;
       while (sibling) {
         adjustedIndex += sibling.name.length;
         sibling = sibling.previousSibling;
       }
     } else if (this.index_ == cursors.NODE_INDEX) {
-      // Indicies of this kind are buggy. Set it to 0 (different than the DOM
-      // index in parent convention).
-      adjustedIndex = 0;
+      adjustedIndex = this.node.indexInParent + 1;
     }
     return adjustedIndex;
   },
 
   /**
    * Gets the accessible text of the node associated with this cursor.
    *
    * @param {!AutomationNode=} opt_node Use this node rather than this cursor's
    * node.
    * @return {string}
@@ skipping 424 matching lines @@
   /**
    * Returns whether this range has valid start and end cursors.
    * @return {boolean}
    */
   isValid: function() {
     return this.start.isValid() && this.end.isValid();
   }
 };
 
 });  // goog.scope