Complete table support in ChromeVox Next.

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.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 The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
@@ skipping 409 matching lines @@
       return true;
 
     // Next/compat commands hereafter.
     if (this.mode == ChromeVoxMode.CLASSIC)
       return true;
 
     var current = this.currentRange_;
     var dir = Dir.FORWARD;
     var pred = null;
     var predErrorMsg = undefined;
+    var rootPred = AutomationPredicate.root;
     var speechProps = {};
     switch (command) {
       case 'nextCharacter':
         speechProps['phoneticCharacters'] = true;
         current = current.move(cursors.Unit.CHARACTER, Dir.FORWARD);
         break;
       case 'previousCharacter':
         speechProps['phoneticCharacters'] = true;
         current = current.move(cursors.Unit.CHARACTER, Dir.BACKWARD);
         break;
@@ skipping 349 matching lines @@
         description['Version'] = chrome.app.getDetails().version;
         description['Reproduction Steps'] = '%0a1.%0a2.%0a3.';
         for (var key in description)
           url += key + ':%20' + description[key] + '%0a';
         chrome.tabs.create({url: url});
         return false;
       case 'toggleBrailleCaptions':
         cvox.BrailleCaptionsBackground.setActive(
             !cvox.BrailleCaptionsBackground.isEnabled());
         return false;
+      case 'fullyDescribe':
+        var o = new Output();
+        o.withContextFirst()
+            .withRichSpeechAndBraille(current, null, Output.EventType.NAVIGATE)
+            .go();
+        return false;
+
+      // Table commands.
+      case 'previousRow':
+        var tableOpts = {};

[dmazzoni, 2016/07/13 23:38:28]

Any reason not to make this more concise? t doesn't look like you're using 'dir'
below.

How about:

var tableOpts = {row: true, dir: Dir.BACKWARD};

[David Tseng, 2016/07/14 20:24:41]

dir gets used in both places; the first is to calculate the new table row/col
index; the second, which direction to move in the tree walker. I don't have a
strong preference other than the current code being easier to edit. Changed.

+        tableOpts.row = true;
+        dir = Dir.BACKWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        predErrorMsg = 'no_cell_above';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'previousCol':
+        var tableOpts = {};
+        tableOpts.col = true;
+        dir = Dir.BACKWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        predErrorMsg = 'no_cell_left';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'nextRow':
+        var tableOpts = {};
+        tableOpts.row = true;
+        dir = Dir.FORWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        predErrorMsg = 'no_cell_below';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'nextCol':
+        var tableOpts = {};
+        tableOpts.col = true;
+        dir = Dir.FORWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        predErrorMsg = 'no_cell_right';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToRowFirstCell':
+        var tableOpts = {};
+        tableOpts.row = true;
+        tableOpts.end = true;
+        dir = Dir.BACKWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_left';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToRowLastCell':
+        var tableOpts = {};
+        tableOpts.row = true;
+        tableOpts.end = true;
+        dir = Dir.FORWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_right';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToColFirstCell':
+        var tableOpts = {};
+        tableOpts.col = true;
+        tableOpts.end = true;
+        dir = Dir.BACKWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_above';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToColLastCell':
+        var tableOpts = {};
+        tableOpts.col = true;
+        tableOpts.end = true;
+        dir = Dir.FORWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_below';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToFirstCell':
+        var tableOpts = {};
+        tableOpts.row = true;
+        tableOpts.col = true;
+        tableOpts.end = true;
+        dir = Dir.BACKWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_left';
+        rootPred = AutomationPredicate.table;
+        break;
+      case 'goToLastCell':
+        var tableOpts = {};
+        tableOpts.row = true;
+        tableOpts.col = true;
+        tableOpts.end = true;
+        dir = Dir.FORWARD;
+        tableOpts.dir = dir;
+        pred = AutomationPredicate.rowCol(current.start.node, tableOpts);
+        // Should not be outputted.
+        predErrorMsg = 'no_cell_right';
+        rootPred = AutomationPredicate.table;
+        break;
       default:
         return true;
     }
 
     if (pred) {
       var bound = current.getBound(dir).node;
       if (bound) {
         var node = AutomationUtil.findNextNode(
-            bound, dir, pred, {skipInitialAncestry: true});
+            bound, dir, pred, {skipInitialAncestry: true, root: rootPred});
 
         if (node) {
           node = AutomationUtil.findNodePre(
               node, Dir.FORWARD, AutomationPredicate.object) || node;
         }
 
         if (node) {
           current = cursors.Range.fromNode(node);
         } else {
           if (predErrorMsg) {
@@ skipping 413 matching lines @@
   return new RegExp('^(' + globs.map(function(glob) {
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 new Background();
 
 });  // goog.scope