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

Bug 1304620 part.4 ContentCacheInParent::mCompositionStart should be set to better value for mWidgetHasComposition state r=m_kato

Browse Source 
ContentCacheInParent::mCompositionStart was set to ContentCacheInChild::mCompositionStart without any check.  However, that's clearly wrong approach.  For example, when the remote process handles some composition events after eCompositionCommit(AsIs) in the parent process, mCompositionStart is valid offset even after mWidgetHasComposition is set to false.  Similarly, even after parent process sends eCompositionStart, the remote process may send invalid offset for mCompositionStart due to no composition in it.

For solving this issue, ContentCacheInParent should check mWidgetHasComposition.

If it's true and coming offset is valid, let's use it (even if mPendingCompositionCount is 2 or bigger since widget shouldn't use WidgetQueryContentEvent when there are some pending events).

If the coming offset is invalid but mWidgetHasComposition is false, let's use selection start instead because HandleQueryContentEvent() can work around selection start offset only.

Otherwise, i.e., mWidgetHasComposition is false, we should always set mCompositionStart to invalid offset.

MozReview-Commit-ID: IONU0Cbhpil

--HG--
extra : rebase_source : 05ae9eb0e7a0bb63b65be7a54103eb798274c8ff
This commit is contained in:
Masayuki Nakano 2016-10-12 22:05:09 +09:00
parent 7a5e29e854
commit 610b4b4a2e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
widget/ContentCache.cpp
View File

@ -520,7 +520,6 @@ ContentCacheInParent::AssignContent(const ContentCache& aOther,
nsIWidget* aWidget, nsIWidget* aWidget,
const IMENotification* aNotification) const IMENotification* aNotification)
{ {
mCompositionStart = aOther.mCompositionStart;
mText = aOther.mText; mText = aOther.mText;
mSelection = aOther.mSelection; mSelection = aOther.mSelection;
mFirstCharRect = aOther.mFirstCharRect; mFirstCharRect = aOther.mFirstCharRect;
@ -536,6 +535,23 @@ ContentCacheInParent::AssignContent(const ContentCache& aOther,
IMEStateManager::MaybeStartOffsetUpdatedInChild(aWidget, mCompositionStart); IMEStateManager::MaybeStartOffsetUpdatedInChild(aWidget, mCompositionStart);
} }
// When the widget has composition, we should set mCompositionStart to
// *current* composition start offset. Note that, in strictly speaking,
// widget should not use WidgetQueryContentEvent if there are some pending
// compositions (i.e., when mPendingCompositionCount is 2 or more).
if (mWidgetHasComposition) {
if (aOther.mCompositionStart != UINT32_MAX) {
mCompositionStart = aOther.mCompositionStart;
} else {
mCompositionStart = mSelection.StartOffset();
NS_WARNING_ASSERTION(mCompositionStart != UINT32_MAX,
"mCompositionStart shouldn't be invalid offset when "
"the widget has composition");
}
} else {
mCompositionStart = UINT32_MAX;
}
MOZ_LOG(sContentCacheLog, LogLevel::Info, MOZ_LOG(sContentCacheLog, LogLevel::Info,
("0x%p AssignContent(aNotification=%s), " ("0x%p AssignContent(aNotification=%s), "
"Succeeded, mText.Length()=%u, mSelection={ mAnchor=%u, mFocus=%u, " "Succeeded, mText.Length()=%u, mSelection={ mAnchor=%u, mFocus=%u, "