Bug 1046101 part.20 Rename NS_SCROLLAREA_EVENT to eScrollAreaEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:54 +0900
changeset 219286 0dcfa42108aa091a9d24f49ef87092f91e240809
parent 219285 ad442dc11b0576b11a95760b79d4d05c47405173
child 219287 e45296e548c4a35416d96d413f0078cdf121a8f7
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1046101
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1046101 part.20 Rename NS_SCROLLAREA_EVENT to eScrollAreaEventClass r=smaug
dom/events/EventDispatcher.cpp
dom/events/EventNameList.h
widget/BasicEvents.h
widget/ContentEvents.h
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -688,17 +688,17 @@ EventDispatcher::CreateEvent(EventTarget
     case NS_MUTATION_EVENT:
       return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext,
                                     aEvent->AsMutationEvent());
     case eGUIEventClass:
     case eScrollPortEventClass:
     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:
       return NS_NewDOMKeyboardEvent(aDOMEvent, aOwner, aPresContext,
                                     aEvent->AsKeyboardEvent());
     case eCompositionEventClass:
       return NS_NewDOMCompositionEvent(aDOMEvent, aOwner, aPresContext,
                                        aEvent->AsCompositionEvent());
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -788,17 +788,17 @@ NON_IDL_EVENT(repeatEvent,
 NON_IDL_EVENT(MozAfterPaint,
               NS_AFTERPAINT,
               EventNameType_None,
               NS_EVENT)
 
 NON_IDL_EVENT(MozScrolledAreaChanged,
               NS_SCROLLEDAREACHANGED,
               EventNameType_None,
-              NS_SCROLLAREA_EVENT)
+              eScrollAreaEventClass)
 
 #ifdef MOZ_GAMEPAD
 NON_IDL_EVENT(gamepadbuttondown,
               NS_GAMEPAD_BUTTONDOWN,
               EventNameType_None,
               NS_EVENT)
 NON_IDL_EVENT(gamepadbuttonup,
               NS_GAMEPAD_BUTTONUP,
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -48,17 +48,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
 
   // TouchEvents.h
   eGestureNotifyEventClass,          // WidgetGestureNotifyEvent
   eSimpleGestureEventClass,          // WidgetSimpleGestureEvent
   eTouchEventClass,                  // WidgetTouchEvent
 
   // ContentEvents.h
   eScrollPortEventClass,             // InternalScrollPortEvent
-  NS_SCROLLAREA_EVENT,               // InternalScrollAreaEvent
+  eScrollAreaEventClass,             // InternalScrollAreaEvent
   NS_FORM_EVENT,                     // InternalFormEvent
   NS_FOCUS_EVENT,                    // InternalFocusEvent
   NS_CLIPBOARD_EVENT,                // InternalClipboardEvent
   NS_TRANSITION_EVENT,               // InternalTransitionEvent
   NS_ANIMATION_EVENT,                // InternalAnimationEvent
   NS_SVGZOOM_EVENT,                  // InternalSVGZoomEvent
   NS_SMIL_TIME_EVENT,                // InternalSMILTimeEvent
 
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -76,24 +76,24 @@ class InternalScrollAreaEvent : public W
 {
 public:
   virtual InternalScrollAreaEvent* AsScrollAreaEvent() MOZ_OVERRIDE
   {
     return this;
   }
 
   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 =
       new InternalScrollAreaEvent(false, message, nullptr);
     result->AssignScrollAreaEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }