Merge dom node and node unit types.

chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_util.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 utilities for the automation extension API.
  */
 
 goog.provide('AutomationUtil');
 
@@ skipping 191 matching lines @@
   var ancestorsB = AutomationUtil.getAncestors(nodeB);
   var divergence = AutomationUtil.getDivergence(ancestorsA, ancestorsB);
 
   // Default to Dir.FORWARD.
   if (divergence == -1)
     return Dir.FORWARD;
 
   var divA = ancestorsA[divergence];
   var divB = ancestorsB[divergence];
 
-  // One of the nodes is an ancestor of the other. Don't distinguish and just
-  // consider it Dir.FORWARD.
-  if (!divA || !divB || divA.parent === nodeB || divB.parent === nodeA)
+  // One of the nodes is an ancestor of the other. Order this relationship in
+  // the same way dfs would. nodeA <= nodeB if nodeA is a descendant of
+  // nodeB. nodeA > nodeB if nodeB is a descendant of nodeA.
+
+  if (!divA)
+    return Dir.FORWARD;
+  if (!divB)
+    return Dir.BACKWARD;
+  if (divA.parent === nodeB)
+    return Dir.BACKWARD;
+  if (divB.parent === nodeA)
     return Dir.FORWARD;
 
   return divA.indexInParent <= divB.indexInParent ? Dir.FORWARD : Dir.BACKWARD;
 };
 
 /**
  * Determines whether the two given nodes come from the same tree source.
  * @param {AutomationNode} a
  * @param {AutomationNode} b
  * @return {boolean}
@@ skipping 79 matching lines @@
   while (root &&
       root.parent &&
       root.parent.root &&
       root.parent.root.role != RoleType.desktop) {
     root = root.parent.root;
   }
   return root;
 };
 
 });  // goog.scope