Bug 1187579 Enable TSF in e10s mode r=m_kato
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 05 Aug 2015 18:37:47 +0900
changeset 287944 6f16a41f231879b3149db607362513889964604e
parent 287943 3ae3c45db961997a182616416097a8c49c6e9742
child 287945 88b05f9375e7129af939098ee817953b9f9c3a9a
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersm_kato
bugs1187579
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1187579 Enable TSF in e10s mode r=m_kato
widget/windows/TSFTextStore.cpp
--- a/widget/windows/TSFTextStore.cpp
+++ b/widget/windows/TSFTextStore.cpp
@@ -5030,18 +5030,17 @@ TSFTextStore::Initialize()
   if (sThreadMgr) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
       ("TSF:   TSFTextStore::Initialize() FAILED due to already initialized"));
     return;
   }
 
   bool enableTsf =
     Preferences::GetBool(kPrefNameForceEnableTSF, false) ||
-    (IsVistaOrLater() && Preferences::GetBool(kPrefNameEnableTSF, false) &&
-     !BrowserTabsRemoteAutostart());
+    (IsVistaOrLater() && Preferences::GetBool(kPrefNameEnableTSF, false));
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
     ("TSF:   TSFTextStore::Initialize(), TSF is %s",
      enableTsf ? "enabled" : "disabled"));
   if (!enableTsf) {
     return;
   }
 
   // XXX MSDN documents that ITfInputProcessorProfiles is available only on