bug 474408 - Remove role='description', r=MarcoZ
authorDavid Bolter <dbolter@mozilla.com>
Tue, 10 Feb 2009 10:40:38 +0100
changeset 24820 42a0ae4739138523a592b2b8685cf80d1d8091b1
parent 24819 a303089722f17faecf0c05850e48d5afb7e30480
child 24821 37b0d6169084a530a1fd2d6bf583c836d7e3f8e8
push idunknown
push userunknown
push dateunknown
reviewersMarcoZ
bugs474408
milestone1.9.2a1pre
bug 474408 - Remove role='description', r=MarcoZ
accessible/public/nsIAccessibleRole.idl
accessible/src/base/nsARIAMap.cpp
accessible/tests/mochitest/test_nsIAccessNode_utils.html
--- a/accessible/public/nsIAccessibleRole.idl
+++ b/accessible/public/nsIAccessibleRole.idl
@@ -300,18 +300,18 @@ interface nsIAccessibleRole : nsISupport
   /**
    * Represents a picture. Is is used for xul:image, html:img.
    */
   const unsigned long ROLE_GRAPHIC = 40;
 
   /**
    * Represents read-only text, such as labels for other controls or
    * instructions in a dialog box. Static text cannot be modified or selected.
-   * Is is used for xul:label, xul:description, html:lablel,
-   * role="label" or role="description", xforms:output.
+   * Is is used for xul:label, xul:description, html:label, role="label",
+   * or xforms:output.
    */
   const unsigned long ROLE_STATICTEXT = 41;
 
   /**
    * Represents selectable text that allows edits or is designated read-only.
    */
   const unsigned long ROLE_TEXT_LEAF = 42;
 
--- a/accessible/src/base/nsARIAMap.cpp
+++ b/accessible/src/base/nsARIAMap.cpp
@@ -130,24 +130,16 @@ nsRoleMapEntry nsARIAMap::gWAIRoleMap[] 
     eHasValueMinMax,
     eOpenCloseAction,
     nsIAccessibleStates::STATE_COLLAPSED | nsIAccessibleStates::STATE_HASPOPUP,
     // Manually map EXT_STATE_SUPPORTS_AUTOCOMPLETION aria-autocomplete
     {&nsAccessibilityAtoms::aria_readonly, kBoolState, nsIAccessibleStates::STATE_READONLY},
     kEndEntry
   },
   {
-    "description",
-    nsIAccessibleRole::ROLE_TEXT_CONTAINER,
-    eNoValue,
-    eNoAction,
-    kNoReqStates,
-    kEndEntry
-  },
-  {
     "dialog",
     nsIAccessibleRole::ROLE_DIALOG,
     eNoValue,
     eNoAction,
     kNoReqStates,
     kEndEntry
   },
   {
--- a/accessible/tests/mochitest/test_nsIAccessNode_utils.html
+++ b/accessible/tests/mochitest/test_nsIAccessNode_utils.html
@@ -44,12 +44,12 @@
      title="nsIAccessNode util methods testing">
     Mozilla Bug 454211
   </a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
   </pre>
 
-  <span role="description" style="color: red" id="span">text</span>
+  <span role="note" style="color: red" id="span">text</span>
 
 </body>
 </html>