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

Bug 1147722 - Part 1. Turn off TSF when e10s auto start is enabled. r=masayuki,wmccloskey

Browse Source
This commit is contained in:
Makoto Kato 2015-03-30 11:58:03 +09:00
parent 4403f8ced9
commit 808fee6663
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/nsBrowserGlue.js
View File

@ -2848,7 +2848,6 @@ let E10SUINotification = {
if (!Services.appinfo.inSafeMode &&
!Services.appinfo.accessibilityEnabled &&
!Services.appinfo.keyboardMayHaveIME &&
isHardwareAccelerated &&
e10sPromptShownCount < 5) {
Services.tm.mainThread.dispatch(() => {

5
toolkit/xre/nsAppRunner.cpp
View File

@ -4657,16 +4657,11 @@ mozilla::BrowserTabsRemoteAutostart()
// Nightly builds, update gBrowserTabsRemoteAutostart based on all the
// e10s remote relayed prefs we watch.
bool disabledForA11y = Preferences::GetBool("browser.tabs.remote.autostart.disabled-because-using-a11y", false);
// Only disable for IME for the automatic pref, not the opt-in one.
bool disabledForIME = trialPref && KeyboardMayHaveIME();
if (prefEnabled) {
if (gSafeMode) {
LogE10sBlockedReason("Safe mode");
} else if (disabledForA11y) {
LogE10sBlockedReason("An accessibility tool is or was active. See bug 1115956.");
} else if (disabledForIME) {
LogE10sBlockedReason("The keyboard being used has activated IME");
} else {
gBrowserTabsRemoteAutostart = true;
}

4
widget/windows/nsTextStore.cpp
View File

@ -18,6 +18,7 @@
#include "mozilla/Preferences.h"
#include "mozilla/TextEvents.h"
#include "mozilla/WindowsVersion.h"
#include "nsIXULRuntime.h"
#define INPUTSCOPE_INIT_GUID
#define TEXTATTRS_INIT_GUID
@ -4623,7 +4624,8 @@ nsTextStore::Initialize()
bool enableTsf =
Preferences::GetBool(kPrefNameForceEnableTSF, false) ||
(IsVistaOrLater() && Preferences::GetBool(kPrefNameEnableTSF, false));
(IsVistaOrLater() && Preferences::GetBool(kPrefNameEnableTSF, false) &&
!BrowserTabsRemoteAutostart());
PR_LOG(sTextStoreLog, PR_LOG_ALWAYS,
("TSF: nsTextStore::Initialize(), TSF is %s",
enableTsf ? "enabled" : "disabled"));