mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1369695 Creating ITfInputProcessorProfiles and TSFStaticSink when they are used at first time r=m_kato 

ITfProcessorProfiles are used by a debug method TSFTextStore::CurrentKeyboardLayoutHasIME() and TSFStaticSink (when it's initialized).  However, TSFStaticSink isn't necessary until when TSFTextStore needs to hack something for specific IME or notifying IMEHandler of active TIP change.  So, we can put off to create the instance of ITfInputProcessorProfiles and TSFStaticSink.

MozReview-Commit-ID: KcrqUbqz1do

--HG--
extra : rebase_source : f1821b782c6cd316a8f234a17ee3c92114547041
This commit is contained in:
Masayuki Nakano 2017-06-08 23:55:57 +09:00
Родитель f7f386ac4e
Коммит 24bfe124f4
3 изменённых файлов: 163 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

231
widget/windows/TSFTextStore.cpp
Просмотреть файл

@ -1001,7 +1001,30 @@ public:
static TSFStaticSink* GetInstance()
{
if (!sInstance) {
sInstance = new TSFStaticSink();
RefPtr<ITfThreadMgr> threadMgr = TSFTextStore::GetThreadMgr();
if (NS_WARN_IF(!threadMgr)) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSFStaticSink::GetInstance() FAILED to initialize TSFStaticSink "
"instance due to no ThreadMgr instance"));
return nullptr;
}
RefPtr<ITfInputProcessorProfiles> inputProcessorProfiles =
TSFTextStore::GetInputProcessorProfiles();
if (NS_WARN_IF(!inputProcessorProfiles)) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSFStaticSink::GetInstance() FAILED to initialize TSFStaticSink "
"instance due to no InputProcessorProfiles instance"));
return nullptr;
}
RefPtr<TSFStaticSink> staticSink = new TSFStaticSink();
if (NS_WARN_IF(!staticSink->Init(threadMgr, inputProcessorProfiles))) {
staticSink->Destroy();
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSFStaticSink::GetInstance() FAILED to initialize TSFStaticSink "
"instance"));
return nullptr;
}
sInstance = staticSink.forget();
}
return sInstance;
}
@ -1039,6 +1062,7 @@ public:
static bool IsIMM_IMEActive()
{
// Use IMM API until TSFStaticSink starts to work.
if (!sInstance || !sInstance->EnsureInitActiveTIPKeyboard()) {
return IsIMM_IME(::GetKeyboardLayout(0));
}
@ -1050,8 +1074,56 @@ public:
return (::ImmGetIMEFileNameW(aHKL, nullptr, 0) > 0);
}
bool EnsureInitActiveTIPKeyboard();
#define DECL_AND_IMPL_IS_TIP_ACTIVE(aMethod) \
static bool aMethod() \
{ \
RefPtr<TSFStaticSink> staticSink = GetInstance(); \
if (NS_WARN_IF(!staticSink) || \
NS_WARN_IF(!staticSink->EnsureInitActiveTIPKeyboard())) { \
return false; \
} \
return staticSink->aMethod ## Internal(); \
}
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSJapaneseIMEActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSOfficeJapaneseIME2010Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOKActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2011Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2012Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2013Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2014Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2015Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsATOK2016Active)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSChangJieActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSQuickQuickActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsFreeChangJieActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsEasyChangjeiActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSPinyinActive)
DECL_AND_IMPL_IS_TIP_ACTIVE(IsMSWubiActive)
#undef DECL_AND_IMPL_IS_TIP_ACTIVE
// Note that ATOK 2011 - 2016 refers native caret position for deciding its
// popup window position.
static bool IsATOKReferringNativeCaretActive()
{
RefPtr<TSFStaticSink> staticSink = GetInstance();
if (NS_WARN_IF(!staticSink) ||
NS_WARN_IF(!staticSink->EnsureInitActiveTIPKeyboard())) {
return false;
}
return staticSink->IsATOKActiveInternal() &&
(staticSink->IsATOK2011ActiveInternal() ||
staticSink->IsATOK2012ActiveInternal() ||
staticSink->IsATOK2013ActiveInternal() ||
staticSink->IsATOK2014ActiveInternal() ||
staticSink->IsATOK2015ActiveInternal() ||
staticSink->IsATOK2016ActiveInternal());
}
private:
/****************************************************************************
* Japanese TIP
****************************************************************************/
@ -1060,7 +1132,7 @@ public:
// For example, some TIP may use localized name for its target language
// environment but English name for the others.
bool IsMSJapaneseIMEActive() const
bool IsMSJapaneseIMEActiveInternal() const
{
// FYI: Name of MS-IME for Japanese is same as MS-IME for Korean.
// Therefore, we need to check the langid too.
@ -1074,7 +1146,7 @@ public:
NS_LITERAL_STRING(u"\x5FAE\x8EDF\x8F38\x5165\x6CD5")));
}
bool IsMSOfficeJapaneseIME2010Active() const
bool IsMSOfficeJapaneseIME2010ActiveInternal() const
{
// {54EDCC94-1524-4BB1-9FB7-7BABE4F4CA64}
static const GUID kGUID = {
@ -1084,14 +1156,14 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOKActive() const
bool IsATOKActiveInternal() const
{
// FYI: Name of ATOK includes the release year like "ATOK 2015".
return StringBeginsWith(mActiveTIPKeyboardDescription,
NS_LITERAL_STRING("ATOK "));
}
bool IsATOK2011Active() const
bool IsATOK2011ActiveInternal() const
{
// {F9C24A5C-8A53-499D-9572-93B2FF582115}
static const GUID kGUID = {
@ -1101,7 +1173,7 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOK2012Active() const
bool IsATOK2012ActiveInternal() const
{
// {1DE01562-F445-401B-B6C3-E5B18DB79461}
static const GUID kGUID = {
@ -1111,7 +1183,7 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOK2013Active() const
bool IsATOK2013ActiveInternal() const
{
// {3C4DB511-189A-4168-B6EA-BFD0B4C85615}
static const GUID kGUID = {
@ -1121,7 +1193,7 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOK2014Active() const
bool IsATOK2014ActiveInternal() const
{
// {4EF33B79-6AA9-4271-B4BF-9321C279381B}
static const GUID kGUID = {
@ -1131,7 +1203,7 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOK2015Active() const
bool IsATOK2015ActiveInternal() const
{
// {EAB4DC00-CE2E-483D-A86A-E6B99DA9599A}
static const GUID kGUID = {
@ -1141,7 +1213,7 @@ public:
return mActiveTIPGUID == kGUID;
}
bool IsATOK2016Active() const
bool IsATOK2016ActiveInternal() const
{
// {0B557B4C-5740-4110-A60A-1493FA10BF2B}
static const GUID kGUID = {
@ -1151,20 +1223,11 @@ public:
return mActiveTIPGUID == kGUID;
}
// Note that ATOK 2011 - 2016 refers native caret position for deciding its
// popup window position.
bool IsATOKReferringNativeCaretActive() const
{
return IsATOKActive() &&
(IsATOK2011Active() || IsATOK2012Active() || IsATOK2013Active() ||
IsATOK2014Active() || IsATOK2015Active() || IsATOK2016Active());
}
/****************************************************************************
* Traditional Chinese TIP
****************************************************************************/
bool IsMSChangJieActive() const
bool IsMSChangJieActiveInternal() const
{
return mActiveTIPKeyboardDescription.EqualsLiteral("Microsoft ChangJie") ||
mActiveTIPKeyboardDescription.Equals(
@ -1173,7 +1236,7 @@ public:
NS_LITERAL_STRING(u"\x5FAE\x8EDF\x5009\x9821"));
}
bool IsMSQuickQuickActive() const
bool IsMSQuickQuickActiveInternal() const
{
return mActiveTIPKeyboardDescription.EqualsLiteral("Microsoft Quick") ||
mActiveTIPKeyboardDescription.Equals(
@ -1182,13 +1245,13 @@ public:
NS_LITERAL_STRING(u"\x5FAE\x8EDF\x901F\x6210"));
}
bool IsFreeChangJieActive() const
bool IsFreeChangJieActiveInternal() const
{
// FYI: The TIP name is misspelled...
return mActiveTIPKeyboardDescription.EqualsLiteral("Free CangJie IME 10");
}
bool IsEasyChangjeiActive() const
bool IsEasyChangjeiActiveInternal() const
{
return
mActiveTIPKeyboardDescription.Equals(
@ -1200,7 +1263,7 @@ public:
* Simplified Chinese TIP
****************************************************************************/
bool IsMSPinyinActive() const
bool IsMSPinyinActiveInternal() const
{
return mActiveTIPKeyboardDescription.EqualsLiteral("Microsoft Pinyin") ||
mActiveTIPKeyboardDescription.Equals(
@ -1209,7 +1272,7 @@ public:
NS_LITERAL_STRING(u"\x5FAE\x8EDF\x62FC\x97F3"));
}
bool IsMSWubiActive() const
bool IsMSWubiActiveInternal() const
{
return mActiveTIPKeyboardDescription.EqualsLiteral("Microsoft Wubi") ||
mActiveTIPKeyboardDescription.Equals(
@ -1226,6 +1289,8 @@ private:
TSFStaticSink();
virtual ~TSFStaticSink() {}
bool EnsureInitActiveTIPKeyboard();
void Destroy();
void GetTIPDescription(REFCLSID aTextService, LANGID aLangID,
@ -1563,8 +1628,6 @@ TSFTextStore::Init(nsWindowBase* aWidget,
return false;
}
TSFStaticSink::GetInstance()->EnsureInitActiveTIPKeyboard();
if (mDocumentMgr) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("0x%p TSFTextStore::Init() FAILED due to already initialized",
@ -2293,12 +2356,13 @@ TSFTextStore::QueryInsert(LONG acpTestStart,
// XXX need to adjust to cluster boundary
// Assume we are given good offsets for now
const TSFStaticSink* kSink = TSFStaticSink::GetInstance();
if (IsWin8OrLater() && !mComposition.IsComposing() &&
((sHackQueryInsertForMSTraditionalTIP &&
(kSink->IsMSChangJieActive() || kSink->IsMSQuickQuickActive())) ||
(TSFStaticSink::IsMSChangJieActive() ||
TSFStaticSink::IsMSQuickQuickActive())) ||
(sHackQueryInsertForMSSimplifiedTIP &&
(kSink->IsMSPinyinActive() || kSink->IsMSWubiActive())))) {
(TSFStaticSink::IsMSPinyinActive() ||
TSFStaticSink::IsMSWubiActive())))) {
MOZ_LOG(sTextStoreLog, LogLevel::Warning,
("0x%p TSFTextStore::QueryInsert() WARNING using different "
"result for the TIP", this));
@ -3977,7 +4041,6 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
bool dontReturnNoLayoutError = false;
const TSFStaticSink* kSink = TSFStaticSink::GetInstance();
if (mComposition.IsComposing() && mComposition.mStart < acpEnd &&
mContentForTSF.IsLayoutChangedAt(acpEnd)) {
const Selection& selectionForTSF = SelectionForTSFRef();
@ -3986,7 +4049,7 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// released yet. So, we can hack it without prefs because there must be
// no developers who want to disable this hack for tests.
const bool kIsMSOfficeJapaneseIME2010 =
kSink->IsMSOfficeJapaneseIME2010Active();
TSFStaticSink::IsMSOfficeJapaneseIME2010Active();
// MS IME for Japanese doesn't support asynchronous handling at deciding
// its suggest list window position. The feature was implemented
// starting from Windows 8. And also we may meet same trouble in e10s
@ -3995,7 +4058,7 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
if (kIsMSOfficeJapaneseIME2010 ||
((sDoNotReturnNoLayoutErrorToMSJapaneseIMEAtFirstChar ||
sDoNotReturnNoLayoutErrorToMSJapaneseIMEAtCaret) &&
kSink->IsMSJapaneseIMEActive())) {
TSFStaticSink::IsMSJapaneseIMEActive())) {
// Basically, MS-IME tries to retrieve whole composition string rect
// at deciding suggest window immediately after unlocking the document.
// However, in e10s mode, the content hasn't updated yet in most cases.
@ -4039,8 +4102,8 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// because creating native caret causes ATOK refers caret position
// when GetTextExt() returns TS_E_NOLAYOUT.
else if (sDoNotReturnNoLayoutErrorToATOKOfCompositionString &&
kSink->IsATOKActive() &&
(!kSink->IsATOKReferringNativeCaretActive() ||
TSFStaticSink::IsATOKActive() &&
(!TSFStaticSink::IsATOKReferringNativeCaretActive() ||
!sCreateNativeCaretForLegacyATOK) &&
mComposition.mStart == acpStart &&
mComposition.EndOffset() == acpEnd) {
@ -4051,9 +4114,9 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// TSF. We need to check if this is necessary on Windows 10 before
// disabling this on Windows 10.
else if ((sDoNotReturnNoLayoutErrorToFreeChangJie &&
kSink->IsFreeChangJieActive()) ||
TSFStaticSink::IsFreeChangJieActive()) ||
(sDoNotReturnNoLayoutErrorToEasyChangjei &&
kSink->IsEasyChangjeiActive())) {
TSFStaticSink::IsEasyChangjeiActive())) {
acpEnd = mComposition.mStart;
acpStart = std::min(acpStart, acpEnd);
dontReturnNoLayoutError = true;
@ -4062,11 +4125,11 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// mode on Win8 or later.
else if (IsWin8OrLater() &&
((sDoNotReturnNoLayoutErrorToMSTraditionalTIP &&
(kSink->IsMSChangJieActive() ||
kSink->IsMSQuickQuickActive())) ||
(TSFStaticSink::IsMSChangJieActive() ||
TSFStaticSink::IsMSQuickQuickActive())) ||
(sDoNotReturnNoLayoutErrorToMSSimplifiedTIP &&
(kSink->IsMSPinyinActive() ||
kSink->IsMSWubiActive())))) {
(TSFStaticSink::IsMSPinyinActive() ||
TSFStaticSink::IsMSWubiActive())))) {
acpEnd = mComposition.mStart;
acpStart = std::min(acpStart, acpEnd);
dontReturnNoLayoutError = true;
@ -4216,7 +4279,7 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// position. Therefore, we need to create native caret only when ATOK 2011 -
// 2016 is active.
if (sCreateNativeCaretForLegacyATOK &&
kSink->IsATOKReferringNativeCaretActive() &&
TSFStaticSink::IsATOKReferringNativeCaretActive() &&
mComposition.IsComposing() &&
mComposition.mStart <= acpStart && mComposition.EndOffset() >= acpStart &&
mComposition.mStart <= acpEnd && mComposition.EndOffset() >= acpEnd) {
@ -6013,27 +6076,10 @@ TSFTextStore::Initialize()
return;
}
// XXX MSDN documents that ITfInputProcessorProfiles is available only on
// desktop apps. However, there is no known way to obtain
// ITfInputProcessorProfileMgr instance without ITfInputProcessorProfiles
// instance.
RefPtr<ITfInputProcessorProfiles> inputProcessorProfiles;
HRESULT hr =
::CoCreateInstance(CLSID_TF_InputProcessorProfiles, nullptr,
CLSCTX_INPROC_SERVER,
IID_ITfInputProcessorProfiles,
getter_AddRefs(inputProcessorProfiles));
if (FAILED(hr) || !inputProcessorProfiles) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to create input processor "
"profiles, hr=0x%08X", hr));
return;
}
RefPtr<ITfThreadMgr> threadMgr;
hr = ::CoCreateInstance(CLSID_TF_ThreadMgr, nullptr,
CLSCTX_INPROC_SERVER, IID_ITfThreadMgr,
getter_AddRefs(threadMgr));
HRESULT hr = ::CoCreateInstance(CLSID_TF_ThreadMgr, nullptr,
CLSCTX_INPROC_SERVER, IID_ITfThreadMgr,
getter_AddRefs(threadMgr));
if (FAILED(hr) || !threadMgr) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to "
@ -6092,19 +6138,6 @@ TSFTextStore::Initialize()
MarkContextAsKeyboardDisabled(disabledContext);
MarkContextAsEmpty(disabledContext);
MOZ_LOG(sTextStoreLog, LogLevel::Info,
(" TSFTextStore::Initialize() is creating "
"a TSFStaticSink instance..."));
TSFStaticSink* staticSink = TSFStaticSink::GetInstance();
if (!staticSink->Init(threadMgr, inputProcessorProfiles)) {
TSFStaticSink::Shutdown();
MOZ_LOG(sTextStoreLog, LogLevel::Error,
(" TSFTextStore::Initialize() FAILED to initialize TSFStaticSink "
"instance"));
return;
}
sInputProcessorProfiles = inputProcessorProfiles;
sThreadMgr = threadMgr;
sMessagePump = messagePump;
sKeystrokeMgr = keystrokeMgr;
@ -6165,6 +6198,14 @@ TSFTextStore::Initialize()
GetBoolName(sDoNotReturnNoLayoutErrorToMSJapaneseIMEAtCaret)));
}
// static
already_AddRefed<ITfThreadMgr>
TSFTextStore::GetThreadMgr()
{
RefPtr<ITfThreadMgr> threadMgr = sThreadMgr;
return threadMgr.forget();
}
// static
already_AddRefed<ITfDisplayAttributeMgr>
TSFTextStore::GetDisplayAttributeMgr()
@ -6212,6 +6253,34 @@ TSFTextStore::GetCategoryMgr()
return categoryMgr.forget();
}
// static
already_AddRefed<ITfInputProcessorProfiles>
TSFTextStore::GetInputProcessorProfiles()
{
RefPtr<ITfInputProcessorProfiles> inputProcessorProfiles;
if (sInputProcessorProfiles) {
inputProcessorProfiles = sInputProcessorProfiles;
return inputProcessorProfiles.forget();
}
// XXX MSDN documents that ITfInputProcessorProfiles is available only on
// desktop apps. However, there is no known way to obtain
// ITfInputProcessorProfileMgr instance without ITfInputProcessorProfiles
// instance.
HRESULT hr =
::CoCreateInstance(CLSID_TF_InputProcessorProfiles, nullptr,
CLSCTX_INPROC_SERVER,
IID_ITfInputProcessorProfiles,
getter_AddRefs(inputProcessorProfiles));
if (NS_WARN_IF(FAILED(hr)) || NS_WARN_IF(!inputProcessorProfiles)) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSFTextStore::GetInputProcessorProfiles() FAILED to create input "
"processor profiles, hr=0x%08X", hr));
return nullptr;
}
sInputProcessorProfiles = inputProcessorProfiles;
return inputProcessorProfiles.forget();
}
// static
void
TSFTextStore::Terminate()
@ -6329,7 +6398,7 @@ TSFTextStore::IsIMM_IMEActive()
bool
TSFTextStore::IsMSJapaneseIMEActive()
{
return TSFStaticSink::GetInstance()->IsMSJapaneseIMEActive();
return TSFStaticSink::IsMSJapaneseIMEActive();
}
/******************************************************************/
@ -6648,7 +6717,9 @@ TSFTextStore::MouseTracker::OnMouseButtonEvent(ULONG aEdge,
bool
TSFTextStore::CurrentKeyboardLayoutHasIME()
{
if (!sInputProcessorProfiles) {
RefPtr<ITfInputProcessorProfiles> inputProcessorProfiles =
TSFTextStore::GetInputProcessorProfiles();
if (!inputProcessorProfiles) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSFTextStore::CurrentKeyboardLayoutHasIME() FAILED due to "
"there is no input processor profiles instance"));
@ -6656,8 +6727,8 @@ TSFTextStore::CurrentKeyboardLayoutHasIME()
}
RefPtr<ITfInputProcessorProfileMgr> profileMgr;
HRESULT hr =
sInputProcessorProfiles->QueryInterface(IID_ITfInputProcessorProfileMgr,
getter_AddRefs(profileMgr));
inputProcessorProfiles->QueryInterface(IID_ITfInputProcessorProfileMgr,
getter_AddRefs(profileMgr));
if (FAILED(hr) || !profileMgr) {
// On Windows Vista or later, ImmIsIME() API always returns true.
// If we failed to obtain the profile manager, we cannot know if current

5
widget/windows/TSFTextStore.h
Просмотреть файл

@ -46,6 +46,7 @@ class nsWindow;
namespace mozilla {
namespace widget {
class TSFStaticSink;
struct MSGResult;
/*
@ -56,6 +57,7 @@ class TSFTextStore final : public ITextStoreACP
, public ITfContextOwnerCompositionSink
, public ITfMouseTrackerACP
{
friend class TSFStaticSink;
private:
typedef IMENotification::SelectionChangeDataBase SelectionChangeDataBase;
typedef IMENotification::SelectionChangeData SelectionChangeData;
@ -1002,6 +1004,7 @@ protected:
// TSF thread manager object for the current application
static StaticRefPtr<ITfThreadMgr> sThreadMgr;
static already_AddRefed<ITfThreadMgr> GetThreadMgr();
// sMessagePump is QI'ed from sThreadMgr
static StaticRefPtr<ITfMessagePump> sMessagePump;
// sKeystrokeMgr is QI'ed from sThreadMgr
@ -1024,6 +1027,8 @@ protected:
static StaticRefPtr<ITfContext> sDisabledContext;
static StaticRefPtr<ITfInputProcessorProfiles> sInputProcessorProfiles;
static already_AddRefed<ITfInputProcessorProfiles>
GetInputProcessorProfiles();
// TSF client ID for the current application
static DWORD sClientId;

9
widget/windows/WinIMEHandler.cpp
Просмотреть файл

@ -179,7 +179,7 @@ IMEHandler::ProcessMessage(nsWindow* aWindow, UINT aMessage,
}
// IME isn't implemented with IMM, IMMHandler shouldn't handle any
// messages.
if (!TSFTextStore::IsIMM_IMEActive()) {
if (!IsIMMActive()) {
return false;
}
}
@ -421,7 +421,7 @@ bool
IMEHandler::NeedsToAssociateIMC()
{
if (sAssociateIMCOnlyWhenIMM_IMEActive) {
return TSFTextStore::IsIMM_IMEActive();
return IsIMMActive();
}
// Even if IMC should be associated with focused widget with non-IMM-IME,
@ -556,6 +556,11 @@ IMEHandler::CurrentKeyboardLayoutHasIME()
void
IMEHandler::OnKeyboardLayoutChanged()
{
// Be aware, this method won't be called until TSFStaticSink starts to
// observe active TIP change. If you need to be notified of this, you
// need to create TSFStaticSink::Observe() or something and call it
// TSFStaticSink::EnsureInitActiveTIPKeyboard() forcibly.
if (!sIsIMMEnabled || !IsTSFAvailable()) {
return;
}