Support group and wrapping navigation.

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

 // Copyright 2016 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 commands.
  */
 
 goog.provide('CommandHandler');
 
@@ skipping 182 matching lines @@
 
   // Next/compat commands hereafter.
   if (ChromeVoxState.instance.mode == ChromeVoxMode.CLASSIC) return true;
 
   var current = ChromeVoxState.instance.currentRange_;
   var dir = Dir.FORWARD;
   var pred = null;
   var predErrorMsg = undefined;
   var rootPred = AutomationPredicate.root;
   var speechProps = {};
+  var skipSync = false;
   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;
     case 'nextWord':
@@ skipping 171 matching lines @@
       predErrorMsg = 'no_previous_landmark';
       break;
     case 'right':
     case 'nextObject':
       current = current.move(cursors.Unit.NODE, Dir.FORWARD);
       break;
     case 'left':
     case 'previousObject':
       current = current.move(cursors.Unit.NODE, Dir.BACKWARD);
       break;
+    case 'previousGroup':
+      skipSync = true;
+      dir = Dir.BACKWARD;
+      pred = AutomationPredicate.group;
+      break;
+    case 'nextGroup':
+      skipSync = true;
+      dir = Dir.FORWARD;
+      pred = AutomationPredicate.group;
+      break;
     case 'jumpToTop':
       var node = AutomationUtil.findNodePost(
           current.start.node.root, Dir.FORWARD, AutomationPredicate.leaf);
     if (node)
       current = cursors.Range.fromNode(node);
       break;
     case 'jumpToBottom':
       var node = AutomationUtil.findNodePost(
           current.start.node.root, Dir.BACKWARD, AutomationPredicate.leaf);
       if (node)
@@ skipping 232 matching lines @@
     default:
       return true;
   }
 
   if (pred) {
     var bound = current.getBound(dir).node;
     if (bound) {
       var node = AutomationUtil.findNextNode(
           bound, dir, pred, {skipInitialAncestry: true});
 
-      if (node) {
+      if (node && !skipSync) {
         node = AutomationUtil.findNodePre(
                    node, Dir.FORWARD, AutomationPredicate.object) ||
             node;
       }
 
       if (node) {
         current = cursors.Range.fromNode(node);
       } else {
-        if (predErrorMsg) {
+        cvox.ChromeVox.earcons.playEarcon(cvox.Earcon.WRAP);
+        var root = AutomationUtil.getTopLevelRoot(bound) || bound.root;
+        if (dir == Dir.FORWARD) {
+          bound = root;
+        } else {
+          bound = AutomationUtil.findNodePost(
+              root, dir, AutomationPredicate.leaf) || bound;
+        }
+        node = AutomationUtil.findNextNode(
+            bound, dir, pred, {skipInitialAncestry: true});
+
+      if (node && !skipSync) {
+        node = AutomationUtil.findNodePre(
+            node, Dir.FORWARD, AutomationPredicate.object) || node;
+      }
+
+      if (node) {
+        current = cursors.Range.fromNode(node);
+      } else if (predErrorMsg) {
           cvox.ChromeVox.tts.speak(
               Msgs.getMsg(predErrorMsg), cvox.QueueMode.FLUSH);
+        return false;
         }
-        return false;
       }
     }
   }
 
   if (current)
     ChromeVoxState.instance.navigateToRange(current, undefined, speechProps);
 
   return false;
 };
 
@@ skipping 40 matching lines @@
       break;
   }
   if (announcement) {
     cvox.ChromeVox.tts.speak(
         announcement, cvox.QueueMode.FLUSH,
         cvox.AbstractTts.PERSONALITY_ANNOTATION);
   }
 };
 
 }); //  goog.scope