AX checked state changes

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 705 matching lines @@
 /**
  * Calling this will make the next speech utterance use |mode| even if it would
  * normally queue or do a category flush. This differs from the |withQueueMode|
  * instance method as it can apply to future output.
    * @param {cvox.QueueMode} mode
  */
 Output.forceModeForNextSpeechUtterance = function(mode) {
   Output.forceModeForNextSpeechUtterance_ = mode;
 };
 
+/**
+ * For a given automation property, return true if the the value
+ * represents something 'truthy', e.g.: for checked:
+ * 'true'|'mixed' -> true
+ * 'false'|undefined -> false
+ */
+Output.isTruthy = function(node, attrib) {
+    switch(attrib) {
+      case 'checked':
+        return node.checked && node.checked !== 'false';
+      default:
+        return node[attrib] !== undefined || node.state[attrib];
+    }
+};
+
 Output.prototype = {
   /**
    * @return {boolean} True if there's any speech that will be output.
    */
   get hasSpeech() {
     for (var i = 0; i < this.speechBuffer_.length; i++) {
       if (this.speechBuffer_[i].trim().length)
         return true;
     }
     return false;
@@ skipping 412 matching lines @@
         } else if (token == 'parentChildCount') {
           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 == 'checked') {
           var msg;
-          var ariaChecked = node.htmlAttributes['aria-checked'];
-          switch (ariaChecked) {
+          switch (node.checked) {
             case 'mixed':
-              msg = 'aria_checked_mixed';
+              msg = 'checked_mixed';
               break;
             case 'true':
-              msg = 'aria_checked_true';
-              break;
-            case 'false':
-              msg = 'aria_checked_false';
+              msg = 'checked_true';
               break;
             default:
-              msg = node.state[StateType.CHECKED] ?
-                  'aria_checked_true' : 'aria_checked_false';
+              msg = 'checked_false';
+              break;
           }
           this.format_(node, '@' + msg, buff);
         } else if (token == 'state') {
           if (node.state) {
             Object.getOwnPropertyNames(node.state).forEach(function(s) {
               var stateInfo = Output.STATE_INFO_[s];
               if (stateInfo && !stateInfo.isRoleSpecific && stateInfo.on)
               this.format_(node, '@' + stateInfo.on.msgId, buff);
             }.bind(this));
           }
@@ skipping 111 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] !== undefined || node.state[attrib])
+            if (Output.isTruthy(node, 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,
@@ skipping 562 matching lines @@
   /**
    * Gets the output buffer for braille.
    * @return {!Spannable}
    */
   get brailleOutputForTest() {
     return this.mergeBraille_(this.brailleBuffer_);
   }
 };
 
 });  // goog.scope