Automation API: Get rid of host node and get parent from C++ bindings instead

chrome/renderer/resources/extensions/automation/automation_node.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.
 
 var AutomationEvent = require('automationEvent').AutomationEvent;
 var automationInternal =
     require('binding').Binding.create('automationInternal').generate();
 var exceptionHandler = require('uncaught_exception_handler');
 var IsInteractPermitted =
     requireNative('automationInternal').IsInteractPermitted;
@@ skipping 61 matching lines @@
 
 /**
  * @param {number} axTreeID The id of the accessibility tree.
  * @return {?string} The selection focus affinity.
  */
 var GetFocusAffinity = requireNative('automationInternal').GetFocusAffinity;
 
 /**
  * @param {number} axTreeID The id of the accessibility tree.
  * @param {number} nodeID The id of a node.
- * @return {?number} The id of the node's parent, or undefined if it's the
+ * @return {?Array<number>} An array containing the tree id and node id
+ *    of the node's parent, or undefined if it's the
  *    root of its tree or if the tree or node wasn't found.
  */
-var GetParentID = requireNative('automationInternal').GetParentID;
+var GetParent = requireNative('automationInternal').GetParent;
 
 /**
  * @param {number} axTreeID The id of the accessibility tree.
  * @param {number} nodeID The id of a node.
  * @return {?number} The number of children of the node, or undefined if
  *     the tree or node wasn't found.
  */
 var GetChildCount = requireNative('automationInternal').GetChildCount;
 
 /**
@@ skipping 139 matching lines @@
 var logging = requireNative('logging');
 var utils = require('utils');
 
 /**
  * A single node in the Automation tree.
  * @param {AutomationRootNodeImpl} root The root of the tree.
  * @constructor
  */
 function AutomationNodeImpl(root) {
   this.rootImpl = root;
-  this.hostNode_ = null;
   this.listeners = {__proto__: null};
 }
 
 AutomationNodeImpl.prototype = {
   __proto__: null,
   treeID: -1,
   id: -1,
   isRootNode: false,
 
   detach: function() {
     this.rootImpl = null;
-    this.hostNode_ = null;
     this.listeners = {__proto__: null};
   },
 
   get root() {
     return this.rootImpl && this.rootImpl.wrapper;
   },
 
   get parent() {
     if (!this.rootImpl)
       return undefined;
-    if (this.hostNode_)
-      return this.hostNode_;
-    var parentID = GetParentID(this.treeID, this.id);
-    return this.rootImpl.get(parentID);
+    var parentTreeIDAndNodeID = GetParent(this.treeID, this.id);
+    if (!parentTreeIDAndNodeID)
+      return undefined;
+    var parentTreeID = parentTreeIDAndNodeID[0];
+    var parentNodeID = parentTreeIDAndNodeID[1];
+    if (parentTreeID == this.treeID)
+      return this.rootImpl.get(parentNodeID);
+    var tree = AutomationRootNodeImpl.get(parentTreeID);
+    if (!tree)
+      return undefined;
+    return tree.get(parentNodeID);
   },
 
   get htmlAttributes() {
     return GetHtmlAttributes(this.treeID, this.id) || {};
   },
 
   get state() {
     return GetState(this.treeID, this.id) || {};
   },
 
@@ skipping 206 matching lines @@
     // - bubbling: starting from the target's parent, going back up to the root.
     // At any stage, a listener may call stopPropagation() on the event, which
     // will immediately stop event propagation through this path.
     if (this.dispatchEventAtCapturing_(event, path)) {
       if (this.dispatchEventAtTargeting_(event, path))
         this.dispatchEventAtBubbling_(event, path);
     }
   },
 
   toString: function() {
-    var parentID = GetParentID(this.treeID, this.id);
     var childTreeID = GetIntAttribute(this.treeID, this.id, 'childTreeId');
     var count = GetChildCount(this.treeID, this.id);
     var childIDs = [];
     for (var i = 0; i < count; ++i) {
       var childID = GetChildIDAtIndex(this.treeID, this.id, i);
       $Array.push(childIDs, childID);
     }
 
     var result = 'node id=' + this.id +
         ' role=' + this.role +
         ' state=' + $JSON.stringify(this.state) +
-        ' parentID=' + parentID +
         ' childIds=' + $JSON.stringify(childIDs);
-    if (this.hostNode_) {
-      var hostNodeImpl = privates(this.hostNode_).impl;
-      result += ' host treeID=' + hostNodeImpl.treeID +
-          ' host nodeID=' + hostNodeImpl.id;
-    }
     if (childTreeID)
       result += ' childTreeID=' + childTreeID;
     return result;
   },
 
   dispatchEventAtCapturing_: function(event, path) {
     privates(event).impl.eventPhase = Event.CAPTURING_PHASE;
     for (var i = path.length - 1; i >= 0; i--) {
       this.fireEventListeners_(path[i], event);
       if (privates(event).impl.propagationStopped)
@@ skipping 380 matching lines @@
    * @type {boolean}
    */
   isRootNode: true,
 
   /**
    * @type {number}
    */
   treeID: -1,
 
   /**
-   * The parent of this node from a different tree.
-   * @type {?AutomationNode}
-   * @private
-   */
-  hostNode_: null,
-
-  /**
    * A map from id to AutomationNode.
    * @type {Object.<number, AutomationNode>}
    * @private
    */
   axNodeDataCache_: null,
 
   get id() {
     var result = GetRootID(this.treeID);
 
     // Don't return undefined, because the id is often passed directly
@@ skipping 89 matching lines @@
     delete this.axNodeDataCache_[id];
   },
 
   destroy: function() {
     this.dispatchEvent('destroyed', 'none');
     for (var id in this.axNodeDataCache_)
       this.remove(id);
     this.detach();
   },
 
-  setHostNode(hostNode) {
-    this.hostNode_ = hostNode;
-  },
-
   onAccessibilityEvent: function(eventParams) {
     var targetNode = this.get(eventParams.targetID);
     if (targetNode) {
       var targetNodeImpl = privates(targetNode).impl;
       targetNodeImpl.dispatchEvent(
           eventParams.eventType, eventParams.eventFrom,
           eventParams.mouseX, eventParams.mouseY);
     } else {
       logging.WARNING('Got ' + eventParams.eventType +
                       ' event on unknown node: ' + eventParams.targetID +
@@ skipping 92 matching lines @@
 utils.defineProperty(AutomationRootNode, 'getOrCreate', function(treeID) {
   return AutomationRootNodeImpl.getOrCreate(treeID);
 });
 
 utils.defineProperty(AutomationRootNode, 'destroy', function(treeID) {
   AutomationRootNodeImpl.destroy(treeID);
 });
 
 exports.$set('AutomationNode', AutomationNode);
 exports.$set('AutomationRootNode', AutomationRootNode);