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 1203381 part.1 IMEContentObserver shouldn't clear mTextChangeData until immediately before sending a text change notification r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-16 17:48:23 +09:00
parent 6f8a1c50d8
commit 92daa323ce
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dom/events/IMEContentObserver.cpp
View File

@ -195,6 +195,7 @@ IMEContentObserver::IMEContentObserver()
, mIsObserving(false)
, mIMEHasFocus(false)
, mIsFocusEventPending(false)
, mIsTextChangeEventPending(false)
, mIsSelectionChangeEventPending(false)
, mIsPositionChangeEventPending(false)
, mIsFlushingPendingNotifications(false)
@ -1003,22 +1004,16 @@ IMEContentObserver::PostFocusSetNotification()
}
void
IMEContentObserver::PostTextChangeNotification(
const TextChangeDataBase& aTextChangeData)
IMEContentObserver::PostTextChangeNotification()
{
MOZ_LOG(sIMECOLog, LogLevel::Debug,
("IMECO: 0x%p IMEContentObserver::PostTextChangeNotification("
"aTextChangeData=%s)",
this, TextChangeDataToString(aTextChangeData).get()));
mTextChangeData += aTextChangeData;
MOZ_ASSERT(mTextChangeData.IsValid(),
"mTextChangeData must have text change data");
MOZ_LOG(sIMECOLog, LogLevel::Debug,
("IMECO: 0x%p IMEContentObserver::PostTextChangeNotification(), "
"mTextChangeData=%s)",
this, TextChangeDataToString(mTextChangeData).get()));
MOZ_ASSERT(mTextChangeData.IsValid(),
"mTextChangeData must have text change data");
mIsTextChangeEventPending = true;
}
void
@ -1052,7 +1047,8 @@ IMEContentObserver::MaybeNotifyIMEOfTextChange(
"aTextChangeData=%s)",
this, TextChangeDataToString(aTextChangeData).get()));
PostTextChangeNotification(aTextChangeData);
mTextChangeData += aTextChangeData;
PostTextChangeNotification();
FlushMergeableNotifications();
}
@ -1219,11 +1215,12 @@ IMEContentObserver::FlushMergeableNotifications()
return;
}
if (mTextChangeData.IsValid()) {
if (mIsTextChangeEventPending) {
MOZ_LOG(sIMECOLog, LogLevel::Debug,
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
"creating TextChangeEvent...", this));
nsContentUtils::AddScriptRunner(new TextChangeEvent(this, mTextChangeData));
mIsTextChangeEventPending = false;
nsContentUtils::AddScriptRunner(new TextChangeEvent(this));
}
// Be aware, PuppetWidget depends on the order of this. A selection change
@ -1246,7 +1243,7 @@ IMEContentObserver::FlushMergeableNotifications()
}
// If notifications may cause new change, we should notify them now.
if (mTextChangeData.IsValid() ||
if (mIsTextChangeEventPending ||
mIsSelectionChangeEventPending ||
mIsPositionChangeEventPending) {
MOZ_LOG(sIMECOLog, LogLevel::Debug,
@ -1445,17 +1442,19 @@ IMEContentObserver::TextChangeEvent::Run()
MOZ_LOG(sIMECOLog, LogLevel::Debug,
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), retrying to "
"send NOTIFY_IME_OF_TEXT_CHANGE...", this));
mIMEContentObserver->PostTextChangeNotification(mTextChangeData);
mIMEContentObserver->PostTextChangeNotification();
return NS_OK;
}
MOZ_LOG(sIMECOLog, LogLevel::Info,
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), "
"sending NOTIFY_IME_OF_TEXT_CHANGE... mTextChangeData=%s",
this, TextChangeDataToString(mTextChangeData).get()));
"sending NOTIFY_IME_OF_TEXT_CHANGE... mIMEContentObserver={ "
"mTextChangeData=%s }",
this, TextChangeDataToString(mIMEContentObserver->mTextChangeData).get()));
IMENotification notification(NOTIFY_IME_OF_TEXT_CHANGE);
notification.SetData(mTextChangeData);
notification.SetData(mIMEContentObserver->mTextChangeData);
mIMEContentObserver->mTextChangeData.Clear();
IMEStateManager::NotifyIME(notification, mIMEContentObserver->mWidget);
MOZ_LOG(sIMECOLog, LogLevel::Debug,

15
dom/events/IMEContentObserver.h
View File

@ -119,7 +119,7 @@ private:
void PostFocusSetNotification();
void MaybeNotifyIMEOfFocusSet();
void PostTextChangeNotification(const TextChangeDataBase& aTextChangeData);
void PostTextChangeNotification();
void MaybeNotifyIMEOfTextChange(const TextChangeDataBase& aTextChangeData);
void PostSelectionChangeNotification();
void MaybeNotifyIMEOfSelectionChange(bool aCausedByComposition,
@ -141,6 +141,7 @@ private:
void ClearPendingNotifications()
{
mIsFocusEventPending = false;
mIsTextChangeEventPending = false;
mIsSelectionChangeEventPending = false;
mIsPositionChangeEventPending = false;
mTextChangeData.Clear();
@ -237,6 +238,7 @@ private:
bool mIsObserving;
bool mIMEHasFocus;
bool mIsFocusEventPending;
bool mIsTextChangeEventPending;
bool mIsSelectionChangeEventPending;
bool mIsPositionChangeEventPending;
bool mIsFlushingPendingNotifications;
@ -303,19 +305,12 @@ private:
class TextChangeEvent : public AChangeEvent
{
public:
TextChangeEvent(IMEContentObserver* aIMEContentObserver,
TextChangeDataBase& aTextChangeData)
explicit TextChangeEvent(IMEContentObserver* aIMEContentObserver)
: AChangeEvent(eChangeEventType_Text, aIMEContentObserver)
, mTextChangeData(aTextChangeData)
{
MOZ_ASSERT(mTextChangeData.IsValid());
// Reset aTextChangeData because this now consumes the data.
aTextChangeData.Clear();
MOZ_ASSERT(aIMEContentObserver->mTextChangeData.IsValid());
}
NS_IMETHOD Run() override;
private:
TextChangeDataBase mTextChangeData;
};
class PositionChangeEvent final : public AChangeEvent