Bug 920377 part.31 Get rid of nsEvent r=roc

Author: masayuki-nakano

content/base/public/Element.h

@@ -781,7 +781,7 @@ class Element : public FragmentOrElement
    */
   using nsIContent::DispatchEvent;
   static nsresult DispatchEvent(nsPresContext* aPresContext,
-                                nsEvent* aEvent,
+                                WidgetEvent* aEvent,
                                 nsIContent* aTarget,
                                 bool aFullDispatch,
                                 nsEventStatus* aStatus);

content/base/public/nsContentUtils.h

@@ -1372,7 +1372,7 @@ class nsContentUtils
    * aDOMEvent->GetInternalNSEvent().
    * XXX Is this necessary?
    */
-  static nsEvent* GetNativeEvent(nsIDOMEvent* aDOMEvent);
+  static mozilla::WidgetEvent* GetNativeEvent(nsIDOMEvent* aDOMEvent);
 
   /**
    * Get the candidates for accelkeys for aDOMKeyEvent.

content/base/src/Element.cpp

@@ -1403,7 +1403,7 @@ Element::IsNodeOfType(uint32_t aFlags) const
 /* static */
 nsresult
 Element::DispatchEvent(nsPresContext* aPresContext,
-                       nsEvent* aEvent,
+                       WidgetEvent* aEvent,
                        nsIContent* aTarget,
                        bool aFullDispatch,
                        nsEventStatus* aStatus)

content/base/src/nsContentUtils.cpp

@@ -4554,7 +4554,7 @@ nsContentUtils::GetLocalizedEllipsis()
 }
 
 //static
-nsEvent*
+WidgetEvent*
 nsContentUtils::GetNativeEvent(nsIDOMEvent* aDOMEvent)
 {
   return aDOMEvent ? aDOMEvent->GetInternalNSEvent() : nullptr;

content/base/src/nsDocument.cpp

@@ -4626,7 +4626,7 @@ nsDocument::DispatchContentLoadedEvents()
         // the ancestor document if we used the normal event
         // dispatching code.
 
-        nsEvent* innerEvent = event->GetInternalNSEvent();
+        WidgetEvent* innerEvent = event->GetInternalNSEvent();
         if (innerEvent) {
           nsEventStatus status = nsEventStatus_eIgnore;
 

content/base/src/nsINode.cpp

@@ -1147,7 +1147,7 @@ nsINode::PostHandleEvent(nsEventChainPostVisitor& /*aVisitor*/)
 }
 
 nsresult
-nsINode::DispatchDOMEvent(nsEvent* aEvent,
+nsINode::DispatchDOMEvent(WidgetEvent* aEvent,
                           nsIDOMEvent* aDOMEvent,
                           nsPresContext* aPresContext,
                           nsEventStatus* aEventStatus)

content/base/src/nsScriptElement.cpp

@@ -15,6 +15,7 @@
 #include "nsGkAtoms.h"
 #include "nsContentSink.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 NS_IMETHODIMP
@@ -58,7 +59,7 @@ nsScriptElement::ScriptEvaluated(nsresult aResult,
 
     nsEventStatus status = nsEventStatus_eIgnore;
     uint32_t type = NS_SUCCEEDED(aResult) ? NS_LOAD : NS_LOAD_ERROR;
-    nsEvent event(true, type);
+    WidgetEvent event(true, type);
     // Load event doesn't bubble.
     event.mFlags.mBubbles = (type != NS_LOAD);
 

content/events/public/nsAsyncDOMEvent.h

@@ -34,7 +34,7 @@ class nsAsyncDOMEvent : public nsRunnable {
     : mEventNode(aEventNode), mEvent(aEvent), mDispatchChromeOnly(false)
   { }
 
-  nsAsyncDOMEvent(nsINode *aEventNode, nsEvent &aEvent);
+  nsAsyncDOMEvent(nsINode* aEventNode, mozilla::WidgetEvent& aEvent);
 
   NS_IMETHOD Run() MOZ_OVERRIDE;
   nsresult PostDOMEvent();

content/events/public/nsEventDispatcher.h

@@ -46,7 +46,7 @@ class EventTarget;
 class nsEventChainVisitor {
 public:
   nsEventChainVisitor(nsPresContext* aPresContext,
-                      nsEvent* aEvent,
+                      mozilla::WidgetEvent* aEvent,
                       nsIDOMEvent* aDOMEvent,
                       nsEventStatus aEventStatus = nsEventStatus_eIgnore)
   : mPresContext(aPresContext), mEvent(aEvent), mDOMEvent(aDOMEvent),
@@ -59,9 +59,9 @@ class nsEventChainVisitor {
   nsPresContext* const  mPresContext;
 
   /**
-   * The nsEvent which is being dispatched. Never nullptr.
+   * The WidgetEvent which is being dispatched. Never nullptr.
    */
-  nsEvent* const        mEvent;
+  mozilla::WidgetEvent* const mEvent;
 
   /**
    * The DOM Event assiciated with the mEvent. Possibly nullptr if a DOM Event
@@ -101,7 +101,7 @@ class nsEventChainVisitor {
 class nsEventChainPreVisitor : public nsEventChainVisitor {
 public:
   nsEventChainPreVisitor(nsPresContext* aPresContext,
-                         nsEvent* aEvent,
+                         mozilla::WidgetEvent* aEvent,
                          nsIDOMEvent* aDOMEvent,
                          nsEventStatus aEventStatus,
                          bool aIsInAnon)
@@ -221,11 +221,11 @@ class nsEventDispatcher
    * If aTargets is non-null, event target chain will be created, but
    * event won't be handled. In this case aEvent->message should be
    * NS_EVENT_NULL.
-   * @note Use this method when dispatching an nsEvent.
+   * @note Use this method when dispatching a WidgetEvent.
    */
   static nsresult Dispatch(nsISupports* aTarget,
                            nsPresContext* aPresContext,
-                           nsEvent* aEvent,
+                           mozilla::WidgetEvent* aEvent,
                            nsIDOMEvent* aDOMEvent = nullptr,
                            nsEventStatus* aEventStatus = nullptr,
                            nsDispatchingCallback* aCallback = nullptr,
@@ -240,7 +240,8 @@ class nsEventDispatcher
    * @note Use this method when dispatching nsIDOMEvent.
    */
   static nsresult DispatchDOMEvent(nsISupports* aTarget,
-                                   nsEvent* aEvent, nsIDOMEvent* aDOMEvent,
+                                   mozilla::WidgetEvent* aEvent,
+                                   nsIDOMEvent* aDOMEvent,
                                    nsPresContext* aPresContext,
                                    nsEventStatus* aEventStatus);
 
@@ -249,7 +250,7 @@ class nsEventDispatcher
    */
   static nsresult CreateEvent(mozilla::dom::EventTarget* aOwner,
                               nsPresContext* aPresContext,
-                              nsEvent* aEvent,
+                              mozilla::WidgetEvent* aEvent,
                               const nsAString& aEventType,
                               nsIDOMEvent** aDOMEvent);
 

content/events/src/SpeechRecognitionError.cpp

@@ -8,7 +8,10 @@
 namespace mozilla {
 namespace dom {
 
-SpeechRecognitionError::SpeechRecognitionError(mozilla::dom::EventTarget* aOwner, nsPresContext* aPresContext, nsEvent* aEvent)
+SpeechRecognitionError::SpeechRecognitionError(
+                          mozilla::dom::EventTarget* aOwner,
+                          nsPresContext* aPresContext,
+                          WidgetEvent* aEvent)
 : nsDOMEvent(aOwner, aPresContext, aEvent),
   mError()
 {}

content/events/src/SpeechRecognitionError.h

@@ -17,7 +17,7 @@ class SpeechRecognitionError : public nsDOMEvent
 public:
   SpeechRecognitionError(mozilla::dom::EventTarget* aOwner,
                          nsPresContext* aPresContext,
-                         nsEvent* aEvent);
+                         WidgetEvent* aEvent);
   virtual ~SpeechRecognitionError();
 
   static already_AddRefed<SpeechRecognitionError>

content/events/src/Touch.cpp

@@ -100,7 +100,7 @@ Touch::Target() const
 }
 
 void
-Touch::InitializePoints(nsPresContext* aPresContext, nsEvent* aEvent)
+Touch::InitializePoints(nsPresContext* aPresContext, WidgetEvent* aEvent)
 {
   if (mPointsInitialized) {
     return;

content/events/src/Touch.h

@@ -48,7 +48,7 @@ class Touch MOZ_FINAL : public nsISupports
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Touch)
 
-  void InitializePoints(nsPresContext* aPresContext, nsEvent* aEvent);
+  void InitializePoints(nsPresContext* aPresContext, WidgetEvent* aEvent);
 
   void SetTarget(mozilla::dom::EventTarget* aTarget);
 

content/events/src/nsAsyncDOMEvent.cpp

@@ -11,9 +11,10 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/dom/EventTarget.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
-nsAsyncDOMEvent::nsAsyncDOMEvent(nsINode *aEventNode, nsEvent &aEvent)
+nsAsyncDOMEvent::nsAsyncDOMEvent(nsINode* aEventNode, WidgetEvent& aEvent)
   : mEventNode(aEventNode), mDispatchChromeOnly(false)
 {
   MOZ_ASSERT(mEventNode);

content/events/src/nsDOMBeforeUnloadEvent.cpp

@@ -5,6 +5,8 @@
 
 #include "nsDOMBeforeUnloadEvent.h"
 
+using namespace mozilla;
+
 NS_IMPL_ADDREF_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent)
 NS_IMPL_RELEASE_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent)
 
@@ -29,7 +31,7 @@ nsDOMBeforeUnloadEvent::GetReturnValue(nsAString& aReturnValue)
 nsresult NS_NewDOMBeforeUnloadEvent(nsIDOMEvent** aInstancePtrResult,
                                     mozilla::dom::EventTarget* aOwner,
                                     nsPresContext* aPresContext,
-                                    nsEvent *aEvent) 
+                                    WidgetEvent* aEvent) 
 {
   nsDOMBeforeUnloadEvent* it =
     new nsDOMBeforeUnloadEvent(aOwner, aPresContext, aEvent);

content/events/src/nsDOMBeforeUnloadEvent.h

@@ -15,7 +15,8 @@ class nsDOMBeforeUnloadEvent : public nsDOMEvent,
 {
 public:
   nsDOMBeforeUnloadEvent(mozilla::dom::EventTarget* aOwner,
-                         nsPresContext* aPresContext, nsEvent* aEvent)
+                         nsPresContext* aPresContext,
+                         mozilla::WidgetEvent* aEvent)
   : nsDOMEvent(aOwner, aPresContext, aEvent)
   {
   }

content/events/src/nsDOMDataContainerEvent.cpp

@@ -7,10 +7,12 @@
 #include "nsContentUtils.h"
 #include "nsIXPConnect.h"
 
+using namespace mozilla;
+
 nsDOMDataContainerEvent::nsDOMDataContainerEvent(
                                              mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,
-                                             nsEvent* aEvent)
+                                             WidgetEvent* aEvent)
   : nsDOMEvent(aOwner, aPresContext, aEvent)
 {
 }
@@ -77,7 +79,7 @@ nsresult
 NS_NewDOMDataContainerEvent(nsIDOMEvent** aInstancePtrResult,
                             mozilla::dom::EventTarget* aOwner,
                             nsPresContext* aPresContext,
-                            nsEvent* aEvent)
+                            WidgetEvent* aEvent)
 {
   nsDOMDataContainerEvent* it =
     new nsDOMDataContainerEvent(aOwner, aPresContext, aEvent);

content/events/src/nsDOMDataContainerEvent.h

@@ -16,7 +16,8 @@ class nsDOMDataContainerEvent : public nsDOMEvent,
 {
 public:
   nsDOMDataContainerEvent(mozilla::dom::EventTarget* aOwner,
-                          nsPresContext* aPresContext, nsEvent* aEvent);
+                          nsPresContext* aPresContext,
+                          mozilla::WidgetEvent* aEvent);
 
   NS_DECL_ISUPPORTS_INHERITED
 

content/events/src/nsDOMDeviceMotionEvent.cpp

@@ -102,7 +102,7 @@ nsresult
 NS_NewDOMDeviceMotionEvent(nsIDOMEvent** aInstancePtrResult,
                            mozilla::dom::EventTarget* aOwner,
                            nsPresContext* aPresContext,
-                           nsEvent *aEvent) 
+                           WidgetEvent* aEvent) 
 {
   NS_ENSURE_ARG_POINTER(aInstancePtrResult);
 

content/events/src/nsDOMDeviceMotionEvent.h

@@ -46,7 +46,8 @@ class nsDOMDeviceMotionEvent MOZ_FINAL : public nsDOMEvent,
 public:
 
   nsDOMDeviceMotionEvent(mozilla::dom::EventTarget* aOwner,
-                         nsPresContext* aPresContext, nsEvent* aEvent)
+                         nsPresContext* aPresContext,
+                         mozilla::WidgetEvent* aEvent)
   : nsDOMEvent(aOwner, aPresContext, aEvent)
   {
   }