Backed out changeset 93fb431c3464 (bug 1121313) for M1,M2 bustage, CLOSED TREE
authorNigel Babu <nigelbabu@gmail.com>
Tue, 17 Feb 2015 10:17:16 +0530
changeset 256545 3cac512f3ec5f33181da20660cc26187a59c3961
parent 256544 9fc9d2e35916ccaadd06c98095808361e7b2ed5a
child 256546 25727d64988754c93ec0856e4a7b268fd66df700
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1121313
milestone38.0a1
backs out93fb431c34649a8b742a4a35c94901c6b4fa5f5b
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 93fb431c3464 (bug 1121313) for M1,M2 bustage, CLOSED TREE
widget/PuppetWidget.cpp
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -397,32 +397,37 @@ PuppetWidget::GetLayerManager(PLayerTran
 nsresult
 PuppetWidget::IMEEndComposition(bool aCancel)
 {
 #ifndef MOZ_CROSS_PROCESS_IME
   return NS_OK;
 #endif
 
   nsEventStatus status;
-  WidgetCompositionEvent compositionCommitEvent(true, NS_COMPOSITION_COMMIT,
+  WidgetCompositionEvent compositionChangeEvent(true, NS_COMPOSITION_CHANGE,
                                                 this);
-  InitEvent(compositionCommitEvent, nullptr);
+  InitEvent(compositionChangeEvent, nullptr);
+  compositionChangeEvent.mSeqno = mIMELastReceivedSeqno;
   // SendEndIMEComposition is always called since ResetInputState
   // should always be called even if we aren't composing something.
   if (!mTabChild ||
       !mTabChild->SendEndIMEComposition(aCancel,
-                                        &compositionCommitEvent.mData)) {
+                                        &compositionChangeEvent.mData)) {
     return NS_ERROR_FAILURE;
   }
 
   if (!mIMEComposing)
     return NS_OK;
 
-  compositionCommitEvent.mSeqno = mIMELastReceivedSeqno;
-  DispatchEvent(&compositionCommitEvent, status);
+  DispatchEvent(&compositionChangeEvent, status);
+
+  WidgetCompositionEvent compositionEndEvent(true, NS_COMPOSITION_END, this);
+  InitEvent(compositionEndEvent, nullptr);
+  compositionEndEvent.mSeqno = mIMELastReceivedSeqno;
+  DispatchEvent(&compositionEndEvent, status);
   return NS_OK;
 }
 
 nsresult
 PuppetWidget::NotifyIMEInternal(const IMENotification& aIMENotification)
 {
   switch (aIMENotification.mMessage) {
     case REQUEST_TO_COMMIT_COMPOSITION: