Bug 1046101 part.20 Rename NS_SCROLLAREA_EVENT to eScrollAreaEventCla…

…ss r=smaug
mozilla-spidermonkey · Aug 4, 2014 · 88dbd6e · 88dbd6e
1 parent aa98f87
commit 88dbd6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
@@ -693,7 +693,7 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
     case eUIEventClass:
       return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
                               aEvent->AsGUIEvent());
-    case NS_SCROLLAREA_EVENT:
+    case eScrollAreaEventClass:
       return NS_NewDOMScrollAreaEvent(aDOMEvent, aOwner, aPresContext,
                                       aEvent->AsScrollAreaEvent());
     case eKeyboardEventClass:

diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
@@ -793,7 +793,7 @@ NON_IDL_EVENT(MozAfterPaint,
 NON_IDL_EVENT(MozScrolledAreaChanged,
               NS_SCROLLEDAREACHANGED,
               EventNameType_None,
-              NS_SCROLLAREA_EVENT)
+              eScrollAreaEventClass)
 
 #ifdef MOZ_GAMEPAD
 NON_IDL_EVENT(gamepadbuttondown,

diff --git a/widget/BasicEvents.h b/widget/BasicEvents.h
@@ -53,7 +53,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
 
   // ContentEvents.h
   eScrollPortEventClass,             // InternalScrollPortEvent
-  NS_SCROLLAREA_EVENT,               // InternalScrollAreaEvent
+  eScrollAreaEventClass,             // InternalScrollAreaEvent
   NS_FORM_EVENT,                     // InternalFormEvent
   NS_FOCUS_EVENT,                    // InternalFocusEvent
   NS_CLIPBOARD_EVENT,                // InternalClipboardEvent

diff --git a/widget/ContentEvents.h b/widget/ContentEvents.h
@@ -81,14 +81,14 @@ class InternalScrollAreaEvent : public WidgetGUIEvent
   }
 
   InternalScrollAreaEvent(bool aIsTrusted, uint32_t aMessage,
-                          nsIWidget* aWidget) :
-    WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_SCROLLAREA_EVENT)
+                          nsIWidget* aWidget)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eScrollAreaEventClass)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_SCROLLAREA_EVENT,
+    MOZ_ASSERT(mClass == eScrollAreaEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     InternalScrollAreaEvent* result =