Bug 1046101 part.16 Rename NS_GESTURENOTIFY_EVENT to eGestureNotifyEventClass r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Mon, 04 Aug 2014 14:28:52 +0900
changeset 220554 489398167822d6c7c4edac01a06cc4287b0ef118
parent 220553 aa613254b2f3649fcb4e0417523336e56393b353
child 220555 eba87b3656a5263006fdf596fcf7e05e6d88bbf8
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.16 Rename NS_GESTURENOTIFY_EVENT to eGestureNotifyEventClass r=smaug
layout/base/nsLayoutUtils.cpp
widget/BasicEvents.h
widget/TouchEvents.h
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1870,17 +1870,17 @@ nsLayoutUtils::GetEventCoordinatesRelati
                                              nsIFrame* aFrame)
 {
   if (!aEvent || (aEvent->mClass != eMouseEventClass &&
                   aEvent->mClass != eMouseScrollEventClass &&
                   aEvent->mClass != eWheelEventClass &&
                   aEvent->mClass != eDragEventClass &&
                   aEvent->mClass != NS_SIMPLE_GESTURE_EVENT &&
                   aEvent->mClass != ePointerEventClass &&
-                  aEvent->mClass != NS_GESTURENOTIFY_EVENT &&
+                  aEvent->mClass != eGestureNotifyEventClass &&
                   aEvent->mClass != NS_TOUCH_EVENT &&
                   aEvent->mClass != eQueryContentEventClass))
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
   return GetEventCoordinatesRelativeTo(aEvent,
            LayoutDeviceIntPoint::ToUntyped(aEvent->AsGUIEvent()->refPoint),
            aFrame);
 }
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -42,17 +42,17 @@ enum EventClassID MOZ_ENUM_TYPE(EventCla
   // MouseEvents.h
   eMouseEventClass,                  // WidgetMouseEvent
   eDragEventClass,                   // WidgetDragEvent
   eMouseScrollEventClass,            // WidgetMouseScrollEvent
   eWheelEventClass,                  // WidgetWheelEvent
   ePointerEventClass,                // PointerEvent
 
   // TouchEvents.h
-  NS_GESTURENOTIFY_EVENT,            // WidgetGestureNotifyEvent
+  eGestureNotifyEventClass,          // WidgetGestureNotifyEvent
   NS_SIMPLE_GESTURE_EVENT,           // WidgetSimpleGestureEvent
   NS_TOUCH_EVENT,                    // WidgetTouchEvent
 
   // ContentEvents.h
   NS_SCROLLPORT_EVENT,               // InternalScrollPortEvent
   NS_SCROLLAREA_EVENT,               // InternalScrollAreaEvent
   NS_FORM_EVENT,                     // InternalFormEvent
   NS_FOCUS_EVENT,                    // InternalFocusEvent
--- a/widget/TouchEvents.h
+++ b/widget/TouchEvents.h
@@ -32,30 +32,31 @@ class WidgetGestureNotifyEvent : public 
 {
 public:
   virtual WidgetGestureNotifyEvent* AsGestureNotifyEvent() MOZ_OVERRIDE
   {
     return this;
   }
 
   WidgetGestureNotifyEvent(bool aIsTrusted, uint32_t aMessage,
-                           nsIWidget *aWidget) :
-    WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_GESTURENOTIFY_EVENT),
-    panDirection(ePanNone), displayPanFeedback(false)
+                           nsIWidget *aWidget)
+    : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eGestureNotifyEventClass)
+    , panDirection(ePanNone)
+    , displayPanFeedback(false)
   {
   }
 
   virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
   {
     // XXX Looks like this event is handled only in PostHandleEvent() of
     //     EventStateManager.  Therefore, it might be possible to handle this
     //     in PreHandleEvent() and not to dispatch as a DOM event into the DOM
     //     tree like ContentQueryEvent.  Then, this event doesn't need to
     //     support Duplicate().
-    MOZ_ASSERT(mClass == NS_GESTURENOTIFY_EVENT,
+    MOZ_ASSERT(mClass == eGestureNotifyEventClass,
                "Duplicate() must be overridden by sub class");
     // Not copying widget, it is a weak reference.
     WidgetGestureNotifyEvent* result =
       new WidgetGestureNotifyEvent(false, message, nullptr);
     result->AssignGestureNotifyEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }