Bug 1046101 part.2 Rename NS_GUI_EVENT to eGUIEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:46 +0900
changeset 197533 d0783cbdb8d8240ab95871f0d332fba5d0a46f1e
parent 197532 b6e08b99faf8cd00121d4112445a7aded885c7cf
child 197534 32faf084d418e12960ba0316452e979bd48cf6d6
push id47161
push usermasayuki@d-toybox.com
push dateMon, 04 Aug 2014 05:29:14 +0000
treeherdermozilla-inbound@c0cfff4ee625 [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.2 Rename NS_GUI_EVENT to eGUIEventClass r=smaug
dom/events/EventDispatcher.cpp
widget/BasicEvents.h
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -683,17 +683,17 @@ EventDispatcher::CreateEvent(EventTarget
 {
   *aDOMEvent = nullptr;
 
   if (aEvent) {
     switch(aEvent->mClass) {
     case NS_MUTATION_EVENT:
       return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext,
                                     aEvent->AsMutationEvent());
-    case NS_GUI_EVENT:
+    case eGUIEventClass:
     case NS_SCROLLPORT_EVENT:
     case NS_UI_EVENT:
       return NS_NewDOMUIEvent(aDOMEvent, aOwner, aPresContext,
                               aEvent->AsGUIEvent());
     case NS_SCROLLAREA_EVENT:
       return NS_NewDOMScrollAreaEvent(aDOMEvent, aOwner, aPresContext,
                                       aEvent->AsScrollAreaEvent());
     case NS_KEY_EVENT:
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -22,17 +22,17 @@ namespace mozilla {
 /******************************************************************************
  * Event Class ID
  ******************************************************************************/
 typedef uint8_t EventClassIDType;
 enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
 {
   // BasicEvents.h
   NS_EVENT,                          // WidgetEvent
-  NS_GUI_EVENT,                      // WidgetGUIEvent
+  eGUIEventClass,                    // WidgetGUIEvent
   NS_INPUT_EVENT,                    // WidgetInputEvent
   NS_UI_EVENT,                       // InternalUIEvent
 
   // TextEvents.h
   NS_KEY_EVENT,                      // WidgetKeyboardEvent
   NS_COMPOSITION_EVENT,              // WidgetCompositionEvent
   NS_TEXT_EVENT,                     // WidgetTextEvent
   NS_QUERY_CONTENT_EVENT,            // WidgetQueryContentEvent
@@ -854,24 +854,24 @@ protected:
   WidgetGUIEvent()
   {
   }
 
 public:
   virtual WidgetGUIEvent* AsGUIEvent() MOZ_OVERRIDE { return this; }
 
   WidgetGUIEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget) :
-    WidgetEvent(aIsTrusted, aMessage, NS_GUI_EVENT),
+    WidgetEvent(aIsTrusted, aMessage, eGUIEventClass),
     widget(aWidget)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_GUI_EVENT,
+    MOZ_ASSERT(mClass == eGUIEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     WidgetGUIEvent* result = new WidgetGUIEvent(false, message, nullptr);
     result->AssignGUIEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }