Move some AX attrs from AXNodeData to AXTreeData.

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 IsInteractPermitted =
     requireNative('automationInternal').IsInteractPermitted;
 
 /**
  * @param {number} axTreeID The id of the accessibility tree.
  * @return {?number} The id of the root node.
  */
 var GetRootID = requireNative('automationInternal').GetRootID;
 
 /**
  * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?string} The title of the document.
+ */
+var GetDocTitle = requireNative('automationInternal').GetDocTitle;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?string} The url of the document.
+ */
+var GetDocURL = requireNative('automationInternal').GetDocURL;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?boolean} True if the document has finished loading.
+ */
+var GetDocLoaded = requireNative('automationInternal').GetDocLoaded;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?number} The loading progress, from 0.0 to 1.0 (fully loaded).
+ */
+var GetDocLoadingProgress =
+    requireNative('automationInternal').GetDocLoadingProgress;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?number} The ID of the selection anchor object.
+ */
+var GetAnchorObjectID = requireNative('automationInternal').GetAnchorObjectID;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?number} The selection anchor offset.
+ */
+var GetAnchorOffset = requireNative('automationInternal').GetAnchorOffset;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?number} The ID of the selection focus object.
+ */
+var GetFocusObjectID = requireNative('automationInternal').GetFocusObjectID;
+
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @return {?number} The selection focus offset.
+ */
+var GetFocusOffset = requireNative('automationInternal').GetFocusOffset;
+
+/**
+ * @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
  *    root of its tree or if the tree or node wasn't found.
  */
 var GetParentID = requireNative('automationInternal').GetParentID;
 
 /**
  * @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
@@ skipping 473 matching lines @@
 
 var stringAttributes = [
     'accessKey',
     'action',
     'ariaInvalidValue',
     'autoComplete',
     'containerLiveRelevant',
     'containerLiveStatus',
     'description',
     'display',
-    'docDoctype',
-    'docMimetype',
-    'docTitle',
-    'docUrl',
     'dropeffect',
     'help',
     'htmlTag',
     'liveRelevant',
     'liveStatus',
     'name',
     'placeholder',
     'shortcut',
     'textInputType',
     'url',
     'value'];
 
 var boolAttributes = [
     'ariaReadonly',
     'buttonMixed',
     'canSetValue',
     'canvasHasFallback',
     'containerLiveAtomic',
     'containerLiveBusy',
-    'docLoaded',
     'grabbed',
     'isAxTreeHost',
     'liveAtomic',
     'liveBusy',
     'updateLocationOnly'];
 
 var intAttributes = [
-    'anchorOffset',
     'backgroundColor',
     'color',
     'colorValue',
-    'focusOffset',
     'hierarchicalLevel',
     'invalidState',
     'posInSet',
     'scrollX',
     'scrollXMax',
     'scrollXMin',
     'scrollY',
     'scrollYMax',
     'scrollYMin',
     'setSize',
     'sortDirection',
     'tableCellColumnIndex',
     'tableCellColumnSpan',
     'tableCellRowIndex',
     'tableCellRowSpan',
     'tableColumnCount',
     'tableColumnIndex',
     'tableRowCount',
     'tableRowIndex',
     'textDirection',
     'textSelEnd',
     'textSelStart',
     'textStyle'];
 
 var nodeRefAttributes = [
     ['activedescendantId', 'activedescendant'],
-    ['anchorObjectId', 'anchorObject'],
-    ['focusObjectId', 'focusObject'],
     ['tableColumnHeaderId', 'tableColumnHeader'],
     ['tableHeaderId', 'tableHeader'],
     ['tableRowHeaderId', 'tableRowHeader'],
     ['titleUiElement', 'titleUIElement']];
 
 var intListAttributes = [
     'characterOffsets',
     'lineBreaks',
     'wordEnds',
     'wordStarts'];
 
 var nodeRefListAttributes = [
     ['cellIds', 'cells'],
     ['controlsIds', 'controls'],
     ['describedbyIds', 'describedBy'],
     ['flowtoIds', 'flowTo'],
     ['labelledbyIds', 'labelledBy'],
     ['uniqueCellIds', 'uniqueCells']];
 
 var floatAttributes = [
-    'docLoadingProgress',
     'valueForRange',
     'minValueForRange',
     'maxValueForRange',
     'fontSize'];
 
 var htmlAttributes = [
     ['type', 'inputType']];
 
 var publicAttributes = [];
 
@@ skipping 161 matching lines @@
     var result = GetRootID(this.treeID);
 
     // Don't return undefined, because the id is often passed directly
     // as an argument to a native binding that expects only a valid number.
     if (result === undefined)
       return -1;
 
     return result;
   },
 
+  get docUrl() {
+    return GetDocURL(this.treeID);
+  },
+
+  get docTitle() {
+    return GetDocTitle(this.treeID);
+  },
+
+  get docLoaded() {
+    return GetDocLoaded(this.treeID);
+  },
+
+  get docLoadingProgress() {
+    return GetDocLoadingProgress(this.treeID);
+  },
+
+  get anchorObject() {
+    var id = GetAnchorObjectID(this.treeID);
+    if (id && id != -1)
+      return this.get(id);
+    else
+      return undefined;
+  },
+
+  get anchorOffset() {
+    var id = GetAnchorObjectID(this.treeID);
+    if (id && id != -1)
+      return GetAnchorOffset(this.treeID);
+  },
+
+  get focusObject() {
+    var id = GetFocusObjectID(this.treeID);
+    if (id && id != -1)
+      return this.get(id);
+    else
+      return undefined;
+  },
+
+  get focusOffset() {
+    var id = GetFocusObjectID(this.treeID);
+    if (id && id != -1)
+      return GetFocusOffset(this.treeID);
+  },
+
   get: function(id) {
     if (id == undefined)
       return undefined;
 
     if (id == this.id)
       return this.wrapper;
 
     var obj = this.axNodeDataCache_[id];
     if (obj)
       return obj;
@@ skipping 74 matching lines @@
                                                'nextSibling',
                                                'isRootNode',
                                                'role',
                                                'state',
                                                'location',
                                                'indexInParent',
                                                'root']) });
 
 var AutomationRootNode = utils.expose('AutomationRootNode',
                                       AutomationRootNodeImpl,
-                                      { superclass: AutomationNode });
+                                      { superclass: AutomationNode,
+                                        readonly: ['docTitle',
+                                                   'docUrl',
+                                                   'docLoaded',
+                                                   'docLoadingProgress',
+                                                   'anchorObject',
+                                                   'anchorOffset',
+                                                   'focusObject',
+                                                   'focusOffset'] });
 
 AutomationRootNode.get = function(treeID) {
   return AutomationRootNodeImpl.get(treeID);
 }
 
 AutomationRootNode.getOrCreate = function(treeID) {
   return AutomationRootNodeImpl.getOrCreate(treeID);
 }
 
 AutomationRootNode.destroy = function(treeID) {
   AutomationRootNodeImpl.destroy(treeID);
 }
 
 exports.AutomationNode = AutomationNode;
 exports.AutomationRootNode = AutomationRootNode;