Bug 1046101 part.19 Rename NS_SCROLLPORT_EVENT to eScrollPortEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:53 +0900
changeset 220557 ad442dc11b0576b11a95760b79d4d05c47405173
parent 220556 cf0c9fbd6cb2fea36b2937f24702af55fe942f1d
child 220558 0dcfa42108aa091a9d24f49ef87092f91e240809
push id583
push userbhearsum@mozilla.com
push dateMon, 24 Nov 2014 19:04:58 +0000
treeherdermozilla-release@c107e74250f4 [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.19 Rename NS_SCROLLPORT_EVENT to eScrollPortEventClass r=smaug
dom/events/EventDispatcher.cpp
dom/events/UIEvent.cpp
widget/BasicEvents.h
widget/ContentEvents.h
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -684,17 +684,17 @@ EventDispatcher::CreateEvent(EventTarget
   *aDOMEvent = nullptr;
 
   if (aEvent) {
     switch(aEvent->mClass) {
     case NS_MUTATION_EVENT:
       return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext,
                                     aEvent->AsMutationEvent());
     case eGUIEventClass:
-    case NS_SCROLLPORT_EVENT:
+    case eScrollPortEventClass:
     case eUIEventClass:
       return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
                               aEvent->AsGUIEvent());
     case NS_SCROLLAREA_EVENT:
       return NS_NewDOMScrollAreaEvent(aDOMEvent, aOwner, aPresContext,
                                       aEvent->AsScrollAreaEvent());
     case eKeyboardEventClass:
       return NS_NewDOMKeyboardEvent(aDOMEvent, aOwner, aPresContext,
--- a/dom/events/UIEvent.cpp
+++ b/dom/events/UIEvent.cpp
@@ -48,17 +48,17 @@ UIEvent::UIEvent(EventTarget* aOwner,
   // event) we've got
   switch(mEvent->mClass) {
     case eUIEventClass:
     {
       mDetail = mEvent->AsUIEvent()->detail;
       break;
     }
 
-    case NS_SCROLLPORT_EVENT:
+    case eScrollPortEventClass:
     {
       InternalScrollPortEvent* scrollEvent = mEvent->AsScrollPortEvent();
       mDetail = (int32_t)scrollEvent->orient;
       break;
     }
 
     default:
       mDetail = 0;
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -47,17 +47,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   ePointerEventClass,                // PointerEvent
 
   // TouchEvents.h
   eGestureNotifyEventClass,          // WidgetGestureNotifyEvent
   eSimpleGestureEventClass,          // WidgetSimpleGestureEvent
   eTouchEventClass,                  // WidgetTouchEvent
 
   // ContentEvents.h
-  NS_SCROLLPORT_EVENT,               // InternalScrollPortEvent
+  eScrollPortEventClass,             // InternalScrollPortEvent
   NS_SCROLLAREA_EVENT,               // 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
@@ -34,25 +34,25 @@ public:
   enum orientType
   {
     vertical   = 0,
     horizontal = 1,
     both       = 2
   };
 
   InternalScrollPortEvent(bool aIsTrusted, uint32_t aMessage,
-                          nsIWidget* aWidget) :
-    WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_SCROLLPORT_EVENT),
-    orient(vertical)
+                          nsIWidget* aWidget)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eScrollPortEventClass)
+    , orient(vertical)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_SCROLLPORT_EVENT,
+    MOZ_ASSERT(mClass == eScrollPortEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     InternalScrollPortEvent* result =
       new InternalScrollPortEvent(false, message, nullptr);
     result->AssignScrollPortEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }