Use aria range values for sliders

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.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.
 
 /**
  * @fileoverview Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
@@ skipping 236 matching lines @@
   },
   menuItemRadio: {
     msgId: 'role_menuitemradio'
   },
   menuListOption: {
     msgId: 'role_menuitem'
   },
   menuListPopup: {
     msgId: 'role_menu'
   },
+  meter: {
+    msgId: 'role_meter',
+    inherits: 'abstractRange'
+  },
   navigation: {
     msgId: 'role_navigation',
     inherits: 'abstractContainer'
   },
   note: {
     msgId: 'role_note',
     inherits: 'abstractContainer'
   },
+  progressIndicator: {
+    msgId: 'role_progress_indicator',
+    inherits: 'abstractRange'
+  },
   popUpButton: {
     msgId: 'role_button',
     earconId: 'POP_UP_BUTTON'
   },
   radioButton: {
     msgId: 'role_radio'
   },
   radioGroup: {
     msgId: 'role_radiogroup',
   },
   rootWebArea: {
     outputContextFirst: true
   },
   row: {
     msgId: 'role_row',
     inherits: 'abstractContainer'
   },
   rowHeader: {
     msgId: 'role_rowheader',
     inherits: 'cell'
   },
   scrollBar: {
     msgId: 'role_scrollbar',
+    inherits: 'abstractRange'
   },
   search: {
     msgId: 'role_search',
     inherits: 'abstractContainer'
   },
   separator: {
     msgId: 'role_separator',
     inherits: 'abstractContainer'
   },
+  slider: {
+    msgId: 'role_slider',
+    inherits: 'abstractRange',
+    earconId: 'SLIDER'
+  },
   spinButton: {
     msgId: 'role_spinbutton',
+    inherits: 'abstractRange',
     earconId: 'LISTBOX'
   },
   status: {
     msgId: 'role_status'
   },
   tab: {
     msgId: 'role_tab'
   },
   tabList: {
     msgId: 'role_tablist'
@@ skipping 80 matching lines @@
 Output.RULES = {
   navigate: {
     'default': {
       speak: '$name $value $state $role $description',
       braille: ''
     },
     abstractContainer: {
       enter: '$nameFromNode $role $state $description',
       leave: '@exited_container($role)'
     },
+    abstractRange: {
+      speak:
+          '$if($valueForRange, $valueForRange, $value) ' +
+          '$if($minValueForRange, @aria_value_min($minValueForRange)) ' +
+          '$if($maxValueForRange, @aria_value_max($maxValueForRange)) ' +
+          '$name $role $description $state'
+    },
     alert: {
       enter: '$name $role $state',
       speak: '$earcon(ALERT_NONMODAL) $role $nameOrTextContent $state'
     },
     alertDialog: {
       enter: '$earcon(ALERT_MODAL) $name $state',
       speak: '$earcon(ALERT_MODAL) $name $nameOrTextContent $state $role'
     },
     cell: {
       enter: '@cell_summary($tableCellRowIndex, $tableCellColumnIndex) ' +
@@ skipping 111 matching lines @@
     },
     region: {
       speak: '$nameOrTextContent'
     },
     row: {
       enter: '$node(tableRowHeader)'
     },
     rowHeader: {
       speak: '$nameOrTextContent $state'
     },
-    slider: {
-      speak: '$earcon(SLIDER) @describe_slider($value, $name) $description ' +
-          '$state'
-    },
     staticText: {
       speak: '$name='
     },
     switch: {
       speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' +
           '$if($checked, @describe_switch_on($name), ' +
           '@describe_switch_off($name)) $description $state'
     },
     tab: {
       speak: '@describe_tab($name) $state $description ' +
@@ skipping 527 matching lines @@
             this.append_(buff, selectedText, options);
             this.append_(buff, Msgs.getMsg('selected'));
           } else {
             this.append_(buff, text, options);
           }
         } else if (token == 'name') {
           options.annotation.push(token);
           var earcon = node ? this.findEarcon_(node, opt_prevNode) : null;
           if (earcon)
             options.annotation.push(earcon);
-          this.append_(buff, node.name, options);
+          this.append_(buff, node.name || '', options);
+        } else if (token == 'description') {
+          if (node.name == node.description)
+            return;
+
+          options.annotation.push(token);
+          this.append_(buff, node.description || '', options);
         } else if (token == 'urlFilename') {
           options.annotation.push('name');
           var url = node.url;
           var filename = '';
           if (url.substring(0, 4) != 'data') {
             filename =
                 url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.'));
 
             // Hack to not speak the filename if it's ridiculously long.
             if (filename.length >= 30)
@@ skipping 174 matching lines @@
           var msgId =
               this.formatOptions_.braille ? resolvedInfo.msgId + '_brl' :
               resolvedInfo.msgId;
           var msg = Msgs.getMsg(msgId);
           this.append_(buff, msg, options);
         } else if (tree.firstChild) {
           // Custom functions.
           if (token == 'if') {
             var cond = tree.firstChild;
             var attrib = cond.value.slice(1);
-            if (node[attrib] || node.state[attrib])
+            if (node[attrib] !== undefined || node.state[attrib])
               this.format_(node, cond.nextSibling, buff);
             else
               this.format_(node, cond.nextSibling.nextSibling, buff);
           } else if (token == 'earcon') {
             // Ignore unless we're generating speech output.
             if (!this.formatOptions_.speech)
               return;
 
             options.annotation.push(
                 new Output.EarconAction(tree.firstChild.value, node.location));
@@ skipping 560 matching lines @@
   /**
    * Gets the output buffer for braille.
    * @return {!Spannable}
    */
   get brailleOutputForTest() {
     return this.mergeBraille_(this.brailleBuffer_);
   }
 };
 
 });  // goog.scope