From dc19802645edc37899014f3175794f640444ef9f Mon Sep 17 00:00:00 2001 From: "aaronleventhal%moonset.net" Date: Fri, 9 Mar 2007 21:15:39 +0000 Subject: [PATCH] Bug 369640. Fix ARIA multiselect -- the correct name is multiselectable. r=david.bolter git-svn-id: svn://10.0.0.236/trunk@221628 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/base/nsAccessibilityAtomList.h | 4 ++-- mozilla/accessible/src/base/nsAccessible.cpp | 16 ++++++++-------- mozilla/accessible/src/base/nsDocAccessible.cpp | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/accessible/src/base/nsAccessibilityAtomList.h b/mozilla/accessible/src/base/nsAccessibilityAtomList.h index d0c5fbd1b84..ceaa717f70c 100755 --- a/mozilla/accessible/src/base/nsAccessibilityAtomList.h +++ b/mozilla/accessible/src/base/nsAccessibilityAtomList.h @@ -163,13 +163,13 @@ ACCESSIBILITY_ATOM(tooltiptext, "tooltiptext") ACCESSIBILITY_ATOM(type, "type") ACCESSIBILITY_ATOM(value, "value") - // DHTML accessibility attributes + // ARIA (DHTML accessibility) attributes ACCESSIBILITY_ATOM(checked, "checked") ACCESSIBILITY_ATOM(droppable, "droppable") ACCESSIBILITY_ATOM(expanded, "expanded") ACCESSIBILITY_ATOM(invalid, "invalid") ACCESSIBILITY_ATOM(level, "level") -ACCESSIBILITY_ATOM(multiselect, "multiselect") +ACCESSIBILITY_ATOM(multiselectable, "multiselectable") ACCESSIBILITY_ATOM(posinset, "posinset") ACCESSIBILITY_ATOM(required, "required") ACCESSIBILITY_ATOM(role, "role") diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp index 505ba30fb9f..b7e16177e50 100644 --- a/mozilla/accessible/src/base/nsAccessible.cpp +++ b/mozilla/accessible/src/base/nsAccessible.cpp @@ -189,7 +189,7 @@ PRBool nsAccessible::IsTextInterfaceSupportCorrect(nsIAccessible *aAccessible) nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) { // Custom-built QueryInterface() knows when we support nsIAccessibleSelectable - // based on role attribute and waistate:multiselect + // based on role attribute and waistate:multiselectable *aInstancePtr = nsnull; if (aIID.Equals(NS_GET_IID(nsIAccessible))) { @@ -211,14 +211,14 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr) } if (HasRoleAttribute(content)) { // If we have an XHTML role attribute present and the - // waistate multiselect attribute not empty or false, then we need + // waistate multiselectable attribute not empty or false, then we need // to support nsIAccessibleSelectable - // If either attribute (role or multiselect) change, then we'll + // If either attribute (role or multiselectable) change, then we'll // destroy this accessible so that we can follow COM identity rules. static nsIContent::AttrValuesArray strings[] = {&nsAccessibilityAtoms::_empty, &nsAccessibilityAtoms::_false, nsnull}; - if (content->FindAttrValueIn(kNameSpaceID_None, - nsAccessibilityAtoms::multiselect, + if (content->FindAttrValueIn(kNameSpaceID_WAIProperties , + nsAccessibilityAtoms::multiselectable, strings, eCaseMatters) == nsIContent::ATTR_VALUE_NO_MATCH) { *aInstancePtr = NS_STATIC_CAST(nsIAccessibleSelectable*, this); @@ -1882,17 +1882,17 @@ nsRoleMapEntry nsAccessible::gWAIRoleMap[] = {"combobox", ROLE_COMBOBOX, eNameLabelOrTitle, eHasValueMinMax, eNoReqStates, {"readonly", BOOL_STATE, STATE_READONLY}, {"expanded", BOOL_STATE, STATE_EXPANDED}, - {"multiselect", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, + {"multiselectable", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, {"description", ROLE_TEXT_CONTAINER, eNameOkFromChildren, eNoValue, eNoReqStates, END_ENTRY}, {"dialog", ROLE_DIALOG, eNameLabelOrTitle, eNoValue, eNoReqStates, END_ENTRY}, {"document", ROLE_DOCUMENT, eNameLabelOrTitle, eNoValue, eNoReqStates, END_ENTRY}, {"label", ROLE_LABEL, eNameOkFromChildren, eNoValue, eNoReqStates, END_ENTRY}, {"list", ROLE_LIST, eNameLabelOrTitle, eNoValue, eNoReqStates, {"readonly", BOOL_STATE, STATE_READONLY}, - {"multiselect", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, + {"multiselectable", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, {"listbox", ROLE_LIST, eNameLabelOrTitle, eNoValue, eNoReqStates, {"readonly", BOOL_STATE, STATE_READONLY}, - {"multiselect", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, + {"multiselectable", BOOL_STATE, STATE_MULTISELECTABLE | STATE_EXTSELECTABLE}, END_ENTRY}, {"listitem", ROLE_LISTITEM, eNameOkFromChildren, eNoValue, eNoReqStates, {"selected", BOOL_STATE, STATE_SELECTED | STATE_SELECTABLE}, {"selected", "false", STATE_SELECTABLE}, diff --git a/mozilla/accessible/src/base/nsDocAccessible.cpp b/mozilla/accessible/src/base/nsDocAccessible.cpp index 20017fdfbc4..7adf543135a 100644 --- a/mozilla/accessible/src/base/nsDocAccessible.cpp +++ b/mozilla/accessible/src/base/nsDocAccessible.cpp @@ -964,12 +964,12 @@ nsDocAccessible::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, else if (aAttribute == nsAccessibilityAtoms::valuenow) { eventType = nsIAccessibleEvent::EVENT_VALUE_CHANGE; } - else if (aAttribute == nsAccessibilityAtoms::multiselect) { + else if (aAttribute == nsAccessibilityAtoms::multiselectable) { // This affects whether the accessible supports nsIAccessibleSelectable. // COM says we cannot change what interfaces are supported on-the-fly, // so invalidate this object. A new one will be created on demand. if (HasRoleAttribute(aContent)) { - // The multiselect and other waistate attributes only take affect + // The multiselectable and other waistate attributes only take affect // when dynamic content role is present InvalidateCacheSubtree(aContent, nsIAccessibleEvent::EVENT_REORDER); }