corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1121313 - Part 1. Replace NS_COMPOSITION_CHANGE with NS_COMPOSITION_COMMIT. r=masayuki

Browse Source
This commit is contained in:
Makoto Kato
2015-02-17 11:30:38 +09:00
parent 5331311d19
commit e3a4865caa
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
widget/PuppetWidget.cpp
View File

@@ -402,27 +402,22 @@ PuppetWidget::IMEEndComposition(bool aCancel)
#endif #endif
nsEventStatus status; nsEventStatus status;
WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE, WidgetCompositionEvent compositionCommitEvent(true, NS_COMPOSITION_COMMIT,
this); this);
InitEvent(compositionChangeEvent, nullptr); InitEvent(compositionCommitEvent, nullptr);
compositionChangeEvent.mSeqno = mIMELastReceivedSeqno;
// SendEndIMEComposition is always called since ResetInputState // SendEndIMEComposition is always called since ResetInputState
// should always be called even if we aren't composing something. // should always be called even if we aren't composing something.
if (!mTabChild || if (!mTabChild ||
!mTabChild->SendEndIMEComposition(aCancel, !mTabChild->SendEndIMEComposition(aCancel,
&compositionChangeEvent.mData)) { &compositionCommitEvent.mData)) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
if (!mIMEComposing) if (!mIMEComposing)
return NS_OK; return NS_OK;
DispatchEvent(&compositionChangeEvent, status); compositionCommitEvent.mSeqno = mIMELastReceivedSeqno;
DispatchEvent(&compositionCommitEvent, status);
WidgetCompositionEvent compositionEndEvent(true, NS_COMPOSITION_END, this);
InitEvent(compositionEndEvent, nullptr);
compositionEndEvent.mSeqno = mIMELastReceivedSeqno;
DispatchEvent(&compositionEndEvent, status);
return NS_OK; return NS_OK;
} }