Bug 895274 part.261 Rename NS_SIMPLE_GESTURE_MAGNIFY to eMagnifyGesture r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 15 Sep 2015 00:14:37 +0900
changeset 296669 58cba751dfe5bbf823054f25ca8deeee5d3d39d8
parent 296668 4b22918a90f668f48b8f39d04b378315db0ac62d
child 296670 2f0716ec8171759506434a0a1f82648dc8f56453
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [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.261 Rename NS_SIMPLE_GESTURE_MAGNIFY to eMagnifyGesture r=smaug
dom/base/nsDOMWindowUtils.cpp
dom/events/EventNameList.h
widget/EventMessageList.h
widget/android/nsWindow.cpp
widget/cocoa/nsChildView.mm
widget/windows/nsWinGesture.cpp
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1305,19 +1305,19 @@ nsDOMWindowUtils::SendSimpleGestureEvent
   else if (aType.EqualsLiteral("MozSwipeGestureEnd"))
     msg = NS_SIMPLE_GESTURE_SWIPE_END;
   else if (aType.EqualsLiteral("MozSwipeGesture"))
     msg = NS_SIMPLE_GESTURE_SWIPE;
   else if (aType.EqualsLiteral("MozMagnifyGestureStart"))
     msg = NS_SIMPLE_GESTURE_MAGNIFY_START;
   else if (aType.EqualsLiteral("MozMagnifyGestureUpdate"))
     msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
-  else if (aType.EqualsLiteral("MozMagnifyGesture"))
-    msg = NS_SIMPLE_GESTURE_MAGNIFY;
-  else if (aType.EqualsLiteral("MozRotateGestureStart")) {
+  else if (aType.EqualsLiteral("MozMagnifyGesture")) {
+    msg = eMagnifyGesture;
+  } else if (aType.EqualsLiteral("MozRotateGestureStart")) {
     msg = eRotateGestureStart;
   } else if (aType.EqualsLiteral("MozRotateGestureUpdate")) {
     msg = eRotateGestureUpdate;
   } else if (aType.EqualsLiteral("MozRotateGesture")) {
     msg = eRotateGesture;
   } else if (aType.EqualsLiteral("MozTapGesture")) {
     msg = eTapGesture;
   } else if (aType.EqualsLiteral("MozPressTapGesture")) {
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -871,17 +871,17 @@ NON_IDL_EVENT(MozMagnifyGestureStart,
               NS_SIMPLE_GESTURE_MAGNIFY_START,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozMagnifyGestureUpdate,
               NS_SIMPLE_GESTURE_MAGNIFY_UPDATE,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozMagnifyGesture,
-              NS_SIMPLE_GESTURE_MAGNIFY,
+              eMagnifyGesture,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozRotateGestureStart,
               eRotateGestureStart,
               EventNameType_None,
               eSimpleGestureEventClass)
 NON_IDL_EVENT(MozRotateGestureUpdate,
               eRotateGestureUpdate,
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -274,17 +274,17 @@ NS_EVENT_MESSAGE(eAfterPaint,           
 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(NS_SIMPLE_GESTURE_SWIPE,          NS_SIMPLE_GESTURE_EVENT_START + 4)
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_START,  NS_SIMPLE_GESTURE_EVENT_START + 5)
 NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_UPDATE, NS_SIMPLE_GESTURE_EVENT_START + 6)
-NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY,        NS_SIMPLE_GESTURE_EVENT_START + 7)
+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)
 NS_EVENT_MESSAGE(ePressTapGesture,      NS_SIMPLE_GESTURE_EVENT_START + 12)
 NS_EVENT_MESSAGE(eEdgeUIStarted,        NS_SIMPLE_GESTURE_EVENT_START + 13)
 NS_EVENT_MESSAGE(eEdgeUICanceled,       NS_SIMPLE_GESTURE_EVENT_START + 14)
 NS_EVENT_MESSAGE(eEdgeUICompleted,      NS_SIMPLE_GESTURE_EVENT_START + 15)
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1131,17 +1131,17 @@ nsWindow::OnNativeGestureEvent(AndroidGe
             mLastDist = delta;
             break;
         case AndroidMotionEvent::ACTION_MAGNIFY:
             msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
             delta -= mLastDist;
             mLastDist += delta;
             break;
         case AndroidMotionEvent::ACTION_MAGNIFY_END:
-            msg = NS_SIMPLE_GESTURE_MAGNIFY;
+            msg = eMagnifyGesture;
             delta -= mStartDist;
             break;
         default:
             return;
     }
 
     nsRefPtr<nsWindow> kungFuDeathGrip(this);
 
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -4334,18 +4334,17 @@ NSEvent* gLastDragMouseDownEvent = nil;
   }
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
 
   switch (mGestureState) {
   case eGestureState_MagnifyGesture:
     {
       // Setup the "magnify" event.
-      WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_MAGNIFY,
-                                          mGeckoChild);
+      WidgetSimpleGestureEvent geckoEvent(true, eMagnifyGesture, mGeckoChild);
       geckoEvent.delta = mCumulativeMagnification;
       [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent];
 
       // Send the event.
       mGeckoChild->DispatchWindowEvent(geckoEvent);
     }
     break;
 
--- a/widget/windows/nsWinGesture.cpp
+++ b/widget/windows/nsWinGesture.cpp
@@ -335,17 +335,17 @@ nsWinGesture::ProcessGestureMessage(HWND
         mZoomIntermediate = (float)gi.ullArguments;
 
         evt.mMessage = NS_SIMPLE_GESTURE_MAGNIFY_START;
         evt.delta = 0.0;
       }
       else if (gi.dwFlags & GF_END) {
         // Send a zoom end event, the delta is the change
         // in touch points.
-        evt.mMessage = NS_SIMPLE_GESTURE_MAGNIFY;
+        evt.mMessage = eMagnifyGesture;
         // (positive for a "zoom in")
         evt.delta = -1.0 * (mZoomIntermediate - (float)gi.ullArguments);
         mZoomIntermediate = (float)gi.ullArguments;
       }
       else {
         // Send a zoom intermediate event, the delta is the change
         // in touch points.
         evt.mMessage = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;