ChromeVox: Add shortcuts to navigate by list.

This change adds support for navigation by list in ChromeVox. This
behaves in a similar manner to other navigation types such as
navigation by heading, link, button, etc.

This change also fixes bug 1012907. In this bug, ChromeVox would jump
to the second to last element, instead of the last element, when
jumping to the previous element from the top of the page.

Bug: 887630
Bug: 1012907
Change-Id: I35194c9c125e6b237db1258f8cb1a4cfdc1aa769
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1830364
Commit-Queue: Akihiro Ota <akihiroota@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710097}

chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/next_keymap.json

@@ -1030,7 +1030,7 @@
         }
       }
     },
-     {
+    {
       "command": "readLinkURL",
       "sequence": {
         "cvoxModifier": true,
@@ -1038,6 +1038,24 @@
           "keyCode": [65, 76]
         }
       }
+    },
+    {
+      "command": "nextList",
+      "sequence": {
+        "cvoxModifier": true,
+        "keys": {
+          "keyCode": [78, 76]
+        }
+      }
+    },
+    {
+      "command": "previousList",
+      "sequence": {
+        "cvoxModifier": true,
+        "keys": {
+          "keyCode": [80, 76]
+        }
+      }
     }
   ]
 }

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

@@ -103,6 +103,9 @@ AutomationPredicate.link = AutomationPredicate.roles([Role.LINK]);
 AutomationPredicate.row = AutomationPredicate.roles([Role.ROW]);
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.table = AutomationPredicate.roles([Role.GRID, Role.TABLE]);
+/** @type {AutomationPredicate.Unary} */
+AutomationPredicate.listLike =
+    AutomationPredicate.roles([Role.LIST, Role.DESCRIPTION_LIST]);
 
 /**
  * @param {!AutomationNode} node
@@ -676,4 +679,24 @@ AutomationPredicate.ignoreDuringJump = function(node) {
       node.role == Role.INLINE_TEXT_BOX;
 };
 
+/**
+ * Returns a predicate that will match against a list-like node. The returned
+ * predicate should not match the first list-like ancestor of |node| (or |node|
+ * itself, if it is list-like).
+ * @param {AutomationNode} node
+ * @return {AutomationPredicate.Unary}
+ */
+AutomationPredicate.makeListPredicate = function(node) {
+  // Scan upward for a list-like ancestor. We do not want to match against this
+  // node.
+  var avoidNode = node;
+  while (avoidNode && !AutomationPredicate.listLike(avoidNode)) {
+    avoidNode = avoidNode.parent;
+  }
+
+  return function(autoNode) {
+    return AutomationPredicate.listLike(autoNode) && (autoNode !== avoidNode);
+  };
+};
+
 });  // goog.scope

chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs

@@ -2117,6 +2117,107 @@ TEST_F('ChromeVoxBackgroundTest', 'NonModalDialogHeadingJump', function() {
         .call(doCmd('previousHeading'))
         .expectSpeech('Heading outside dialog')
         .replay();
+    });
+});
+
+TEST_F('ChromeVoxBackgroundTest', 'NavigationByListTest', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(function() {/*!
+    <p>Start here</p>
+    <ul>
+      Drinks
+      <li>Coffee</li>
+      <li>Tea</li>
+    </ul>
+    <p>A random paragraph</p>
+    <ul></ul>
+    <ol>
+      Lunch
+      <li>Burgers</li>
+      <li>Fries</li>
+      <li>Soda</li>
+        <ul>
+          Nested list
+          <li>Element</li>
+        </ul>
+    </ol>
+    <p>Another random paragraph</p>
+    <dl>
+      Colors
+      <dt>Red</dt>
+      <dd>Description for red</dd>
+      <dt>Blue</dt>
+      <dd>Description for blue</dd>
+      <dt>Green</dt>
+      <dd>Description for green</dd>
+    </dl>
+  */}, function(root) {
+    mockFeedback.call(doCmd('jumpToTop'))
+      .call(doCmd('nextList'))
+      .expectSpeech('Drinks', 'List', 'with 2 items')
+      .call(doCmd('nextList'))
+      .expectSpeech('List' , 'with 0 items')
+      .call(doCmd('nextList'))
+      .expectSpeech('Lunch', 'List', 'with 3 items')
+      .call(doCmd('nextList'))
+      .expectSpeech('Nested list', 'List', 'with 1 item')
+      .call(doCmd('nextList'))
+      .expectSpeech('Colors', 'Description list', 'with 3 items')
+      .call(doCmd('nextList'))
+      // Ensure we wrap correctly.
+      .expectSpeech('Drinks', 'List', 'with 2 items')
+      .call(doCmd('nextObject'))
+      .call(doCmd('nextObject'))
+      .expectSpeech('Coffee')
+      // Ensure we wrap correctly and go to previous list, not top of current list.
+      .call(doCmd('previousList'))
+      .expectSpeech('Colors')
+      .call(doCmd('previousObject'))
+      .expectSpeech('Another random paragraph')
+      // Ensure we dive into the nested list.
+      .call(doCmd('previousList'))
+      .expectSpeech('Nested list', 'List', 'with 1 item')
+      .call(doCmd('previousList'))
+      .expectSpeech('Lunch')
+      .call(doCmd('nextObject'))
+      .call(doCmd('nextObject'))
+      .expectSpeech('Burgers')
+      // Ensure we go to the previous list, not the top of the current list.
+      .call(doCmd('previousList'))
+      .expectSpeech('List', 'with 0 items')
+      .call(doCmd('previousObject'))
+      .expectSpeech('A random paragraph')
+      .call(doCmd('previousList'))
+      .expectSpeech('Drinks', 'List', 'with 2 items')
+      .replay();
+  });
+});
+
+TEST_F('ChromeVoxBackgroundTest', 'NoListTest', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(function() {/*!
+  <button>Click me</button>
+  */}, function(root) {
+    mockFeedback.call(doCmd('nextList'))
+      .expectSpeech('No next list.')
+      .call(doCmd('previousList'))
+      .expectSpeech('No previous list.');
+    mockFeedback.replay();
+  });
+});
+
+TEST_F('ChromeVoxBackgroundTest', 'NavigateToLastHeading', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(function() {/*!
+  <h1>First</h1>
+  <h1>Second</h1>
+  <h1>Third</h1>
+  */}, function(root) {
+    mockFeedback.call(doCmd('jumpToTop'))
+      .expectSpeech('First', 'Heading 1')
+      .call(doCmd('previousHeading'))
+      .expectSpeech('Third', 'Heading 1')
+      .replay();
   });
 });
 

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

@@ -299,6 +299,7 @@ CommandHandler.onCommand = function(command) {
   var didNavigate = false;
   var tryScrolling = true;
   var skipSettingSelection = false;
+  var skipInitialAncestry = true;
   switch (command) {
     case 'nextCharacter':
       didNavigate = true;
@@ -522,6 +523,16 @@ CommandHandler.onCommand = function(command) {
       var useNode = node || originalNode;
       pred = AutomationPredicate.roles([node.role]);
       break;
+    case 'nextList':
+      pred = AutomationPredicate.makeListPredicate(current.start.node);
+      predErrorMsg = 'no_next_list';
+      break;
+    case 'previousList':
+      dir = Dir.BACKWARD;
+      pred = AutomationPredicate.makeListPredicate(current.start.node);
+      predErrorMsg = 'no_previous_list';
+      skipInitialAncestry = false;
+      break;
     case 'jumpToTop':
       var node = AutomationUtil.findNodePost(
           current.start.node.root, Dir.FORWARD, AutomationPredicate.object);
@@ -1007,7 +1018,8 @@ CommandHandler.onCommand = function(command) {
 
       if (!node) {
         node = AutomationUtil.findNextNode(
-            bound, dir, pred, {skipInitialAncestry: true, root: rootPred});
+            bound, dir, pred,
+            {skipInitialAncestry: skipInitialAncestry, root: rootPred});
       }
 
       if (node && !skipSync) {
@@ -1044,8 +1056,7 @@ CommandHandler.onCommand = function(command) {
                       root, dir, AutomationPredicate.leaf) ||
               bound;
         }
-        node = AutomationUtil.findNextNode(
-            bound, dir, pred, {skipInitialAncestry: true, root: rootPred});
+        node = AutomationUtil.findNextNode(bound, dir, pred, {root: rootPred});
 
         if (node && !skipSync) {
           node = AutomationUtil.findNodePre(

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

@@ -163,6 +163,9 @@ Output.ROLE_INFO_ = {
   contentInfo: {msgId: 'role_contentinfo', inherits: 'abstractContainer'},
   date: {msgId: 'input_type_date', inherits: 'abstractContainer'},
   definition: {msgId: 'role_definition', inherits: 'abstractContainer'},
+  descriptionList: {msgId: 'role_description_list', inherits: 'abstractList'},
+  descriptionListDetail:
+      {msgId: 'role_description_list_detail', inherits: 'abstractItem'},
   dialog:
       {msgId: 'role_dialog', outputContextFirst: true, ignoreAncestry: true},
   directory: {msgId: 'role_directory', inherits: 'abstractContainer'},

chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd

@@ -3748,6 +3748,18 @@ If you're done with the tutorial, use ChromeVox to navigate to the Close button
       <message desc="Used to describe the link behind a url." name="IDS_CHROMEVOX_URL_BEHIND_LINK">
         Link URL: <ph name="link_url">$1</ph>
       </message>
+      <message desc="Describes an HTML description list element." name="IDS_CHROMEVOX_ROLE_DESCRIPTION_LIST">
+        Description list
+      </message>
+      <message desc="Describes an HTML description list detail element." name="IDS_CHROMEVOX_ROLE_DESCRIPTION_LIST_DETAIL">
+        Description list detail
+      </message>
+      <message desc="This is an abbreviated HTML description list element shown on a braille display. When translating, try to find a contracted form of the translation for 'description list' according to local conventions. If reasonable, use all lowercase and avoid punctuation to keep the number of characters as low as possible."  name="IDS_CHROMEVOX_ROLE_DESCRIPTION_LIST_BRL">
+        dscrplst
+      </message>
+      <message desc="This is an abbreviated HTML description list detail element shown on a braille display. When translating, try to find a contracted form of the translation for 'description list detail' according to local conventions. If reasonable, use all lowercase and avoid punctuation to keep the number of characters as low as possible." name="IDS_CHROMEVOX_ROLE_DESCRIPTION_LIST_DETAIL_BRL">
+        dscrplst dtl
+      </message>
     </messages>
   </release>
 </grit>

third_party/chromevox/third_party/closure-library/closure/goog/asserts/asserts.js

@@ -44,7 +44,8 @@ goog.require('goog.string');
 /**
  * @define {boolean} Whether to strip out asserts or to leave them in.
  */
-goog.define('goog.asserts.ENABLE_ASSERTS', goog.DEBUG);
+goog.asserts.ENABLE_ASSERTS =
+    goog.define('goog.asserts.ENABLE_ASSERTS', goog.DEBUG);
 
 
 

third_party/chromevox/third_party/closure-library/closure/goog/base.js

@@ -200,7 +200,7 @@ goog.DEBUG = true;
  * this rule: the Hebrew language. For legacy reasons the old code (iw) should
  * be used instead of the new code (he), see http://wiki/Main/IIISynonyms.
  */
-goog.define('goog.LOCALE', 'en');  // default to en
+goog.LOCALE = goog.define('goog.LOCALE', 'en');  // default to en
 
 
 /**
@@ -214,7 +214,7 @@ goog.define('goog.LOCALE', 'en');  // default to en
  * relying on non-standard implementations, specify
  * "--define goog.TRUSTED_SITE=false" to the JSCompiler.
  */
-goog.define('goog.TRUSTED_SITE', true);
+goog.TRUSTED_SITE = goog.define('goog.TRUSTED_SITE', true);
 
 
 /**
@@ -224,7 +224,7 @@ goog.define('goog.TRUSTED_SITE', true);
  * running in EcmaScript Strict mode or warn about unavailable functionality.
  * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions_and_function_scope/Strict_mode
  */
-goog.define('goog.STRICT_MODE_COMPATIBLE', false);
+goog.STRICT_MODE_COMPATIBLE = goog.define('goog.STRICT_MODE_COMPATIBLE', false);
 
 
 /**
@@ -428,7 +428,7 @@ goog.addDependency = function(relPath, provides, requires) {
  * provided (and depend on the fact that some outside tool correctly ordered
  * the script).
  */
-goog.define('goog.ENABLE_DEBUG_LOADER', true);
+goog.ENABLE_DEBUG_LOADER = goog.define('goog.ENABLE_DEBUG_LOADER', true);
 
 
 /**