Support output of heading levels.

- adds rules for headings, both entering and speaking.
- adds a '+' delimiter which allows for subsittutions inside of message tokens.

TEST=OutputE2ETest.*

Review URL: https://codereview.chromium.org/1049853002

Cr-Commit-Position: refs/heads/master@{#325566}

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

@@ -169,8 +169,8 @@ Output.RULES = {
       enter: '$name $role'
     },
     heading: {
-      enter: '@aria_role_heading',
-      speak: '@aria_role_heading $name='
+      enter: '@tag_h+$hierarchicalLevel',
+      speak: '@tag_h+$hierarchicalLevel $name='
     },
     inlineTextBox: {
       speak: '$value='
@@ -623,6 +623,14 @@ Output.prototype = {
           }
         }
       } else if (prefix == '@') {
+        // Tokens can have substitutions.
+        var pieces = token.split('+');
+        token = pieces.reduce(function(prev, cur) {
+          var lookup = cur;
+          if (cur[0] == '$')
+            lookup = node.attributes[cur.slice(1)];
+          return prev + lookup;
+        }.bind(this), '');
         var msgId = token;
         var msgArgs = [];
         var curMsg = tree.firstChild;

chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs

@@ -83,3 +83,57 @@ TEST_F('OutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
       ]}, o.toSpannable());
   });
 });
+
+TEST_F('OutputE2ETest', 'Headings', function() {
+  this.runWithLoadedTree(
+      '<h1>a</h1><h2>b</h2><h3>c</h3><h4>d</h4><h5>e</h5><h6>f</h6>',
+    function(root) {
+      var el = root.firstChild;
+      var range = cursors.Range.fromNode(el);
+      var o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 1a', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+
+      el = el.nextSibling;
+      range = cursors.Range.fromNode(el);
+      o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 2b', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+
+      el = el.nextSibling;
+      range = cursors.Range.fromNode(el);
+      o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 3c', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+
+      el = el.nextSibling;
+      range = cursors.Range.fromNode(el);
+      o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 4d', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+
+      el = el.nextSibling;
+      range = cursors.Range.fromNode(el);
+      o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 5e', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+
+      el = el.nextSibling;
+      range = cursors.Range.fromNode(el);
+      o = new Output().withSpeechAndBraille(range, null, 'navigate');
+      assertEqualsJSON({string_: 'Heading 6f', 'spans_': [
+        // Attributes.
+        {value: 'name', start: 9, end: 10}
+      ]}, o.toSpannable());
+  });
+});