Fix child index and child count to respect role filtering.

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

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
index c556d59aed984ef9eb3677a760d940927a28bbf3..b0d8f52d6957ae171d686e40c0a20647cb02971c 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
@@ -1031,12 +1031,25 @@ Output.prototype = {
           options.annotation.push(token);
           this.append_(buff, node.description, options);
         } else if (token == 'indexInParent') {
-          options.annotation.push(token);
-          this.append_(buff, String(node.indexInParent + 1));
+          if (node.parent) {
+            options.annotation.push(token);
+            var count = 0;
+            for (var i = 0, child; child = node.parent.children[i]; i++) {
+              if (node.role == child.role)
+                count++;
+              if (node === child)
+                break;
+            }
+            this.append_(buff, String(count));
+          }
         } else if (token == 'parentChildCount') {
-          options.annotation.push(token);
-          if (node.parent)
-            this.append_(buff, String(node.parent.children.length));
+          if (node.parent) {
+            options.annotation.push(token);
+            var count = node.parent.children.filter(function(child) {
+              return node.role == child.role;
+            }).length;
+            this.append_(buff, String(count));
+          }
         } else if (token == 'state') {
           options.annotation.push(token);
           Object.getOwnPropertyNames(node.state).forEach(function(s) {