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

Bug 1083067 part.2 Remove aIsCommit of nsGtkIMModule::DispatchCompositionChangeEvent() r=m_kato

Browse Source
This commit is contained in:
Masayuki Nakano 2014-11-10 18:07:42 +09:00
parent 1c506a8eb6
commit b680838344
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
widget/gtk/nsGtkIMModule.cpp
View File

@ -787,7 +787,7 @@ nsGtkIMModule::OnChangeCompositionNative(GtkIMContext *aContext)
}
// Be aware, widget can be gone
DispatchCompositionChangeEvent(compositionString, false);
DispatchCompositionChangeEvent(compositionString);
}
/* static */
@ -1035,12 +1035,11 @@ nsGtkIMModule::DispatchCompositionStart()
bool
nsGtkIMModule::DispatchCompositionChangeEvent(
const nsAString &aCompositionString,
bool aIsCommit)
const nsAString& aCompositionString)
{
PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
("GtkIMModule(%p): DispatchCompositionChangeEvent, aIsCommit=%s",
this, aIsCommit ? "TRUE" : "FALSE"));
("GtkIMModule(%p): DispatchCompositionChangeEvent, ",
this));
if (!mLastFocusedWindow) {
PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
@ -1084,16 +1083,12 @@ nsGtkIMModule::DispatchCompositionChangeEvent(
compositionChangeEvent.mData =
mDispatchedCompositionString = aCompositionString;
if (!aIsCommit) {
// NOTE: SetTextRangeList() assumes that mDispatchedCompositionString
// has been updated already.
compositionChangeEvent.mRanges = CreateTextRangeArray();
targetOffset += compositionChangeEvent.mRanges->TargetClauseOffset();
}
// NOTE: CreateTextRangeArray() assumes that mDispatchedCompositionString
// has been updated already.
compositionChangeEvent.mRanges = CreateTextRangeArray();
targetOffset += compositionChangeEvent.mRanges->TargetClauseOffset();
mCompositionState = aIsCommit ?
eCompositionState_CommitCompositionChangeEventDispatched :
eCompositionState_CompositionChangeEventDispatched;
mCompositionState = eCompositionState_CompositionChangeEventDispatched;
mLastFocusedWindow->DispatchEvent(&compositionChangeEvent, status);
if (lastFocusedWindow->IsDestroyed() ||
@ -1616,7 +1611,7 @@ nsGtkIMModule::DeleteText(const int32_t aOffset, const uint32_t aNChars)
nsAutoString compositionString;
GetCompositionString(GetContext(), compositionString);
if (!DispatchCompositionChangeEvent(compositionString, false)) {
if (!DispatchCompositionChangeEvent(compositionString)) {
PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
(" FAILED, restoring composition string"));
return NS_ERROR_FAILURE;

13
widget/gtk/nsGtkIMModule.h
View File

@ -320,11 +320,14 @@ protected:
*/
bool DispatchCompositionStart();
// Dispatches a compositionchange event. If aIsCommit is TRUE, dispatches
// a committed compositionchange event. Otherwise, dispatches a composing
// compositionchange event.
bool DispatchCompositionChangeEvent(const nsAString& aCompositionString,
bool aIsCommit);
/**
* Dispatches a compositionchange event.
*
* @param aCompositionString New composition string.
* @return true if the focused widget is neither
* destroyed nor changed. Otherwise, false.
*/
bool DispatchCompositionChangeEvent(const nsAString& aCompositionString);
/**
* Dispatches a compositionchange event for committing the composition