Bug 1046101 part.21 Rename NS_FORM_EVENT to eFormEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:54 +0900
changeset 220559 e45296e548c4a35416d96d413f0078cdf121a8f7
parent 220558 0dcfa42108aa091a9d24f49ef87092f91e240809
child 220560 7d500741f3e97c5d1ba7a12292e223cfcec3a8a0
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.21 Rename NS_FORM_EVENT to eFormEventClass r=smaug
dom/events/Event.cpp
widget/BasicEvents.h
widget/ContentEvents.h
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -782,17 +782,17 @@ Event::GetEventPopupControlState(WidgetE
       case NS_MOUSE_DOUBLECLICK :
         if (PopupAllowedForEvent("dblclick")) {
           abuse = openControlled;
         }
         break;
       }
     }
     break;
-  case NS_FORM_EVENT :
+  case eFormEventClass:
     // For these following events only allow popups if they're
     // triggered while handling user input. See
     // nsPresShell::HandleEventInternal() for details.
     if (EventStateManager::IsHandlingUserInput()) {
       switch(aEvent->message) {
       case NS_FORM_SUBMIT :
         if (PopupAllowedForEvent("submit")) {
           abuse = openControlled;
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -49,17 +49,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   // TouchEvents.h
   eGestureNotifyEventClass,          // WidgetGestureNotifyEvent
   eSimpleGestureEventClass,          // WidgetSimpleGestureEvent
   eTouchEventClass,                  // WidgetTouchEvent
 
   // ContentEvents.h
   eScrollPortEventClass,             // InternalScrollPortEvent
   eScrollAreaEventClass,             // InternalScrollAreaEvent
-  NS_FORM_EVENT,                     // InternalFormEvent
+  eFormEventClass,                   // 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
 
   // MiscEvents.h
--- a/widget/ContentEvents.h
+++ b/widget/ContentEvents.h
@@ -116,25 +116,25 @@ public:
  * originator is a weak pointer (does not hold a strong reference).
  ******************************************************************************/
 
 class InternalFormEvent : public WidgetEvent
 {
 public:
   virtual InternalFormEvent* AsFormEvent() MOZ_OVERRIDE { return this; }
 
-  InternalFormEvent(bool aIsTrusted, uint32_t aMessage) :
-    WidgetEvent(aIsTrusted, aMessage, NS_FORM_EVENT),
-    originator(nullptr)
+  InternalFormEvent(bool aIsTrusted, uint32_t aMessage)
+    : WidgetEvent(aIsTrusted, aMessage, eFormEventClass)
+    , originator(nullptr)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
-    MOZ_ASSERT(mClass == NS_FORM_EVENT,
+    MOZ_ASSERT(mClass == eFormEventClass,
                "Duplicate() must be overridden by sub class");
     InternalFormEvent* result = new InternalFormEvent(false, message);
     result->AssignFormEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
   nsIContent *originator;