From 88dbd6e7ece36ac095b062c799fe2714c149fefe Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 4 Aug 2014 14:28:54 +0900
Subject: [PATCH] Bug 1046101 part.20 Rename NS_SCROLLAREA_EVENT to
 eScrollAreaEventClass r=smaug

---
 dom/events/EventDispatcher.cpp | 2 +-
 dom/events/EventNameList.h     | 2 +-
 widget/BasicEvents.h           | 2 +-
 widget/ContentEvents.h         | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index bbbb82799c9c..4794342de55d 100644
--- 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
index 12b176baa768..9adb271fa4d5 100644
--- 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
index cc20992180a6..682e6ee319d9 100644
--- 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
index 544e979a660d..79f0f7793b28 100644
--- 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 =