wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 31297813dd26 (bug 1159327) for bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-04-30 16:08:29 -04:00
parent 83ad8c6d14
commit 384c2b1544
4 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
accessible/windows/msaa/Compatibility.h
View File

@ -39,26 +39,6 @@ public:
*/
static bool IsDolphin() { return !!(sConsumers & DOLPHIN); }
/**
* Return true if we should disable e10s due to a detected
* accessibility client.
*/
static bool IsBlacklistedForE10S()
{
// We currently blacklist everything except UNKNOWN and UIAUTOMATION
return !!(sConsumers &
(NVDA |
JAWS |
OLDJAWS |
WE |
DOLPHIN |
SEROTEK |
COBRA |
ZOOMTEXT |
KAZAGURU |
YOUDAO));
}
private:
Compatibility();
Compatibility(const Compatibility&);

3
browser/components/nsBrowserGlue.js
View File

@ -2811,7 +2811,8 @@ let E10SUINotification = {
// e10s doesn't work with accessibility, so we prompt to disable
// e10s if a11y is enabled, now or in the future.
Services.obs.addObserver(this, "a11y-init-or-shutdown", true);
if (Services.appinfo.accessibilityIsBlacklistedForE10S) {
if (Services.appinfo.accessibilityEnabled &&
!Services.appinfo.accessibilityIsUIA) {
this._showE10sAccessibilityWarning();
}
} else {

16
toolkit/xre/nsAppRunner.cpp
View File

@ -105,7 +105,6 @@
#ifdef ACCESSIBILITY
#include "nsAccessibilityService.h"
#include "mozilla/a11y/Compatibility.h"
#endif
#include "nsCRT.h"
@ -860,20 +859,17 @@ nsXULAppInfo::GetAccessibilityEnabled(bool* aResult)
}
NS_IMETHODIMP
nsXULAppInfo::GetAccessibilityIsBlacklistedForE10S(bool* aResult)
nsXULAppInfo::GetAccessibilityIsUIA(bool* aResult)
{
*aResult = false;
#if defined(ACCESSIBILITY)
#if defined(XP_WIN)
if (GetAccService() && mozilla::a11y::Compatibility::IsBlacklistedForE10S()) {
*aResult = true;
}
#elif defined(XP_MACOSX)
if (GetAccService()) {
#if defined(ACCESSIBILITY) && defined(XP_WIN)
// This is the same check the a11y service does to identify uia clients.
if (GetAccService() != nullptr &&
(::GetModuleHandleW(L"uiautomation") ||
::GetModuleHandleW(L"uiautomationcore"))) {
*aResult = true;
}
#endif
#endif // defined(ACCESSIBILITY)
return NS_OK;
}

6
xpcom/system/nsIXULRuntime.idl
View File

@ -23,7 +23,7 @@ bool BrowserTabsRemoteAutostart();
* stable/frozen, please contact Benjamin Smedberg.
*/
[scriptable, uuid(ce9d05f4-0c20-4f52-87e1-3a425e61e2f3)]
[scriptable, uuid(c4cd11c4-6e8e-49da-85a8-dad3b7605bc3)]
interface nsIXULRuntime : nsISupports
{
/**
@ -97,10 +97,10 @@ interface nsIXULRuntime : nsISupports
readonly attribute boolean accessibilityEnabled;
/**
* Indicates if the active accessibility client is blacklisted for e10s.
* Indicates if the active accessibility client is UIA.
* DO NOT USE! This is temporary and will be removed.
*/
readonly attribute boolean accessibilityIsBlacklistedForE10S;
readonly attribute boolean accessibilityIsUIA;
/**
* Indicates whether the current Firefox build is 64-bit.