Bug 895274 part.265 Rename NS_SIMPLE_GESTURE_SWIPE_END to eSwipeGestu…

…reEnd r=smaug
Brli · Sep 14, 2015 · 71e5cdf · 71e5cdf
1 parent c14daa1
commit 71e5cdf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
@@ -1302,9 +1302,9 @@ nsDOMWindowUtils::SendSimpleGestureEvent(const nsAString& aType,
     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;

diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h
@@ -860,7 +860,7 @@ NON_IDL_EVENT(MozSwipeGestureUpdate,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozSwipeGestureEnd,
-              NS_SIMPLE_GESTURE_SWIPE_END,
+              eSwipeGestureEnd,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozSwipeGesture,

diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h
@@ -275,7 +275,7 @@ 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)

diff --git a/widget/cocoa/SwipeTracker.mm b/widget/cocoa/SwipeTracker.mm
@@ -175,12 +175,12 @@
 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();
 }