Bug 920377 part.22 Get rid of nsCompositionEvent r=roc

masayuki-nakano · masayuki-nakano · commit b809719e9ddc · 2013-10-01T16:23:00.000+09:00
diff --git a/content/events/src/TextComposition.cpp b/content/events/src/TextComposition.cpp
@@ -51,7 +51,7 @@ TextComposition::DispatchEvent(nsGUIEvent* aEvent,
                                nsDispatchingCallback* aCallBack)
 {
   if (aEvent->message == NS_COMPOSITION_UPDATE) {
-    mLastData = static_cast<nsCompositionEvent*>(aEvent)->data;
+    mLastData = static_cast<WidgetCompositionEvent*>(aEvent)->data;
   }
 
   nsEventDispatcher::Dispatch(mNode, mPresContext,
@@ -114,7 +114,7 @@ TextComposition::CompositionEventDispatcher::Run()
   nsEventStatus status = nsEventStatus_eIgnore;
   switch (mEventMessage) {
     case NS_COMPOSITION_START: {
-      nsCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
+      WidgetCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
       nsQueryContentEvent selectedText(true, NS_QUERY_SELECTED_TEXT, mWidget);
       nsContentEventHandler handler(mPresContext);
       handler.OnQuerySelectedText(&selectedText);
@@ -126,7 +126,7 @@ TextComposition::CompositionEventDispatcher::Run()
     }
     case NS_COMPOSITION_UPDATE:
     case NS_COMPOSITION_END: {
-      nsCompositionEvent compEvent(true, mEventMessage, mWidget);
+      WidgetCompositionEvent compEvent(true, mEventMessage, mWidget);
       compEvent.data = mData;
       nsIMEStateManager::DispatchCompositionEvent(mEventTarget, mPresContext,
                                                   &compEvent, &status, nullptr);
diff --git a/content/events/src/nsDOMCompositionEvent.cpp b/content/events/src/nsDOMCompositionEvent.cpp
@@ -8,11 +8,13 @@
 #include "prtime.h"
 #include "mozilla/TextEvents.h"
 
+using namespace mozilla;
+
 nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,
-                                             nsCompositionEvent* aEvent)
+                                             WidgetCompositionEvent* aEvent)
   : nsDOMUIEvent(aOwner, aPresContext, aEvent ? aEvent :
-                 new nsCompositionEvent(false, 0, nullptr))
+                 new WidgetCompositionEvent(false, 0, nullptr))
 {
   NS_ASSERTION(mEvent->eventStructType == NS_COMPOSITION_EVENT,
                "event type mismatch");
@@ -29,14 +31,14 @@ nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
     mEvent->mFlags.mCancelable = false;
   }
 
-  mData = static_cast<nsCompositionEvent*>(mEvent)->data;
+  mData = static_cast<WidgetCompositionEvent*>(mEvent)->data;
   // TODO: Native event should have locale information.
 }
 
 nsDOMCompositionEvent::~nsDOMCompositionEvent()
 {
   if (mEventIsInternal) {
-    delete static_cast<nsCompositionEvent*>(mEvent);
+    delete static_cast<WidgetCompositionEvent*>(mEvent);
     mEvent = nullptr;
   }
 }
@@ -83,7 +85,7 @@ nsresult
 NS_NewDOMCompositionEvent(nsIDOMEvent** aInstancePtrResult,
                           mozilla::dom::EventTarget* aOwner,
                           nsPresContext* aPresContext,
-                          nsCompositionEvent *aEvent)
+                          WidgetCompositionEvent* aEvent)
 {
   nsDOMCompositionEvent* event =
     new nsDOMCompositionEvent(aOwner, aPresContext, aEvent);
diff --git a/content/events/src/nsDOMCompositionEvent.h b/content/events/src/nsDOMCompositionEvent.h
@@ -18,7 +18,7 @@ class nsDOMCompositionEvent : public nsDOMUIEvent,
 public:
   nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                         nsPresContext* aPresContext,
-                        nsCompositionEvent* aEvent);
+                        mozilla::WidgetCompositionEvent* aEvent);
   virtual ~nsDOMCompositionEvent();
 
   NS_DECL_ISUPPORTS_INHERITED
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
@@ -594,10 +594,10 @@ nsDOMEvent::DuplicatePrivateData()
     }
     case NS_COMPOSITION_EVENT:
     {
-      nsCompositionEvent* compositionEvent =
-        new nsCompositionEvent(false, msg, nullptr);
-      nsCompositionEvent* oldCompositionEvent =
-        static_cast<nsCompositionEvent*>(mEvent);
+      WidgetCompositionEvent* compositionEvent =
+        new WidgetCompositionEvent(false, msg, nullptr);
+      WidgetCompositionEvent* oldCompositionEvent =
+        static_cast<WidgetCompositionEvent*>(mEvent);
       compositionEvent->AssignCompositionEventData(*oldCompositionEvent, true);
       newEvent = compositionEvent;
       break;
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
@@ -707,7 +707,7 @@ nsEventDispatcher::CreateEvent(mozilla::dom::EventTarget* aOwner,
     case NS_COMPOSITION_EVENT:
       return NS_NewDOMCompositionEvent(
         aDOMEvent, aOwner,
-        aPresContext, static_cast<nsCompositionEvent*>(aEvent));
+        aPresContext, static_cast<WidgetCompositionEvent*>(aEvent));
     case NS_MOUSE_EVENT:
       return NS_NewDOMMouseEvent(aDOMEvent, aOwner, aPresContext,
                                  static_cast<nsInputEvent*>(aEvent));
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
@@ -1098,8 +1098,8 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     if (aEvent->mFlags.mIsTrusted) {
       // If the event is trusted event, set the selected text to data of
       // composition event.
-      nsCompositionEvent *compositionEvent =
-        static_cast<nsCompositionEvent*>(aEvent);
+      WidgetCompositionEvent *compositionEvent =
+        static_cast<WidgetCompositionEvent*>(aEvent);
       nsQueryContentEvent selectedText(true, NS_QUERY_SELECTED_TEXT,
                                        compositionEvent->widget);
       DoQuerySelectedText(&selectedText);
@@ -1110,8 +1110,8 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
   case NS_COMPOSITION_UPDATE:
   case NS_COMPOSITION_END:
     {
-      nsCompositionEvent *compositionEvent =
-          static_cast<nsCompositionEvent*>(aEvent);
+      WidgetCompositionEvent *compositionEvent =
+          static_cast<WidgetCompositionEvent*>(aEvent);
       if (IsTargetCrossProcess(compositionEvent)) {
         // Will not be handled locally, remote the event
         if (GetCrossProcessTarget()->SendCompositionEvent(*compositionEvent)) {
diff --git a/content/events/src/nsIMEStateManager.cpp b/content/events/src/nsIMEStateManager.cpp
@@ -609,7 +609,7 @@ nsIMEStateManager::NotifyIME(NotificationToIME aNotification,
       }
 
       status = nsEventStatus_eIgnore;
-      nsCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
+      WidgetCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
       endEvent.data = backup.GetLastData();
       endEvent.mFlags.mIsSynthesizedForTests = true;
       widget->DispatchEvent(&endEvent, status);
@@ -622,7 +622,7 @@ nsIMEStateManager::NotifyIME(NotificationToIME aNotification,
 
       nsEventStatus status = nsEventStatus_eIgnore;
       if (!backup.GetLastData().IsEmpty()) {
-        nsCompositionEvent updateEvent(true, NS_COMPOSITION_UPDATE, widget);
+        WidgetCompositionEvent updateEvent(true, NS_COMPOSITION_UPDATE, widget);
         updateEvent.data = backup.GetLastData();
         updateEvent.mFlags.mIsSynthesizedForTests = true;
         widget->DispatchEvent(&updateEvent, status);
@@ -641,7 +641,7 @@ nsIMEStateManager::NotifyIME(NotificationToIME aNotification,
       }
 
       status = nsEventStatus_eIgnore;
-      nsCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
+      WidgetCompositionEvent endEvent(true, NS_COMPOSITION_END, widget);
       endEvent.data = backup.GetLastData();
       endEvent.mFlags.mIsSynthesizedForTests = true;
       widget->DispatchEvent(&endEvent, status);
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
@@ -1824,7 +1824,7 @@ nsDOMWindowUtils::SendCompositionEvent(const nsAString& aType,
     return NS_ERROR_FAILURE;
   }
 
-  nsCompositionEvent compositionEvent(true, msg, widget);
+  WidgetCompositionEvent compositionEvent(true, msg, widget);
   InitEvent(compositionEvent);
   if (msg != NS_COMPOSITION_START) {
     compositionEvent.data = aData;
diff --git a/dom/interfaces/events/nsIDOMEvent.idl b/dom/interfaces/events/nsIDOMEvent.idl
@@ -278,7 +278,7 @@ nsresult
 NS_NewDOMCompositionEvent(nsIDOMEvent** aInstancePtrResult,
                           mozilla::dom::EventTarget* aOwner,
                           nsPresContext* aPresContext,
-                          nsCompositionEvent* aEvent);
+                          mozilla::WidgetCompositionEvent* aEvent);
 nsresult
 NS_NewDOMMutationEvent(nsIDOMEvent** aResult,
                        mozilla::dom::EventTarget* aOwner,
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
@@ -36,7 +36,7 @@ using mozilla::layout::ScrollingBehavior;
 using mozilla::void_t;
 using mozilla::WindowsHandle;
 using nscolor;
-using nsCompositionEvent;
+using mozilla::WidgetCompositionEvent;
 using nsIMEUpdatePreference;
 using nsIntPoint;
 using nsIntRect;
@@ -381,7 +381,7 @@ child:
              int32_t aModifiers,
              bool aPreventDefault);
 
-    CompositionEvent(nsCompositionEvent event);
+    CompositionEvent(WidgetCompositionEvent event);
 
     TextEvent(WidgetTextEvent event);
 
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
@@ -1882,9 +1882,9 @@ TabChild::RecvKeyEvent(const nsString& aType,
 }
 
 bool
-TabChild::RecvCompositionEvent(const nsCompositionEvent& event)
+TabChild::RecvCompositionEvent(const WidgetCompositionEvent& event)
 {
-  nsCompositionEvent localEvent(event);
+  WidgetCompositionEvent localEvent(event);
   DispatchWidgetEvent(localEvent);
   return true;
 }
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
@@ -225,7 +225,7 @@ class TabChild : public PBrowserChild,
                               const int32_t&  aCharCode,
                               const int32_t&  aModifiers,
                               const bool&     aPreventDefault);
-    virtual bool RecvCompositionEvent(const nsCompositionEvent& event);
+    virtual bool RecvCompositionEvent(const mozilla::WidgetCompositionEvent& event);
     virtual bool RecvTextEvent(const mozilla::WidgetTextEvent& event);
     virtual bool RecvSelectionEvent(const nsSelectionEvent& event);
     virtual bool RecvActivateFrameEvent(const nsString& aType, const bool& capture);
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
@@ -985,7 +985,7 @@ TabParent::HandleQueryContentEvent(nsQueryContentEvent& aEvent)
 }
 
 bool
-TabParent::SendCompositionEvent(nsCompositionEvent& event)
+TabParent::SendCompositionEvent(WidgetCompositionEvent& event)
 {
   if (mIsDestroyed) {
     return false;
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
@@ -225,7 +225,7 @@ class TabParent : public PBrowserParent
 
     static TabParent *GetIMETabParent() { return mIMETabParent; }
     bool HandleQueryContentEvent(nsQueryContentEvent& aEvent);
-    bool SendCompositionEvent(nsCompositionEvent& event);
+    bool SendCompositionEvent(mozilla::WidgetCompositionEvent& event);
     bool SendTextEvent(mozilla::WidgetTextEvent& event);
     bool SendSelectionEvent(nsSelectionEvent& event);
 
diff --git a/widget/EventForwards.h b/widget/EventForwards.h
@@ -107,7 +107,6 @@ typedef mozilla::WidgetEvent               nsEvent;
 typedef mozilla::WidgetGUIEvent            nsGUIEvent;
 typedef mozilla::WidgetInputEvent          nsInputEvent;
 typedef mozilla::InternalUIEvent           nsUIEvent;
-typedef mozilla::WidgetCompositionEvent    nsCompositionEvent;
 typedef mozilla::WidgetQueryContentEvent   nsQueryContentEvent;
 typedef mozilla::WidgetSelectionEvent      nsSelectionEvent;
 typedef mozilla::WidgetMouseEventBase      nsMouseEvent_base;
diff --git a/widget/TextEvents.h b/widget/TextEvents.h
@@ -534,7 +534,6 @@ class WidgetSelectionEvent : public WidgetGUIEvent
 } // namespace mozilla
 
 // TODO: Remove following typedefs
-typedef mozilla::WidgetCompositionEvent  nsCompositionEvent;
 typedef mozilla::WidgetQueryContentEvent nsQueryContentEvent;
 typedef mozilla::WidgetSelectionEvent    nsSelectionEvent;
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
@@ -1822,7 +1822,7 @@ nsWindow::RemoveIMEComposition()
     textEvent.theText = mIMEComposingText;
     DispatchEvent(&textEvent);
 
-    nsCompositionEvent event(true, NS_COMPOSITION_END, this);
+    WidgetCompositionEvent event(true, NS_COMPOSITION_END, this);
     InitEvent(event, nullptr);
     DispatchEvent(&event);
 }
@@ -1923,7 +1923,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
             }
 
             {
-                nsCompositionEvent event(true, NS_COMPOSITION_START, this);
+                WidgetCompositionEvent event(true, NS_COMPOSITION_START, this);
                 InitEvent(event, nullptr);
                 DispatchEvent(&event);
             }
@@ -1934,7 +1934,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
                 DispatchEvent(&event);
             }
             {
-                nsCompositionEvent event(true, NS_COMPOSITION_END, this);
+                WidgetCompositionEvent event(true, NS_COMPOSITION_END, this);
                 InitEvent(event, nullptr);
                 event.data = ae->Characters();
                 DispatchEvent(&event);
@@ -2036,16 +2036,16 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
                 event.theText = queryEvent.mReply.mString;
             }
             {
-                nsCompositionEvent event(true, NS_COMPOSITION_START, this);
+                WidgetCompositionEvent event(true, NS_COMPOSITION_START, this);
                 InitEvent(event, nullptr);
                 DispatchEvent(&event);
             }
 
             if (mIMEComposing &&
                 event.theText != mIMEComposingText) {
-                nsCompositionEvent compositionUpdate(true,
-                                                     NS_COMPOSITION_UPDATE,
-                                                     this);
+                WidgetCompositionEvent compositionUpdate(true,
+                                                         NS_COMPOSITION_UPDATE,
+                                                         this);
                 InitEvent(compositionUpdate, nullptr);
                 compositionUpdate.data = event.theText;
                 DispatchEvent(&compositionUpdate);
@@ -2131,7 +2131,8 @@ nsWindow::NotifyIME(NotificationToIME aNotification)
                 InitEvent(textEvent, nullptr);
                 DispatchEvent(&textEvent);
 
-                nsCompositionEvent compEvent(true, NS_COMPOSITION_END, this);
+                WidgetCompositionEvent compEvent(true, NS_COMPOSITION_END,
+                                                 this);
                 InitEvent(compEvent, nullptr);
                 DispatchEvent(&compEvent);
             }
diff --git a/widget/cocoa/TextInputHandler.h b/widget/cocoa/TextInputHandler.h
@@ -1081,7 +1081,7 @@ class IMEInputHandler : public PluginTextInputHandler
    * @param aCompositionEvent     A composition event which you want to
    *                              initialize.
    */
-  void InitCompositionEvent(nsCompositionEvent& aCompositionEvent);
+  void InitCompositionEvent(WidgetCompositionEvent& aCompositionEvent);
 
   /**
    * When a composition starts, OnStartIMEComposition() is called.
diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm
@@ -2640,8 +2640,8 @@ WidgetContentCommandEvent deleteCommandEvent(true,
   textEvent.rangeCount = textRanges.Length();
 
   if (textEvent.theText != mLastDispatchedCompositionString) {
-    nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
-                                         mWidget);
+    WidgetCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
+                                             mWidget);
     compositionUpdate.time = textEvent.time;
     compositionUpdate.data = textEvent.theText;
     mLastDispatchedCompositionString = textEvent.theText;
@@ -2661,7 +2661,7 @@ nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
 }
 
 void
-IMEInputHandler::InitCompositionEvent(nsCompositionEvent& aCompositionEvent)
+IMEInputHandler::InitCompositionEvent(WidgetCompositionEvent& aCompositionEvent)
 {
   aCompositionEvent.time = PR_IntervalNow();
 }
@@ -2727,7 +2727,7 @@ nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
 
     // XXXmnakano Probably, we shouldn't emulate composition in this case.
     // I think that we should just fire DOM3 textInput event if we implement it.
-    nsCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
+    WidgetCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
     InitCompositionEvent(compStart);
 
     DispatchEvent(compStart);
@@ -2752,7 +2752,7 @@ nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
 
   OnUpdateIMEComposition([aAttrString string]);
 
-  nsCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
+  WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
   InitCompositionEvent(compEnd);
   compEnd.data = mLastDispatchedCompositionString;
   DispatchEvent(compEnd);
@@ -2834,7 +2834,7 @@ nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
 
     mMarkedRange.location = SelectedRange().location;
 
-    nsCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
+    WidgetCompositionEvent compStart(true, NS_COMPOSITION_START, mWidget);
     InitCompositionEvent(compStart);
 
     DispatchEvent(compStart);
@@ -2861,7 +2861,7 @@ nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
     }
 
     if (doCommit) {
-      nsCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
+      WidgetCompositionEvent compEnd(true, NS_COMPOSITION_END, mWidget);
       InitCompositionEvent(compEnd);
       compEnd.data = mLastDispatchedCompositionString;
       DispatchEvent(compEnd);
diff --git a/widget/gtk/nsGtkIMModule.cpp b/widget/gtk/nsGtkIMModule.cpp
@@ -974,8 +974,8 @@ nsGtkIMModule::DispatchCompositionStart()
     PR_LOG(gGtkIMLog, PR_LOG_ALWAYS,
         ("    mCompositionStart=%u", mCompositionStart));
     mCompositionState = eCompositionState_CompositionStartDispatched;
-    nsCompositionEvent compEvent(true, NS_COMPOSITION_START,
-                                 mLastFocusedWindow);
+    WidgetCompositionEvent compEvent(true, NS_COMPOSITION_START,
+                                     mLastFocusedWindow);
     InitEvent(compEvent);
     nsCOMPtr<nsIWidget> kungFuDeathGrip = mLastFocusedWindow;
     mLastFocusedWindow->DispatchEvent(&compEvent, status);
@@ -1010,8 +1010,8 @@ nsGtkIMModule::DispatchCompositionEnd()
         return false;
     }
 
-    nsCompositionEvent compEvent(true, NS_COMPOSITION_END,
-                                 mLastFocusedWindow);
+    WidgetCompositionEvent compEvent(true, NS_COMPOSITION_END,
+                                     mLastFocusedWindow);
     InitEvent(compEvent);
     compEvent.data = mDispatchedCompositionString;
     nsEventStatus status;
@@ -1057,8 +1057,8 @@ nsGtkIMModule::DispatchTextEvent(const nsAString &aCompositionString,
     nsRefPtr<nsWindow> lastFocusedWindow = mLastFocusedWindow;
 
     if (aCompositionString != mDispatchedCompositionString) {
-      nsCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
-                                           mLastFocusedWindow);
+      WidgetCompositionEvent compositionUpdate(true, NS_COMPOSITION_UPDATE,
+                                               mLastFocusedWindow);
       InitEvent(compositionUpdate);
       compositionUpdate.data = aCompositionString;
       mDispatchedCompositionString = aCompositionString;
diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
diff --git a/widget/os2/nsWindow.cpp b/widget/os2/nsWindow.cpp
diff --git a/widget/qt/mozqwidget.cpp b/widget/qt/mozqwidget.cpp
diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
diff --git a/widget/windows/nsIMM32Handler.cpp b/widget/windows/nsIMM32Handler.cpp
diff --git a/widget/windows/nsTextStore.cpp b/widget/windows/nsTextStore.cpp
diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,13 @@`
`8`	`8`	`#include "prtime.h"`
`9`	`9`	`#include "mozilla/TextEvents.h"`
`10`	`10`
	`11`	`+using namespace mozilla;`
	`12`	`+`
`11`	`13`	`nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,`
`12`	`14`	`nsPresContext* aPresContext,`
`13`		`- nsCompositionEvent* aEvent)`
	`15`	`+ WidgetCompositionEvent* aEvent)`
`14`	`16`	`: nsDOMUIEvent(aOwner, aPresContext, aEvent ? aEvent :`
`15`		`- new nsCompositionEvent(false, 0, nullptr))`
	`17`	`+ new WidgetCompositionEvent(false, 0, nullptr))`
`16`	`18`	`{`
`17`	`19`	`NS_ASSERTION(mEvent->eventStructType == NS_COMPOSITION_EVENT,`
`18`	`20`	`"event type mismatch");`
`@@ -29,14 +31,14 @@ nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,`
`29`	`31`	`mEvent->mFlags.mCancelable = false;`
`30`	`32`	`}`
`31`	`33`
`32`		`- mData = static_cast<nsCompositionEvent*>(mEvent)->data;`
	`34`	`+ mData = static_cast<WidgetCompositionEvent*>(mEvent)->data;`
`33`	`35`	`// TODO: Native event should have locale information.`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`nsDOMCompositionEvent::~nsDOMCompositionEvent()`
`37`	`39`	`{`
`38`	`40`	`if (mEventIsInternal) {`
`39`		`- delete static_cast<nsCompositionEvent*>(mEvent);`
	`41`	`+ delete static_cast<WidgetCompositionEvent*>(mEvent);`
`40`	`42`	`mEvent = nullptr;`
`41`	`43`	`}`
`42`	`44`	`}`
`@@ -83,7 +85,7 @@ nsresult`
`83`	`85`	`NS_NewDOMCompositionEvent(nsIDOMEvent** aInstancePtrResult,`
`84`	`86`	`mozilla::dom::EventTarget* aOwner,`
`85`	`87`	`nsPresContext* aPresContext,`
`86`		`- nsCompositionEvent *aEvent)`
	`88`	`+ WidgetCompositionEvent* aEvent)`
`87`	`89`	`{`
`88`	`90`	`nsDOMCompositionEvent* event =`
`89`	`91`	`new nsDOMCompositionEvent(aOwner, aPresContext, aEvent);`
Original file line number	Diff line number	Diff line change
`@@ -1824,7 +1824,7 @@ nsDOMWindowUtils::SendCompositionEvent(const nsAString& aType,`
`1824`	`1824`	`return NS_ERROR_FAILURE;`
`1825`	`1825`	`}`
`1826`	`1826`
`1827`		`- nsCompositionEvent compositionEvent(true, msg, widget);`
	`1827`	`+ WidgetCompositionEvent compositionEvent(true, msg, widget);`
`1828`	`1828`	`InitEvent(compositionEvent);`
`1829`	`1829`	`if (msg != NS_COMPOSITION_START) {`
`1830`	`1830`	`compositionEvent.data = aData;`