diff --git a/accessible/src/msaa/nsAccessNodeWrap.cpp b/accessible/src/msaa/nsAccessNodeWrap.cpp index 9c8dc89f21f..5de92ed8339 100644 --- a/accessible/src/msaa/nsAccessNodeWrap.cpp +++ b/accessible/src/msaa/nsAccessNodeWrap.cpp @@ -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 prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID)); - if (prefBranch) { - prefBranch->GetBoolPref("accessibility.disableenumvariant", &gIsEnumVariantSupportDisabled); - } - if (!gmUserLib) { gmUserLib =::LoadLibraryW(L"USER32.DLL"); } diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h index e8abc510dbd..9e3ca448ab9 100644 --- a/accessible/src/msaa/nsAccessNodeWrap.h +++ b/accessible/src/msaa/nsAccessNodeWrap.h @@ -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. diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp index 3b2ff2f92ea..dddee69e4dd 100644 --- a/accessible/src/msaa/nsAccessibleWrap.cpp +++ b/accessible/src/msaa/nsAccessibleWrap.cpp @@ -119,7 +119,7 @@ __try { if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid) *ppv = static_cast(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