Bug 983049 part.4 Rename nsDispatchingCallback to mozilla::EventDispatchingCallback r=smaug

dom/events/IMEStateManager.cpp

@@ -29,6 +29,7 @@
 #include "nsISelection.h"
 #include "nsISupports.h"
 #include "nsPresContext.h"
+#include "nsEventDispatcher.h"
 
 namespace mozilla {
 
@@ -500,7 +501,7 @@ IMEStateManager::DispatchCompositionEvent(nsINode* aEventTargetNode,
                                           nsPresContext* aPresContext,
                                           WidgetEvent* aEvent,
                                           nsEventStatus* aStatus,
-                                          nsDispatchingCallback* aCallBack)
+                                          EventDispatchingCallback* aCallBack)
 {
   MOZ_ASSERT(aEvent->eventStructType == NS_COMPOSITION_EVENT ||
              aEvent->eventStructType == NS_TEXT_EVENT);

dom/events/IMEStateManager.h

@@ -9,7 +9,6 @@
 #include "mozilla/EventForwards.h"
 #include "nsIWidget.h"
 
-class nsDispatchingCallback;
 class nsIContent;
 class nsIDOMMouseEvent;
 class nsINode;
@@ -19,6 +18,7 @@ class nsISelection;
 
 namespace mozilla {
 
+class EventDispatchingCallback;
 class IMEContentObserver;
 class TextCompositionArray;
 class TextComposition;
@@ -94,7 +94,7 @@ public:
                                        nsPresContext* aPresContext,
                                        WidgetEvent* aEvent,
                                        nsEventStatus* aStatus,
-                                       nsDispatchingCallback* aCallBack);
+                                       EventDispatchingCallback* aCallBack);
 
   /**
    * Get TextComposition from widget.

dom/events/TextComposition.cpp

@@ -56,7 +56,7 @@ TextComposition::MatchesNativeContext(nsIWidget* aWidget) const
 void
 TextComposition::DispatchEvent(WidgetGUIEvent* aEvent,
                                nsEventStatus* aStatus,
-                               nsDispatchingCallback* aCallBack)
+                               EventDispatchingCallback* aCallBack)
 {
   if (aEvent->message == NS_COMPOSITION_UPDATE) {
     mLastData = aEvent->AsCompositionEvent()->data;

dom/events/TextComposition.h

@@ -18,11 +18,11 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/TextRange.h"
 
-class nsDispatchingCallback;
 class nsIEditor;
 
 namespace mozilla {
 
+class EventDispatchingCallback;
 class IMEStateManager;
 
 /**
@@ -219,7 +219,7 @@ private:
    */
   void DispatchEvent(WidgetGUIEvent* aEvent,
                      nsEventStatus* aStatus,
-                     nsDispatchingCallback* aCallBack);
+                     EventDispatchingCallback* aCallBack);
 
   /**
    * Calculate composition offset then notify composition update to widget

dom/events/nsEventDispatcher.cpp

@@ -157,7 +157,7 @@ public:
    */
   static void HandleEventTargetChain(nsTArray<nsEventTargetChainItem>& aChain,
                                      EventChainPostVisitor& aVisitor,
-                                     nsDispatchingCallback* aCallback,
+                                     EventDispatchingCallback* aCallback,
                                      ELMCreationDetector& aCd);
 
   /**
@@ -242,7 +242,7 @@ void
 nsEventTargetChainItem::HandleEventTargetChain(
                           nsTArray<nsEventTargetChainItem>& aChain,
                           EventChainPostVisitor& aVisitor,
-                          nsDispatchingCallback* aCallback,
+                          EventDispatchingCallback* aCallback,
                           ELMCreationDetector& aCd)
 {
   // Save the target so that it can be restored later.
@@ -379,7 +379,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget,
                             WidgetEvent* aEvent,
                             nsIDOMEvent* aDOMEvent,
                             nsEventStatus* aEventStatus,
-                            nsDispatchingCallback* aCallback,
+                            EventDispatchingCallback* aCallback,
                             nsCOMArray<EventTarget>* aTargets)
 {
   PROFILER_LABEL("nsEventDispatcher", "Dispatch");

dom/events/nsEventDispatcher.h

@@ -206,19 +206,20 @@ public:
   }
 };
 
-} // namespace mozilla
-
 /**
- * If an nsDispatchingCallback object is passed to Dispatch,
+ * If an EventDispatchingCallback object is passed to Dispatch,
  * its HandleEvent method is called after handling the default event group,
  * before handling the system event group.
  * This is used in nsPresShell.
  */
-class MOZ_STACK_CLASS nsDispatchingCallback {
+class MOZ_STACK_CLASS EventDispatchingCallback
+{
 public:
-  virtual void HandleEvent(mozilla::EventChainPostVisitor& aVisitor) = 0;
+  virtual void HandleEvent(EventChainPostVisitor& aVisitor) = 0;
 };
 
+} // namespace mozilla
+
 /**
  * The generic class for event dispatching.
  * Must not be used outside Gecko!
@@ -247,7 +248,7 @@ public:
                            mozilla::WidgetEvent* aEvent,
                            nsIDOMEvent* aDOMEvent = nullptr,
                            nsEventStatus* aEventStatus = nullptr,
-                           nsDispatchingCallback* aCallback = nullptr,
+                           mozilla::EventDispatchingCallback* aCallback = nullptr,
                            nsCOMArray<mozilla::dom::EventTarget>* aTargets = nullptr);
 
   /**

dom/events/nsEventStateManager.cpp

@@ -4033,7 +4033,7 @@ nsEventStateManager::SetCursor(int32_t aCursor, imgIContainer* aContainer,
   return NS_OK;
 }
 
-class MOZ_STACK_CLASS nsESMEventCB : public nsDispatchingCallback
+class MOZ_STACK_CLASS nsESMEventCB : public EventDispatchingCallback
 {
 public:
   nsESMEventCB(nsIContent* aTarget) : mTarget(aTarget) {}

layout/base/nsPresShell.cpp

@@ -444,7 +444,7 @@ public:
   PresShell* mShell;
 };
 
-class MOZ_STACK_CLASS nsPresShellEventCB : public nsDispatchingCallback
+class MOZ_STACK_CLASS nsPresShellEventCB : public EventDispatchingCallback
 {
 public:
   nsPresShellEventCB(PresShell* aPresShell) : mPresShell(aPresShell) {}