Cleanup AutomationUtil.findNodeUntil, fix wrapping when moving by line,

chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.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 Classes related to cursors that point to and select parts of
  * the automation tree.
  */
 
 goog.provide('cursors.Cursor');
@@ skipping 218 matching lines @@
                 newNode, dir, pred) || this.node_;
             newIndex = cursors.NODE_INDEX;
             break;
         }
         break;
       case Unit.LINE:
         newIndex = 0;
         switch (movement) {
           case Movement.BOUND:
             newNode = AutomationUtil.findNodeUntil(newNode, dir,
-                AutomationPredicate.linebreak, {before: true});
+                AutomationPredicate.linebreak, true);
             newNode = newNode || this.node_;
             newIndex =
                 dir == Dir.FORWARD ? this.getText(newNode).length : 0;
             break;
           case Movement.DIRECTIONAL:
             newNode = AutomationUtil.findNodeUntil(
                 newNode, dir, AutomationPredicate.linebreak);
             break;
           }
       break;
@@ skipping 31 matching lines @@
 
 cursors.WrappingCursor.prototype = {
   __proto__: cursors.Cursor.prototype,
 
   /** @override */
   move: function(unit, movement, dir) {
     var result = cursors.Cursor.prototype.move.call(this, unit, movement, dir);
     if (movement == Movement.DIRECTIONAL && result.equals(this)) {
       var pred = unit == Unit.DOM_NODE ?
           AutomationPredicate.leafDomNode : AutomationPredicate.leaf;
-      var root = this.node;
-      while (!AutomationUtil.isTraversalRoot(root) && root.parent)
-        root = root.parent;
-      var wrappedNode = AutomationUtil.findNodePre(root, dir, pred);
+      var endpoint = this.node;
+      while (!AutomationUtil.isTraversalRoot(endpoint) && endpoint.parent)
+        endpoint = endpoint.parent;
+      if (dir == Dir.BACKWARD) {
+        while (endpoint.lastChild)
+          endpoint = endpoint.lastChild;
+      }
+      var wrappedNode = endpoint;
+      if (!pred(wrappedNode))
+        wrappedNode = AutomationUtil.findNextNode(endpoint, dir, pred);
+
       if (wrappedNode) {
         cvox.ChromeVox.earcons.playEarcon(cvox.Earcon.WRAP);
         return new cursors.WrappingCursor(wrappedNode, cursors.NODE_INDEX);
       }
     }
     return new cursors.WrappingCursor(result.node, result.index);
   }
 };
 
 /**
@@ skipping 141 matching lines @@
    * Returns true if this range has either cursor end on web content.
    * @return {boolean}
   */
   isWebRange: function() {
     return this.start.node.root.role != RoleType.desktop ||
         this.end.node.root.role != RoleType.desktop;
   }
 };
 
 });  // goog.scope