Re-land: Update json_schema_compiler to handle the Automation extension API

chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
index f69ff352941c295bbf27d6fe935274e19a746f50..31c63b3b9159dcc9cf0c259ce61afc25e2082698 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
@@ -121,11 +121,11 @@ cursors.Cursor.prototype = {
     // node.
     var lNode = this.node;
     var rNode = rhs.node;
-    while (lNode && (lNode.role == RoleType.inlineTextBox ||
-        lNode.role == RoleType.staticText))
+    while (lNode && (lNode.role == RoleType.INLINE_TEXT_BOX ||
+        lNode.role == RoleType.STATIC_TEXT))
       lNode = lNode.parent;
-    while (rNode && (rNode.role == RoleType.inlineTextBox ||
-        rNode.role == RoleType.staticText))
+    while (rNode && (rNode.role == RoleType.INLINE_TEXT_BOX ||
+        rNode.role == RoleType.STATIC_TEXT))
       rNode = rNode.parent;
 
     // Ignore indicies for now.
@@ -176,22 +176,22 @@ cursors.Cursor.prototype = {
     // Selections over line break nodes are broken.
     var parent = adjustedNode.parent;
     var grandparent = parent && parent.parent;
-    if (parent.role == RoleType.lineBreak) {
+    if (parent.role == RoleType.LINE_BREAK) {
       adjustedNode = grandparent;
-    } else if (grandparent.role == RoleType.lineBreak) {
+    } else if (grandparent.role == RoleType.LINE_BREAK) {
       adjustedNode = grandparent.parent;
     } else if (this.index_ == cursors.NODE_INDEX ||
-        adjustedNode.role == RoleType.inlineTextBox ||
-        chrome.automation.NameFromType[adjustedNode.nameFrom] != 'contents') {
+        adjustedNode.role == RoleType.INLINE_TEXT_BOX ||
+        adjustedNode.nameFrom != chrome.automation.NameFromType.CONTENTS) {
       // A node offset or unselectable character offset.
       adjustedNode = parent;
     } else {
       // A character offset into content.
       adjustedNode =
-          adjustedNode.find({role: RoleType.staticText}) || adjustedNode;
+          adjustedNode.find({role: RoleType.STATIC_TEXT}) || adjustedNode;
     }
 
-    return adjustedNode;
+    return adjustedNode || null;
   },
 
   /**
@@ -209,9 +209,9 @@ cursors.Cursor.prototype = {
 
     if (this.node.state.editable) {
       return this.index_ == cursors.NODE_INDEX ? 0 : this.index_;
-    } else if (this.node.role == RoleType.inlineTextBox &&
+    } else if (this.node.role == RoleType.INLINE_TEXT_BOX &&
     // Selections under a line break are broken.
-        this.node.parent && this.node.parent.role != RoleType.lineBreak) {
+        this.node.parent && this.node.parent.role != RoleType.LINE_BREAK) {
       if (adjustedIndex == cursors.NODE_INDEX)
         adjustedIndex = 0;
 
@@ -221,13 +221,13 @@ cursors.Cursor.prototype = {
         sibling = sibling.previousSibling;
       }
     } else if (this.index_ == cursors.NODE_INDEX ||
-        chrome.automation.NameFromType[this.node.nameFrom] != 'contents') {
+        this.node.nameFrom != chrome.automation.NameFromType.CONTENTS) {
       // A node offset or unselectable character offset.
 
       // The selected node could have been adjusted upwards in the tree.
       var childOfSelection = this.node;
       do {
-        adjustedIndex = childOfSelection.indexInParent;
+        adjustedIndex = childOfSelection.indexInParent || 0;
         childOfSelection = childOfSelection.parent;
       } while (childOfSelection && childOfSelection != this.selectionNode_);
     }
@@ -286,7 +286,7 @@ cursors.Cursor.prototype = {
         }
         break;
       case Unit.WORD:
-        if (newNode.role != RoleType.inlineTextBox) {
+        if (newNode.role != RoleType.INLINE_TEXT_BOX) {
           newNode = AutomationUtil.findNextNode(newNode,
               Dir.FORWARD,
               AutomationPredicate.inlineTextBox,
@@ -294,7 +294,7 @@ cursors.Cursor.prototype = {
         }
         switch (movement) {
           case Movement.BOUND:
-            if (newNode.role == RoleType.inlineTextBox) {
+            if (newNode.role == RoleType.INLINE_TEXT_BOX) {
               var start, end;
               for (var i = 0; i < newNode.wordStarts.length; i++) {
                 if (newIndex >= newNode.wordStarts[i] &&
@@ -311,7 +311,7 @@ cursors.Cursor.prototype = {
             }
             break;
           case Movement.DIRECTIONAL:
-            if (newNode.role == RoleType.inlineTextBox) {
+            if (newNode.role == RoleType.INLINE_TEXT_BOX) {
               var start, end;
               for (var i = 0; i < newNode.wordStarts.length; i++) {
                 if (newIndex >= newNode.wordStarts[i] &&
@@ -334,7 +334,7 @@ cursors.Cursor.prototype = {
                   if (newNode) {
                     newIndex = 0;
                     if (dir == Dir.BACKWARD &&
-                        newNode.role == RoleType.inlineTextBox) {
+                        newNode.role == RoleType.INLINE_TEXT_BOX) {
                       var starts = newNode.wordStarts;
                       newIndex = starts[starts.length - 1] || 0;
                     } else {
@@ -605,7 +605,7 @@ cursors.Range.prototype = {
     return this.start.node &&
         this.end.node &&
         this.start.node.role == this.end.node.role &&
-        this.start.node.role == RoleType.inlineTextBox;
+        this.start.node.role == RoleType.INLINE_TEXT_BOX;
   },
 
   /**
@@ -657,7 +657,7 @@ cursors.Range.prototype = {
 
     // Only allow selections within the same web tree.
     if (startNode.root &&
-        startNode.root.role == RoleType.rootWebArea &&
+        startNode.root.role == RoleType.ROOT_WEB_AREA &&
         startNode.root == endNode.root) {
       // We want to adjust to select the entire node for node offsets;
       // otherwise, use the plain character offset.
@@ -680,8 +680,8 @@ cursors.Range.prototype = {
   */
   isWebRange: function() {
     return this.isValid() &&
-        (this.start.node.root.role != RoleType.desktop ||
-        this.end.node.root.role != RoleType.desktop);
+        (this.start.node.root.role != RoleType.DESKTOP ||
+        this.end.node.root.role != RoleType.DESKTOP);
   },
 
   /**