Bug 895274 part.265 Rename NS_SIMPLE_GESTURE_SWIPE_END to eSwipeGestureEnd r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 15 Sep 2015 00:14:37 +0900
changeset 262369 7d3ff6e1cdfea1ce6fbdfdfb9eb9a72fc93557a2
parent 262368 9443d9e5318e8a792b817f745a58fce6bf11f95f
child 262370 035f20d39060839225fc5e016789a9086a1cc5dc
push id29371
push userkwierso@gmail.com
push dateTue, 15 Sep 2015 00:13:11 +0000
treeherdermozilla-central@3eb37530c627 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.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 895274 part.265 Rename NS_SIMPLE_GESTURE_SWIPE_END to eSwipeGestureEnd r=smaug
dom/base/nsDOMWindowUtils.cpp
dom/events/EventNameList.h
widget/EventMessageList.h
widget/cocoa/SwipeTracker.mm
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1297,19 +1297,19 @@ nsDOMWindowUtils::SendSimpleGestureEvent
 
   EventMessage msg;
   if (aType.EqualsLiteral("MozSwipeGestureMayStart"))
     msg = NS_SIMPLE_GESTURE_SWIPE_MAY_START;
   else if (aType.EqualsLiteral("MozSwipeGestureStart"))
     msg = NS_SIMPLE_GESTURE_SWIPE_START;
   else if (aType.EqualsLiteral("MozSwipeGestureUpdate"))
     msg = NS_SIMPLE_GESTURE_SWIPE_UPDATE;
-  else if (aType.EqualsLiteral("MozSwipeGestureEnd"))
-    msg = NS_SIMPLE_GESTURE_SWIPE_END;
-  else if (aType.EqualsLiteral("MozSwipeGesture")) {
+  else if (aType.EqualsLiteral("MozSwipeGestureEnd")) {
+    msg = eSwipeGestureEnd;
+  } else if (aType.EqualsLiteral("MozSwipeGesture")) {
     msg = eSwipeGesture;
   } else if (aType.EqualsLiteral("MozMagnifyGestureStart")) {
     msg = eMagnifyGestureStart;
   } else if (aType.EqualsLiteral("MozMagnifyGestureUpdate")) {
     msg = eMagnifyGestureUpdate;
   } else if (aType.EqualsLiteral("MozMagnifyGesture")) {
     msg = eMagnifyGesture;
   } else if (aType.EqualsLiteral("MozRotateGestureStart")) {
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -855,17 +855,17 @@ NON_IDL_EVENT(MozSwipeGestureStart,
               NS_SIMPLE_GESTURE_SWIPE_START,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozSwipeGestureUpdate,
               NS_SIMPLE_GESTURE_SWIPE_UPDATE,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozSwipeGestureEnd,
-              NS_SIMPLE_GESTURE_SWIPE_END,
+              eSwipeGestureEnd,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozSwipeGesture,
               eSwipeGesture,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozMagnifyGestureStart,
               eMagnifyGestureStart,
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -270,17 +270,17 @@ NS_EVENT_MESSAGE(eVolumeChange,         
 NS_EVENT_MESSAGE(ePaintEventFirst,      3400)
 NS_EVENT_MESSAGE(eAfterPaint,           ePaintEventFirst)
 
 // Simple gesture events
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_EVENT_START,    3500)
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_MAY_START,NS_SIMPLE_GESTURE_EVENT_START)
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_START,    NS_SIMPLE_GESTURE_EVENT_START + 1)
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_UPDATE,   NS_SIMPLE_GESTURE_EVENT_START + 2)
-NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_END,      NS_SIMPLE_GESTURE_EVENT_START + 3)
+NS_EVENT_MESSAGE(eSwipeGestureEnd,      NS_SIMPLE_GESTURE_EVENT_START + 3)
 NS_EVENT_MESSAGE(eSwipeGesture,         NS_SIMPLE_GESTURE_EVENT_START + 4)
 NS_EVENT_MESSAGE(eMagnifyGestureStart,  NS_SIMPLE_GESTURE_EVENT_START + 5)
 NS_EVENT_MESSAGE(eMagnifyGestureUpdate, NS_SIMPLE_GESTURE_EVENT_START + 6)
 NS_EVENT_MESSAGE(eMagnifyGesture,       NS_SIMPLE_GESTURE_EVENT_START + 7)
 NS_EVENT_MESSAGE(eRotateGestureStart,   NS_SIMPLE_GESTURE_EVENT_START + 8)
 NS_EVENT_MESSAGE(eRotateGestureUpdate,  NS_SIMPLE_GESTURE_EVENT_START + 9)
 NS_EVENT_MESSAGE(eRotateGesture,        NS_SIMPLE_GESTURE_EVENT_START + 10)
 NS_EVENT_MESSAGE(eTapGesture,           NS_SIMPLE_GESTURE_EVENT_START + 11)
--- a/widget/cocoa/SwipeTracker.mm
+++ b/widget/cocoa/SwipeTracker.mm
@@ -170,22 +170,22 @@ SwipeTracker::WillRefresh(mozilla::TimeS
     UnregisterFromRefreshDriver();
     SwipeFinished();
   }
 }
 
 void
 SwipeTracker::CancelSwipe()
 {
-  SendSwipeEvent(NS_SIMPLE_GESTURE_SWIPE_END, 0, 0.0);
+  SendSwipeEvent(eSwipeGestureEnd, 0, 0.0);
 }
 
 void SwipeTracker::SwipeFinished()
 {
-  SendSwipeEvent(NS_SIMPLE_GESTURE_SWIPE_END, 0, 0.0);
+  SendSwipeEvent(eSwipeGestureEnd, 0, 0.0);
   mWidget.SwipeFinished();
 }
 
 void
 SwipeTracker::UnregisterFromRefreshDriver()
 {
   if (mRegisteredWithRefreshDriver) {
     MOZ_ASSERT(mRefreshDriver, "How were we able to register, then?");