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 1083067 part.3 Remove nsGtkIMModule::CommitCompositionBy() r=m_kato

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

17
widget/gtk/nsGtkIMModule.cpp
View File

@ -361,7 +361,7 @@ nsGtkIMModule::OnKeyEvent(nsWindow* aCaller, GdkEventKey* aEvent,
// IM. For compromising this issue, we should dispatch
// compositionend event, however, we don't need to reset IM
// actually.
CommitCompositionBy(EmptyString());
DispatchCompositionEventsForCommit(EmptyString());
filterThisEvent = false;
}
} else {
@ -921,20 +921,7 @@ nsGtkIMModule::OnCommitCompositionNative(GtkIMContext *aContext,
}
NS_ConvertUTF8toUTF16 str(commitString);
CommitCompositionBy(str); // Be aware, widget can be gone
}
bool
nsGtkIMModule::CommitCompositionBy(const nsAString& aString)
{
PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
("GtkIMModule(%p): CommitCompositionBy, aString=\"%s\", "
"mDispatchedCompositionString=\"%s\"",
this, NS_ConvertUTF16toUTF8(aString).get(),
NS_ConvertUTF16toUTF8(mDispatchedCompositionString).get()));
// Be aware, widget can be gone
return DispatchCompositionEventsForCommit(aString);
DispatchCompositionEventsForCommit(str); // Be aware, widget can be gone
}
void

4
widget/gtk/nsGtkIMModule.h
View File

@ -303,15 +303,11 @@ protected:
* Following methods dispatch gecko events. Then, the focused widget
* can be destroyed, and also it can be stolen focus. If they returns
* FALSE, callers cannot continue the composition.
* - CommitCompositionBy
* - DispatchCompositionStart
* - DispatchCompositionChangeEvent
* - DispatchCompositionEventsForCommit
*/
// Commits the current composition by the aString.
bool CommitCompositionBy(const nsAString& aString);
/**
* Dispatches a composition start event.
*