Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234120 part.1 IMEHandler should request all notifications which are requested by either IMMHander or TSFTextStore when IMM is available in TSF mode r=m_kato

Browse Source
This commit is contained in:
Masayuki Nakano 2015-12-22 14:58:48 +09:00
parent 2fdd9a1152
commit 6c313126b6
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widget/IMEData.h
View File

@ -71,6 +71,11 @@ struct nsIMEUpdatePreference final
{
}
nsIMEUpdatePreference operator|(const nsIMEUpdatePreference& aOther) const
{
return nsIMEUpdatePreference(aOther.mWantUpdates | mWantUpdates);
}
void DontNotifyChangesCausedByComposition()
{
mWantUpdates &= ~DEFAULT_CONDITIONS_OF_NOTIFYING_CHANGES;

11
widget/windows/WinIMEHandler.cpp
View File

@ -334,7 +334,16 @@ IMEHandler::GetUpdatePreference()
#ifdef NS_ENABLE_TSF
if (IsTSFAvailable()) {
return TSFTextStore::GetIMEUpdatePreference();
if (!sIsIMMEnabled) {
return TSFTextStore::GetIMEUpdatePreference();
}
// Even if TSF is available, the active IME may be an IMM-IME.
// Unfortunately, changing the result of GetUpdatePreference() while an
// editor has focus isn't supported by IMEContentObserver nor
// ContentCacheInParent. Therefore, we need to request whole notifications
// which are necessary either IMMHandler or TSFTextStore.
return IMMHandler::GetIMEUpdatePreference() |
TSFTextStore::GetIMEUpdatePreference();
}
#endif //NS_ENABLE_TSF