mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1203381 part.2 Merge all IME notification sending events of IMEContentObserver to a runnable class r=smaug
This commit is contained in:
Masayuki Nakano
parent
92daa323ce
commit
5e02ddc19c
@ -1197,62 +1197,25 @@ IMEContentObserver::FlushMergeableNotifications()
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mIsFocusEventPending && !mIsTextChangeEventPending &&
|
||||
!mIsSelectionChangeEventPending && !mIsPositionChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"FAILED, due to no pending notifications", this));
|
||||
return;
|
||||
}
|
||||
|
||||
AutoRestore<bool> flusing(mIsFlushingPendingNotifications);
|
||||
mIsFlushingPendingNotifications = true;
|
||||
|
||||
// NOTE: Reset each pending flag because sending notification may cause
|
||||
// another change.
|
||||
|
||||
if (mIsFocusEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"creating FocusSetEvent...", this));
|
||||
mIsFocusEventPending = false;
|
||||
nsContentUtils::AddScriptRunner(new FocusSetEvent(this));
|
||||
// This is the first notification to IME. So, we don't need to notify any
|
||||
// more since IME starts to query content after it gets focus.
|
||||
ClearPendingNotifications();
|
||||
return;
|
||||
}
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"creating IMENotificationSender...", this));
|
||||
|
||||
if (mIsTextChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"creating TextChangeEvent...", this));
|
||||
mIsTextChangeEventPending = false;
|
||||
nsContentUtils::AddScriptRunner(new TextChangeEvent(this));
|
||||
}
|
||||
|
||||
// Be aware, PuppetWidget depends on the order of this. A selection change
|
||||
// notification should not be sent before a text change notification because
|
||||
// PuppetWidget shouldn't query new text content every selection change.
|
||||
if (mIsSelectionChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"creating SelectionChangeEvent...", this));
|
||||
mIsSelectionChangeEventPending = false;
|
||||
nsContentUtils::AddScriptRunner(new SelectionChangeEvent(this));
|
||||
}
|
||||
|
||||
if (mIsPositionChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"creating PositionChangeEvent...", this));
|
||||
mIsPositionChangeEventPending = false;
|
||||
nsContentUtils::AddScriptRunner(new PositionChangeEvent(this));
|
||||
}
|
||||
|
||||
// If notifications may cause new change, we should notify them now.
|
||||
if (mIsTextChangeEventPending ||
|
||||
mIsSelectionChangeEventPending ||
|
||||
mIsPositionChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
"posting AsyncMergeableNotificationsFlusher to current thread", this));
|
||||
nsRefPtr<AsyncMergeableNotificationsFlusher> asyncFlusher =
|
||||
new AsyncMergeableNotificationsFlusher(this);
|
||||
NS_DispatchToCurrentThread(asyncFlusher);
|
||||
}
|
||||
nsContentUtils::AddScriptRunner(new IMENotificationSender(this));
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FlushMergeableNotifications(), "
|
||||
@ -1264,7 +1227,8 @@ IMEContentObserver::FlushMergeableNotifications()
|
||||
******************************************************************************/
|
||||
|
||||
bool
|
||||
IMEContentObserver::AChangeEvent::CanNotifyIME() const
|
||||
IMEContentObserver::AChangeEvent::CanNotifyIME(
|
||||
ChangeEventType aChangeEventType) const
|
||||
{
|
||||
if (NS_WARN_IF(!mIMEContentObserver)) {
|
||||
return false;
|
||||
@ -1275,7 +1239,7 @@ IMEContentObserver::AChangeEvent::CanNotifyIME() const
|
||||
return false;
|
||||
}
|
||||
// If setting focus, just check the state.
|
||||
if (mChangeEventType == eChangeEventType_Focus) {
|
||||
if (aChangeEventType == eChangeEventType_Focus) {
|
||||
return !NS_WARN_IF(mIMEContentObserver->mIMEHasFocus);
|
||||
}
|
||||
// If we've not notified IME of focus yet, we shouldn't notify anything.
|
||||
@ -1290,13 +1254,14 @@ IMEContentObserver::AChangeEvent::CanNotifyIME() const
|
||||
}
|
||||
|
||||
bool
|
||||
IMEContentObserver::AChangeEvent::IsSafeToNotifyIME() const
|
||||
IMEContentObserver::AChangeEvent::IsSafeToNotifyIME(
|
||||
ChangeEventType aChangeEventType) const
|
||||
{
|
||||
if (NS_WARN_IF(!nsContentUtils::IsSafeToRunScript())) {
|
||||
return false;
|
||||
}
|
||||
State state = mIMEContentObserver->GetState();
|
||||
if (mChangeEventType == eChangeEventType_Focus) {
|
||||
if (aChangeEventType == eChangeEventType_Focus) {
|
||||
if (NS_WARN_IF(state != eState_Initializing && state != eState_Observing)) {
|
||||
return false;
|
||||
}
|
||||
@ -1307,28 +1272,76 @@ IMEContentObserver::AChangeEvent::IsSafeToNotifyIME() const
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* mozilla::IMEContentObserver::FocusSetEvent
|
||||
* mozilla::IMEContentObserver::IMENotificationSender
|
||||
******************************************************************************/
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
IMEContentObserver::FocusSetEvent::Run()
|
||||
IMEContentObserver::IMENotificationSender::Run()
|
||||
{
|
||||
if (!CanNotifyIME()) {
|
||||
// If IMEContentObserver has already gone, we don't need to notify IME of
|
||||
// focus.
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FocusSetEvent::Run(), FAILED, due to "
|
||||
"impossible to notify IME of focus", this));
|
||||
// NOTE: Reset each pending flag because sending notification may cause
|
||||
// another change.
|
||||
|
||||
if (mIMEContentObserver->mIsFocusEventPending) {
|
||||
mIMEContentObserver->mIsFocusEventPending = false;
|
||||
SendFocusSet();
|
||||
// This is the first notification to IME. So, we don't need to notify
|
||||
// anymore since IME starts to query content after it gets focus.
|
||||
mIMEContentObserver->ClearPendingNotifications();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!IsSafeToNotifyIME()) {
|
||||
if (mIMEContentObserver->mIsTextChangeEventPending) {
|
||||
mIMEContentObserver->mIsTextChangeEventPending = false;
|
||||
SendTextChange();
|
||||
}
|
||||
|
||||
// Be aware, PuppetWidget depends on the order of this. A selection change
|
||||
// notification should not be sent before a text change notification because
|
||||
// PuppetWidget shouldn't query new text content every selection change.
|
||||
if (mIMEContentObserver->mIsSelectionChangeEventPending) {
|
||||
mIMEContentObserver->mIsSelectionChangeEventPending = false;
|
||||
SendSelectionChange();
|
||||
}
|
||||
|
||||
if (mIMEContentObserver->mIsPositionChangeEventPending) {
|
||||
mIMEContentObserver->mIsPositionChangeEventPending = false;
|
||||
SendPositionChange();
|
||||
}
|
||||
|
||||
// If notifications may cause new change, we should notify them now.
|
||||
if (mIMEContentObserver->mIsTextChangeEventPending ||
|
||||
mIMEContentObserver->mIsSelectionChangeEventPending ||
|
||||
mIMEContentObserver->mIsPositionChangeEventPending) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FocusSetEvent::Run(), retrying to "
|
||||
"send NOTIFY_IME_OF_FOCUS...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::Run(), "
|
||||
"posting AsyncMergeableNotificationsFlusher to current thread", this));
|
||||
nsRefPtr<AsyncMergeableNotificationsFlusher> asyncFlusher =
|
||||
new AsyncMergeableNotificationsFlusher(mIMEContentObserver);
|
||||
NS_DispatchToCurrentThread(asyncFlusher);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
IMEContentObserver::IMENotificationSender::SendFocusSet()
|
||||
{
|
||||
if (!CanNotifyIME(eChangeEventType_Focus)) {
|
||||
// If IMEContentObserver has already gone, we don't need to notify IME of
|
||||
// focus.
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendFocusSet(), FAILED, due to impossible to notify IME of focus",
|
||||
this));
|
||||
mIMEContentObserver->ClearPendingNotifications();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsSafeToNotifyIME(eChangeEventType_Focus)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendFocusSet(), retrying to send NOTIFY_IME_OF_FOCUS...", this));
|
||||
mIMEContentObserver->PostFocusSetNotification();
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
mIMEContentObserver->mIMEHasFocus = true;
|
||||
@ -1336,46 +1349,44 @@ IMEContentObserver::FocusSetEvent::Run()
|
||||
mIMEContentObserver->UpdateSelectionCache();
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Info,
|
||||
("IMECO: 0x%p IMEContentObserver::FocusSetEvent::Run(), "
|
||||
"sending NOTIFY_IME_OF_FOCUS...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendFocusSet(), sending NOTIFY_IME_OF_FOCUS...", this));
|
||||
|
||||
IMEStateManager::NotifyIME(IMENotification(NOTIFY_IME_OF_FOCUS),
|
||||
mIMEContentObserver->mWidget);
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::FocusSetEvent::Run(), "
|
||||
"sent NOTIFY_IME_OF_FOCUS", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendFocusSet(), sent NOTIFY_IME_OF_FOCUS", this));
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* mozilla::IMEContentObserver::SelectionChangeEvent
|
||||
******************************************************************************/
|
||||
|
||||
NS_IMETHODIMP
|
||||
IMEContentObserver::SelectionChangeEvent::Run()
|
||||
void
|
||||
IMEContentObserver::IMENotificationSender::SendSelectionChange()
|
||||
{
|
||||
if (!CanNotifyIME()) {
|
||||
if (!CanNotifyIME(eChangeEventType_Selection)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), FAILED, "
|
||||
"due to impossible to notify IME of selection change", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), FAILED, due to impossible to notify IME of "
|
||||
"selection change", this));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsSafeToNotifyIME()) {
|
||||
if (!IsSafeToNotifyIME(eChangeEventType_Selection)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), "
|
||||
"retrying to send NOTIFY_IME_OF_SELECTION_CHANGE...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), retrying to send "
|
||||
"NOTIFY_IME_OF_SELECTION_CHANGE...", this));
|
||||
mIMEContentObserver->PostSelectionChangeNotification();
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
SelectionChangeData lastSelChangeData = mIMEContentObserver->mSelectionData;
|
||||
if (NS_WARN_IF(!mIMEContentObserver->UpdateSelectionCache())) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Error,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), FAILED, "
|
||||
"due to UpdateSelectionCache() failure", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), FAILED, due to UpdateSelectionCache() failure",
|
||||
this));
|
||||
return;
|
||||
}
|
||||
|
||||
// If the IME doesn't want selection change notifications caused by
|
||||
@ -1384,15 +1395,16 @@ IMEContentObserver::SelectionChangeEvent::Run()
|
||||
if (newSelChangeData.mCausedByComposition &&
|
||||
!mIMEContentObserver->
|
||||
mUpdatePreference.WantChangesCausedByComposition()) {
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
// The state may be changed since querying content causes flushing layout.
|
||||
if (!CanNotifyIME()) {
|
||||
if (!CanNotifyIME(eChangeEventType_Selection)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), FAILED, "
|
||||
"due to flushing layout having changed something", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), FAILED, due to flushing layout having changed "
|
||||
"something", this));
|
||||
return;
|
||||
}
|
||||
|
||||
// If the selection isn't changed actually, we shouldn't notify IME of
|
||||
@ -1403,15 +1415,16 @@ IMEContentObserver::SelectionChangeEvent::Run()
|
||||
lastSelChangeData.GetWritingMode() == newSelChangeData.GetWritingMode() &&
|
||||
lastSelChangeData.mReversed == newSelChangeData.mReversed) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), not "
|
||||
"notifying IME of NOTIFY_IME_OF_SELECTION_CHANGE due to not changed "
|
||||
"actually", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), not notifying IME of "
|
||||
"NOTIFY_IME_OF_SELECTION_CHANGE due to not changed actually", this));
|
||||
return;
|
||||
}
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Info,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), "
|
||||
"sending NOTIFY_IME_OF_SELECTION_CHANGE... newSelChangeData=%s",
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), sending NOTIFY_IME_OF_SELECTION_CHANGE... "
|
||||
"newSelChangeData=%s",
|
||||
this, SelectionChangeDataToString(newSelChangeData).get()));
|
||||
|
||||
IMENotification notification(NOTIFY_IME_OF_SELECTION_CHANGE);
|
||||
@ -1419,37 +1432,34 @@ IMEContentObserver::SelectionChangeEvent::Run()
|
||||
IMEStateManager::NotifyIME(notification, mIMEContentObserver->mWidget);
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::SelectionChangeEvent::Run(), "
|
||||
"sent NOTIFY_IME_OF_SELECTION_CHANGE", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendSelectionChange(), sent NOTIFY_IME_OF_SELECTION_CHANGE", this));
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* mozilla::IMEContentObserver::TextChangeEvent
|
||||
******************************************************************************/
|
||||
|
||||
NS_IMETHODIMP
|
||||
IMEContentObserver::TextChangeEvent::Run()
|
||||
void
|
||||
IMEContentObserver::IMENotificationSender::SendTextChange()
|
||||
{
|
||||
if (!CanNotifyIME()) {
|
||||
if (!CanNotifyIME(eChangeEventType_Text)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), FAILED, "
|
||||
"due to impossible to notify IME of text change", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendTextChange(), FAILED, due to impossible to notify IME of text "
|
||||
"change", this));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsSafeToNotifyIME()) {
|
||||
if (!IsSafeToNotifyIME(eChangeEventType_Text)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), retrying to "
|
||||
"send NOTIFY_IME_OF_TEXT_CHANGE...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendTextChange(), retrying to send NOTIFY_IME_OF_TEXT_CHANGE...",
|
||||
this));
|
||||
mIMEContentObserver->PostTextChangeNotification();
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Info,
|
||||
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), "
|
||||
"sending NOTIFY_IME_OF_TEXT_CHANGE... mIMEContentObserver={ "
|
||||
"mTextChangeData=%s }",
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendTextChange(), sending NOTIFY_IME_OF_TEXT_CHANGE... "
|
||||
"mIMEContentObserver={ mTextChangeData=%s }",
|
||||
this, TextChangeDataToString(mIMEContentObserver->mTextChangeData).get()));
|
||||
|
||||
IMENotification notification(NOTIFY_IME_OF_TEXT_CHANGE);
|
||||
@ -1458,44 +1468,40 @@ IMEContentObserver::TextChangeEvent::Run()
|
||||
IMEStateManager::NotifyIME(notification, mIMEContentObserver->mWidget);
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::TextChangeEvent::Run(), "
|
||||
"sent NOTIFY_IME_OF_TEXT_CHANGE", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendTextChange(), sent NOTIFY_IME_OF_TEXT_CHANGE", this));
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* mozilla::IMEContentObserver::PositionChangeEvent
|
||||
******************************************************************************/
|
||||
|
||||
NS_IMETHODIMP
|
||||
IMEContentObserver::PositionChangeEvent::Run()
|
||||
void
|
||||
IMEContentObserver::IMENotificationSender::SendPositionChange()
|
||||
{
|
||||
if (!CanNotifyIME()) {
|
||||
if (!CanNotifyIME(eChangeEventType_Position)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::PositionChangeEvent::Run(), FAILED, "
|
||||
"due to impossible to notify IME of position change", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendPositionChange(), FAILED, due to impossible to notify IME of "
|
||||
"position change", this));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsSafeToNotifyIME()) {
|
||||
if (!IsSafeToNotifyIME(eChangeEventType_Position)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::PositionChangeEvent::Run(), "
|
||||
"retrying to send NOTIFY_IME_OF_POSITION_CHANGE...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendPositionChange(), retrying to send "
|
||||
"NOTIFY_IME_OF_POSITION_CHANGE...", this));
|
||||
mIMEContentObserver->PostPositionChangeNotification();
|
||||
return NS_OK;
|
||||
return;
|
||||
}
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Info,
|
||||
("IMECO: 0x%p IMEContentObserver::PositionChangeEvent::Run(), "
|
||||
"sending NOTIFY_IME_OF_POSITION_CHANGE...", this));
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendPositionChange(), sending NOTIFY_IME_OF_POSITION_CHANGE...", this));
|
||||
|
||||
IMEStateManager::NotifyIME(IMENotification(NOTIFY_IME_OF_POSITION_CHANGE),
|
||||
mIMEContentObserver->mWidget);
|
||||
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::PositionChangeEvent::Run(), "
|
||||
"sent NOTIFY_IME_OF_POSITION_CHANGE", this));
|
||||
return NS_OK;
|
||||
("IMECO: 0x%p IMEContentObserver::IMENotificationSender::"
|
||||
"SendPositionChange(), sent NOTIFY_IME_OF_POSITION_CHANGE", this));
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
@ -1505,7 +1511,7 @@ IMEContentObserver::PositionChangeEvent::Run()
|
||||
NS_IMETHODIMP
|
||||
IMEContentObserver::AsyncMergeableNotificationsFlusher::Run()
|
||||
{
|
||||
if (!CanNotifyIME()) {
|
||||
if (!CanNotifyIME(eChangeEventType_FlushPendingEvents)) {
|
||||
MOZ_LOG(sIMECOLog, LogLevel::Debug,
|
||||
("IMECO: 0x%p IMEContentObserver::AsyncMergeableNotificationsFlusher::"
|
||||
"Run(), FAILED, due to impossible to flush pending notifications",
|
||||
|
||||
@ -260,67 +260,39 @@ private:
|
||||
eChangeEventType_FlushPendingEvents
|
||||
};
|
||||
|
||||
AChangeEvent(ChangeEventType aChangeEventType,
|
||||
IMEContentObserver* aIMEContentObserver)
|
||||
explicit AChangeEvent(IMEContentObserver* aIMEContentObserver)
|
||||
: mIMEContentObserver(aIMEContentObserver)
|
||||
, mChangeEventType(aChangeEventType)
|
||||
{
|
||||
MOZ_ASSERT(mIMEContentObserver);
|
||||
}
|
||||
|
||||
nsRefPtr<IMEContentObserver> mIMEContentObserver;
|
||||
ChangeEventType mChangeEventType;
|
||||
|
||||
/**
|
||||
* CanNotifyIME() checks if mIMEContentObserver can and should notify IME.
|
||||
*/
|
||||
bool CanNotifyIME() const;
|
||||
bool CanNotifyIME(ChangeEventType aChangeEventType) const;
|
||||
|
||||
/**
|
||||
* IsSafeToNotifyIME() checks if it's safe to noitify IME.
|
||||
*/
|
||||
bool IsSafeToNotifyIME() const;
|
||||
bool IsSafeToNotifyIME(ChangeEventType aChangeEventType) const;
|
||||
};
|
||||
|
||||
class FocusSetEvent: public AChangeEvent
|
||||
class IMENotificationSender: public AChangeEvent
|
||||
{
|
||||
public:
|
||||
explicit FocusSetEvent(IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(eChangeEventType_Focus, aIMEContentObserver)
|
||||
explicit IMENotificationSender(IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(aIMEContentObserver)
|
||||
{
|
||||
}
|
||||
NS_IMETHOD Run() override;
|
||||
};
|
||||
|
||||
class SelectionChangeEvent : public AChangeEvent
|
||||
{
|
||||
public:
|
||||
explicit SelectionChangeEvent(IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(eChangeEventType_Selection, aIMEContentObserver)
|
||||
{
|
||||
}
|
||||
NS_IMETHOD Run() override;
|
||||
};
|
||||
|
||||
class TextChangeEvent : public AChangeEvent
|
||||
{
|
||||
public:
|
||||
explicit TextChangeEvent(IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(eChangeEventType_Text, aIMEContentObserver)
|
||||
{
|
||||
MOZ_ASSERT(aIMEContentObserver->mTextChangeData.IsValid());
|
||||
}
|
||||
NS_IMETHOD Run() override;
|
||||
};
|
||||
|
||||
class PositionChangeEvent final : public AChangeEvent
|
||||
{
|
||||
public:
|
||||
explicit PositionChangeEvent(IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(eChangeEventType_Position, aIMEContentObserver)
|
||||
{
|
||||
}
|
||||
NS_IMETHOD Run() override;
|
||||
private:
|
||||
void SendFocusSet();
|
||||
void SendSelectionChange();
|
||||
void SendTextChange();
|
||||
void SendPositionChange();
|
||||
};
|
||||
|
||||
class AsyncMergeableNotificationsFlusher : public AChangeEvent
|
||||
@ -328,7 +300,7 @@ private:
|
||||
public:
|
||||
explicit AsyncMergeableNotificationsFlusher(
|
||||
IMEContentObserver* aIMEContentObserver)
|
||||
: AChangeEvent(eChangeEventType_FlushPendingEvents, aIMEContentObserver)
|
||||
: AChangeEvent(aIMEContentObserver)
|
||||
{
|
||||
}
|
||||
NS_IMETHOD Run() override;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user