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 299603 part.8 Rename aLastDispatchedData with aCompositionString in IMContextWrapper::CreateTextRangeArray() r=m_kato

Browse Source
This commit is contained in:
Masayuki Nakano 2015-08-19 16:37:39 +09:00
parent fed80aad8b
commit 580a61e26e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/gtk/IMContextWrapper.cpp
View File

@ -1471,13 +1471,13 @@ IMContextWrapper::DispatchCompositionCommitEvent(
already_AddRefed<TextRangeArray>
IMContextWrapper::CreateTextRangeArray(GtkIMContext* aContext,
const nsAString& aLastDispatchedData)
const nsAString& aCompositionString)
{
MOZ_LOG(gGtkIMLog, LogLevel::Info,
("GTKIM: %p CreateTextRangeArray(aContext=%p, "
"aLastDispatchedData=\"%s\" (Length()=%u))",
this, aContext, NS_ConvertUTF16toUTF8(aLastDispatchedData).get(),
aLastDispatchedData.Length()));
"aCompositionString=\"%s\" (Length()=%u))",
this, aContext, NS_ConvertUTF16toUTF8(aCompositionString).get(),
aCompositionString.Length()));
nsRefPtr<TextRangeArray> textRangeArray = new TextRangeArray();
@ -1499,7 +1499,7 @@ IMContextWrapper::CreateTextRangeArray(GtkIMContext* aContext,
// Convert caret offset from offset in characters to offset in UTF-16
// string. If we couldn't proper offset in UTF-16 string, we should
// assume that the caret is at the end of the composition string.
uint32_t caretOffsetInUTF16 = aLastDispatchedData.Length();
uint32_t caretOffsetInUTF16 = aCompositionString.Length();
if (NS_WARN_IF(cursor_pos_in_chars < 0)) {
// Note that this case is undocumented. We should assume that the
// caret is at the end of the composition string.
@ -1527,7 +1527,7 @@ IMContextWrapper::CreateTextRangeArray(GtkIMContext* aContext,
this, cursor_pos_in_chars, caretOffset));
} else {
caretOffsetInUTF16 = static_cast<uint32_t>(caretOffset);
uint32_t compositionStringLength = aLastDispatchedData.Length();
uint32_t compositionStringLength = aCompositionString.Length();
if (NS_WARN_IF(caretOffsetInUTF16 > compositionStringLength)) {
MOZ_LOG(gGtkIMLog, LogLevel::Warning,
("GTKIM: %p CreateTextRangeArray(), WARNING, "

7
widget/gtk/IMContextWrapper.h
View File

@ -345,13 +345,12 @@ protected:
* Generates our text range array from current composition string.
*
* @param aContext A GtkIMContext which is being handled.
* @param aLastDispatchedData The data of the last compositionchange event
* of current composition. This should be
* mDispatchedCompositionString.
* @param aCompositionString The data to be dispatched with
* compositionchange event.
*/
already_AddRefed<TextRangeArray>
CreateTextRangeArray(GtkIMContext* aContext,
const nsAString& aLastDispatchedData);
const nsAString& aCompositionString);
/**
* SetTextRange() initializes aTextRange with aPangoAttrIter.