Support group and wrapping navigation.

chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_predicate.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 ChromeVox predicates for the automation extension API.
  */
 
 goog.provide('AutomationPredicate');
 goog.provide('AutomationPredicate.Binary');
@@ skipping 53 matching lines @@
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.heading = AutomationPredicate.roles([Role.heading]);
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.inlineTextBox =
     AutomationPredicate.roles([Role.inlineTextBox]);
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.link = AutomationPredicate.roles([Role.link]);
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.row = AutomationPredicate.roles([Role.row]);
 /** @type {AutomationPredicate.Unary} */
-AutomationPredicate.table = AutomationPredicate.roles([Role.table]);
+AutomationPredicate.table = AutomationPredicate.roles([Role.grid, Role.table]);
 
 /**
  * @param {!AutomationNode} node
  * @return {boolean}
  */
 AutomationPredicate.button = function(node) {
   return /button/i.test(node.role);
 };
 
 /**
@@ skipping 105 matching lines @@
 
   return node.state.focusable ||
       (AutomationPredicate.leafOrStaticText(node) &&
        (/\S+/.test(node.name) ||
         (node.role != Role.lineBreak &&
          node.role != Role.staticText &&
          node.role != Role.inlineTextBox)));
 };
 
 /**
+ * Matches against nodes visited during group navigation. An object as
+ * @param {!AutomationNode} node
+ * @return {boolean}
+ */
+AutomationPredicate.group = AutomationPredicate.match({
+  anyRole: [
+    Role.heading,
+    Role.list,
+    Role.paragraph
+  ],
+  anyPredicate: [
+    AutomationPredicate.editText,
+    AutomationPredicate.formField,
+    AutomationPredicate.object,
+    AutomationPredicate.table
+  ]
+});
+
+/**
  * @param {!AutomationNode} first
  * @param {!AutomationNode} second
  * @return {boolean}
  */
 AutomationPredicate.linebreak = function(first, second) {
   // TODO(dtseng): Use next/previousOnLin once available.
   var fl = first.location;
   var sl = second.location;
   return fl.top != sl.top ||
       (fl.top + fl.height != sl.top + sl.height);
@@ skipping 17 matching lines @@
       (node.role == Role.textField && node.state.readOnly) ||
       (node.state.editable && node.parent && !node.parent.state.editable);
 };
 
 /**
  * Matches against nodes that contain interesting nodes, but should never be
  * visited.
  * @param {!AutomationNode} node
  * @return {boolean}
  */
-AutomationPredicate.structuralContainer = function(node) {
-  return node.role == Role.rootWebArea ||
-      node.role == Role.embeddedObject ||
-      node.role == Role.iframe ||
-      node.role == Role.iframePresentational;
-};
+AutomationPredicate.structuralContainer = AutomationPredicate.roles([
+    Role.rootWebArea,
+    Role.embeddedObject,
+    Role.iframe,
+    Role.iframePresentational]);
 
 /**
  * Returns whether the given node should not be crossed when performing
  * traversals up the ancestry chain.
  * @param {AutomationNode} node
  * @return {boolean}
  */
 AutomationPredicate.root = function(node) {
   switch (node.role) {
     case Role.dialog:
@@ skipping 142 matching lines @@
  * @param {number} level 1-6
  * @return {AutomationPredicate.Unary}
  */
 AutomationPredicate.makeHeadingPredicate = function(level) {
   return function(node) {
     return node.role == Role.heading && node.hierarchicalLevel == level;
   };
 };
 
 });  // goog.scope