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 1187566 TSFTextStore::Content should compute mMinTextModified Offset only with the latest composition string and original composition string, and also the hack should be enabled on Win10 r=emk

Browse Source
This commit is contained in:
Masayuki Nakano 2015-08-03 15:15:30 +09:00
parent 51cc6acda9
commit 39d13eccb6
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
widget/windows/TSFTextStore.cpp
View File

@ -1969,8 +1969,11 @@ TSFTextStore::LockedContent()
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::LockedContent(): "
"mLockedContent={ mText.Length()=%d }",
this, mLockedContent.Text().Length()));
"mLockedContent={ mText.Length()=%d, mLastCompositionString=\"%s\", "
"mMinTextModifiedOffset=%u }",
this, mLockedContent.Text().Length(),
NS_ConvertUTF16toUTF8(mLockedContent.LastCompositionString()).get(),
mLockedContent.MinTextModifiedOffset()));
return mLockedContent;
}
@ -3399,7 +3402,9 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
if (mComposition.IsComposing() && mComposition.mStart < acpEnd &&
mLockedContent.IsLayoutChangedAfter(acpEnd)) {
const Selection& currentSel = CurrentSelection();
if (!IsWin10OrLater()) {
if ((sDoNotReturnNoLayoutErrorToGoogleJaInputAtFirstChar ||
sDoNotReturnNoLayoutErrorToGoogleJaInputAtCaret) &&
kSink->IsGoogleJapaneseInputActive()) {
// Google Japanese Input doesn't handle ITfContextView::GetTextExt()
// properly due to the same bug of TSF mentioned above. Google Japanese
// Input calls this twice for the first character of changing range of
@ -3407,10 +3412,9 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// composition string. The formar is used for showing candidate window.
// This is typically shown at wrong position. We should avoid only this
// case. This is not necessary on Windows 10.
if (!mLockedContent.IsLayoutChangedAfter(acpStart) &&
acpStart < acpEnd &&
sDoNotReturnNoLayoutErrorToGoogleJaInputAtFirstChar &&
kSink->IsGoogleJapaneseInputActive()) {
if (sDoNotReturnNoLayoutErrorToGoogleJaInputAtFirstChar &&
!mLockedContent.IsLayoutChangedAfter(acpStart) &&
acpStart < acpEnd) {
acpEnd = acpStart;
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::GetTextExt() hacked the offsets of "
@ -3423,10 +3427,9 @@ TSFTextStore::GetTextExt(TsViewCookie vcView,
// offset of selected clause. However, it's difficult to get where is
// selected clause for now. Instead, we should use the first character
// which is modified. This is useful in most cases.
else if (acpStart == acpEnd &&
currentSel.IsCollapsed() && currentSel.EndOffset() == acpEnd &&
sDoNotReturnNoLayoutErrorToGoogleJaInputAtCaret &&
kSink->IsGoogleJapaneseInputActive()) {
else if (sDoNotReturnNoLayoutErrorToGoogleJaInputAtCaret &&
acpStart == acpEnd &&
currentSel.IsCollapsed() && currentSel.EndOffset() == acpEnd) {
acpEnd = acpStart = mLockedContent.MinOffsetOfLayoutChanged();
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::GetTextExt() hacked the offsets of "
@ -5311,7 +5314,29 @@ TSFTextStore::Content::ReplaceTextWith(LONG aStart,
mComposition.mStart +
FirstDifferentCharOffset(mComposition.mString,
mLastCompositionString);
// The previous change to the composition string is canceled.
if (mMinTextModifiedOffset >=
static_cast<uint32_t>(mComposition.mStart) &&
mMinTextModifiedOffset < firstDifferentOffset) {
mMinTextModifiedOffset = firstDifferentOffset;
}
} else if (mMinTextModifiedOffset >=
static_cast<uint32_t>(mComposition.mStart) &&
mMinTextModifiedOffset <
static_cast<uint32_t>(mComposition.EndOffset())) {
// The previous change to the composition string is canceled.
mMinTextModifiedOffset = firstDifferentOffset =
mComposition.EndOffset();
}
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::Content::ReplaceTextWith(aStart=%d, "
"aLength=%d, aReplaceString=\"%s\"), mComposition={ mStart=%d, "
"mString=\"%s\" }, mLastCompositionString=\"%s\", "
"mMinTextModifiedOffset=%u, firstDifferentOffset=%u",
this, aStart, aLength, NS_ConvertUTF16toUTF8(aReplaceString).get(),
mComposition.mStart, NS_ConvertUTF16toUTF8(mComposition.mString).get(),
NS_ConvertUTF16toUTF8(mLastCompositionString).get(),
mMinTextModifiedOffset, firstDifferentOffset));
} else {
firstDifferentOffset =
static_cast<uint32_t>(aStart) +

12
widget/windows/TSFTextStore.h
View File

@ -621,6 +621,8 @@ protected:
mText = aText;
if (mComposition.IsComposing()) {
mLastCompositionString = mComposition.mString;
} else {
mLastCompositionString.Truncate();
}
mMinTextModifiedOffset = NOT_MODIFIED;
mInitialized = true;
@ -647,6 +649,16 @@ protected:
MOZ_ASSERT(mInitialized);
return mText;
}
const nsString& LastCompositionString() const
{
MOZ_ASSERT(mInitialized);
return mLastCompositionString;
}
uint32_t MinTextModifiedOffset() const
{
MOZ_ASSERT(mInitialized);
return mMinTextModifiedOffset;
}
// Returns true if layout of the character at the aOffset has not been
// calculated.