Merge dom node and node unit types.

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 150 matching lines @@
 /**
  * @param {!AutomationNode} node
  * @return {boolean}
  */
 AutomationPredicate.leafWithText = function(node) {
   return AutomationPredicate.leaf(node) &&
       !!(node.name || node.value);
 };
 
 /**
- * Non-inline textbox nodes which have an equivalent in the DOM.
+ * Matches against leaves or static text nodes. Useful when restricting
+ * traversal to non-inline textboxes while still allowing them if navigation
+ * already entered into an inline textbox.
  * @param {!AutomationNode} node
  * @return {boolean}
  */
-AutomationPredicate.leafDomNode = function(node) {
+AutomationPredicate.leafOrStaticText = function(node) {
   return AutomationPredicate.leaf(node) ||
       node.role == RoleType.staticText;
 };
 
 /**
  * Matches against nodes visited during object navigation. An object as
  * defined below, are all nodes that are focusable or static text. When used in
  * tree walking, it should visit all nodes that tab traversal would as well as
  * non-focusable static text.
  * @param {!AutomationNode} node
  * @return {boolean}
  */
 AutomationPredicate.object = function(node) {
   return node.state.focusable ||
-      (AutomationPredicate.leafDomNode(node) &&
+      (AutomationPredicate.leafOrStaticText(node) &&
        (/\S+/.test(node.name) ||
         (node.role != RoleType.lineBreak &&
          node.role != RoleType.staticText &&
          node.role != RoleType.inlineTextBox)));
 };
 
 /**
  * @param {!AutomationNode} first
  * @param {!AutomationNode} second
  * @return {boolean}
@@ skipping 95 matching lines @@
  * @return {boolean}
  */
 AutomationPredicate.checkable = function(node) {
   return node.role == RoleType.checkBox ||
       node.role == RoleType.radioButton ||
       node.role == RoleType.menuItemCheckBox ||
       node.role == RoleType.menuItemRadio;
 };
 
 });  // goog.scope