Finish implementing ChromeVox Next active indicator.

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
index a10454c5e54ccb62e205003f863b911c12bb25ce..01cc9ccf2d1708765138efd31d89fdb991a5b068 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
@@ -63,9 +63,9 @@ Output = function() {
 
   /**
    * Current global options.
-   * @type {{speech: boolean, braille: boolean, location: boolean}}
+   * @type {{speech: boolean, braille: boolean}}
    */
-  this.formatOptions_ = {speech: true, braille: false, location: true};
+  this.formatOptions_ = {speech: true, braille: false};
 
   /**
    * Speech properties to apply to the entire output.
@@ -618,7 +618,7 @@ Output.prototype = {
    * @return {!Output}
    */
   withSpeech: function(range, prevRange, type) {
-    this.formatOptions_ = {speech: true, braille: false, location: true};
+    this.formatOptions_ = {speech: true, braille: false};
     this.render_(range, prevRange, type, this.speechBuffer_);
     return this;
   },
@@ -631,12 +631,25 @@ Output.prototype = {
    * @return {!Output}
    */
   withBraille: function(range, prevRange, type) {
-    this.formatOptions_ = {speech: false, braille: true, location: false};
+    this.formatOptions_ = {speech: false, braille: true};
     this.render_(range, prevRange, type, this.brailleBuffer_);
     return this;
   },
 
   /**
+   * Specify ranges for location.
+   * @param {!cursors.Range} range
+   * @param {cursors.Range} prevRange
+   * @param {chrome.automation.EventType|Output.EventType} type
+   * @return {!Output}
+   */
+  withLocation: function(range, prevRange, type) {
+    this.formatOptions_ = {speech: false, braille: false};
+    this.render_(range, prevRange, type, this.speechBuffer_);
+    return this;
+  },
+
+  /**
    * Specify the same ranges for speech and braille.
    * @param {!cursors.Range} range
    * @param {cursors.Range} prevRange
@@ -666,10 +679,10 @@ Output.prototype = {
    * @return {!Output}
    */
   format: function(formatStr) {
-    this.formatOptions_ = {speech: true, braille: false, location: true};
+    this.formatOptions_ = {speech: true, braille: false};
     this.format_(null, formatStr, this.speechBuffer_);
 
-    this.formatOptions_ = {speech: false, braille: true, location: false};
+    this.formatOptions_ = {speech: false, braille: true};
     this.format_(null, formatStr, this.brailleBuffer_);
 
     return this;
@@ -741,7 +754,8 @@ Output.prototype = {
     }
 
     // Display.
-    chrome.accessibilityPrivate.setFocusRing(this.locations_);
+    if (chrome.accessibilityPrivate)

[Peter Lundblad, 2015/11/20 11:15:03]

This guard wouldn't be enoguh on Linux, where the namespace seems to be
available. When do we anticipate it wouldn't be available and do we need to
update other places where we refer to it? At least we have another call to
setFocusRing in bacgkround.sj that should be maed consistent.

[dmazzoni, 2015/11/20 23:35:14]

Agreed, testing for isChromeOS makes more sense. Done.

+      chrome.accessibilityPrivate.setFocusRing(this.locations_);
   },
 
   /**
@@ -1053,8 +1067,7 @@ Output.prototype = {
       var buff = [];
       this.ancestry_(node, prevNode, type, buff);
       this.node_(node, prevNode, type, buff);
-      if (this.formatOptions_.location)
-        this.locations_.push(node.location);
+      this.locations_.push(node.location);
       return buff;
     }.bind(this);
 
@@ -1182,6 +1195,8 @@ Output.prototype = {
       endIndex++;
     this.append_(
         buff, range.start.getText().substring(startIndex, endIndex));
+    this.locations_.push(
+        range.start.node.boundsForRange(startIndex, endIndex));

[Peter Lundblad, 2015/11/20 11:15:03]

Cool, it is nice to not have to use document selection for this as I think we
had to do in classic!

[dmazzoni, 2015/11/20 23:35:14]

Acknowledged.

   },
 
   /**