Display images in multiline Braille

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 77 matching lines @@
    * @type {cvox.QueueMode}
    * @private
    */
   this.queueMode_ = cvox.QueueMode.QUEUE;
 
   /**
    * @type {boolean}
    * @private
    */
   this.outputContextFirst_ = false;
+
+  /**
+   * @type {string}
+   * @private
+   */
+  this.imageDataUrl_ = '';
 };
 
 /**
  * Delimiter to use between output values.
  * @type {string}
  */
 Output.SPACE = ' ';
 
 /**
  * Metadata about supported automation roles.
@@ skipping 855 matching lines @@
       var startIndex = -1, endIndex = -1;
       if (selSpan) {
         var valueStart = buff.getSpanStart(selSpan);
         var valueEnd = buff.getSpanEnd(selSpan);
         startIndex = valueStart + selSpan.startIndex;
         endIndex = valueStart + selSpan.endIndex;
         buff.setSpan(new cvox.ValueSpan(0), valueStart, valueEnd);
         buff.setSpan(new cvox.ValueSelectionSpan(), startIndex, endIndex);
       }
 
-      var output = new cvox.NavBraille({
-        text: buff,
-        startIndex: startIndex,
-        endIndex: endIndex
-      });
-
-      cvox.ChromeVox.braille.write(output);
+      var brailleDisplayState = cvox.ChromeVox.braille.getDisplayState();
+      if (this.imageDataUrl_ && brailleDisplayState.textRowCount >= 2) {

[David Tseng, 2017/02/22 18:15:24]

I don't think we should hack in the image display like this.

Alternative proposal: add a command to CommandHandler that takes the node from
the current range and gets the image data.

+        cvox.ChromeVox.braille.writeRawImage(this.imageDataUrl_);
+      } else {
+        var output = new cvox.NavBraille({
+          text: buff,
+          startIndex: startIndex,
+          endIndex: endIndex
+        });
+        cvox.ChromeVox.braille.write(output);
+      }
     }
 
     // Display.
     if (this.speechCategory_ != cvox.TtsCategory.LIVE)
       chrome.accessibilityPrivate.setFocusRing(this.locations_);
   },
 
   /**
    * Renders the given range using optional context previous range and event
    * type.
@@ skipping 35 matching lines @@
    * @param {string|!Object} format The output format either specified as an
    * output template string or a parsed output format tree.
    * @param {!Array<Spannable>} buff Buffer to receive rendered output.
    * @param {!AutomationNode=} opt_prevNode
    * @private
    */
   format_: function(node, format, buff, opt_prevNode) {
     var tokens = [];
     var args = null;
 
+    if (node != null &&
+        (node.role == RoleType.CANVAS || node.role == RoleType.IMAGE)) {
+      if (node.imageDataUrl)
+        this.imageDataUrl_ = node.imageDataUrl;
+      node.getImageData(0, 0);
+    }
+
     // Hacky way to support args.
     if (typeof(format) == 'string') {
       format = format.replace(/([,:])\W/g, '$1');
       tokens = format.split(' ');
     } else {
       tokens = [format];
     }
 
     var speechProps = null;
     tokens.forEach(function(token) {
@@ skipping 831 matching lines @@
   /**
    * Gets the output buffer for braille.
    * @return {!Spannable}
    */
   get brailleOutputForTest() {
     return this.mergeBraille_(this.brailleBuffer_);
   }
 };
 
 });  // goog.scope