Bug 648223 - stop support of accessibility.disableenumvariant pref, r=davidb

This commit is contained in:
Alexander Surkov 2011-05-12 20:37:18 +09:00
Родитель ffe5279729
Коммит 0c0c4b8e57
3 изменённых файлов: 1 добавлений и 9 удалений

Просмотреть файл

@ -67,7 +67,6 @@ LPFNLRESULTFROMOBJECT nsAccessNodeWrap::gmLresultFromObject = NULL;
LPFNNOTIFYWINEVENT nsAccessNodeWrap::gmNotifyWinEvent = nsnull;
LPFNGETGUITHREADINFO nsAccessNodeWrap::gmGetGUIThreadInfo = nsnull;
PRBool nsAccessNodeWrap::gIsEnumVariantSupportDisabled = 0;
// Used to determine whether an IAccessible2 compatible screen reader is loaded.
PRBool nsAccessNodeWrap::gIsIA2Disabled = PR_FALSE;
@ -597,11 +596,6 @@ __try {
void nsAccessNodeWrap::InitAccessibility()
{
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch) {
prefBranch->GetBoolPref("accessibility.disableenumvariant", &gIsEnumVariantSupportDisabled);
}
if (!gmUserLib) {
gmUserLib =::LoadLibraryW(L"USER32.DLL");
}

Просмотреть файл

@ -185,8 +185,6 @@ protected:
*/
ISimpleDOMNode *MakeAccessNode(nsINode *aNode);
static PRBool gIsEnumVariantSupportDisabled;
/**
* Used to determine whether an IAccessible2 compatible screen reader is
* loaded. Currently used for JAWS versions older than 8.0.2173.

Просмотреть файл

@ -119,7 +119,7 @@ __try {
if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid)
*ppv = static_cast<IAccessible*>(this);
else if (IID_IEnumVARIANT == iid && !gIsEnumVariantSupportDisabled) {
else if (IID_IEnumVARIANT == iid) {
long numChildren;
get_accChildCount(&numChildren);
if (numChildren > 0) // Don't support this interface for leaf elements