diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 055fc1e0f14..21a38fb8c8b 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -1308,9 +1308,9 @@ nsDOMWindowUtils::SendSimpleGestureEvent(const nsAString& aType, 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")) { + else if (aType.EqualsLiteral("MozMagnifyGestureUpdate")) { + msg = eMagnifyGestureUpdate; + } else if (aType.EqualsLiteral("MozMagnifyGesture")) { msg = eMagnifyGesture; } else if (aType.EqualsLiteral("MozRotateGestureStart")) { msg = eRotateGestureStart; diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 566ba94c642..95fc144452d 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -872,7 +872,7 @@ NON_IDL_EVENT(MozMagnifyGestureStart, EventNameType_None, eSimpleGestureEventClass) NON_IDL_EVENT(MozMagnifyGestureUpdate, - NS_SIMPLE_GESTURE_MAGNIFY_UPDATE, + eMagnifyGestureUpdate, EventNameType_None, eSimpleGestureEventClass) NON_IDL_EVENT(MozMagnifyGesture, diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 63a9052a2eb..085c627cd6e 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -278,7 +278,7 @@ NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_UPDATE, NS_SIMPLE_GESTURE_EVENT_START 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(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) diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index a85699bdbd2..249d5b71d41 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -1131,7 +1131,7 @@ nsWindow::OnNativeGestureEvent(AndroidGeckoEvent *ae) mLastDist = delta; break; case AndroidMotionEvent::ACTION_MAGNIFY: - msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE; + msg = eMagnifyGestureUpdate; delta -= mLastDist; mLastDist += delta; break; diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 889740bb000..9beabf5894b 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -4227,7 +4227,7 @@ NSEvent* gLastDragMouseDownEvent = nil; break; case eGestureState_MagnifyGesture: - msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE; + msg = eMagnifyGestureUpdate; break; case eGestureState_None: diff --git a/widget/windows/nsWinGesture.cpp b/widget/windows/nsWinGesture.cpp index dc2c28afe94..96bb19fa20e 100644 --- a/widget/windows/nsWinGesture.cpp +++ b/widget/windows/nsWinGesture.cpp @@ -348,7 +348,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, else { // Send a zoom intermediate event, the delta is the change // in touch points. - evt.mMessage = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE; + evt.mMessage = eMagnifyGestureUpdate; // (positive for a "zoom in") evt.delta = -1.0 * (mZoomIntermediate - (float)gi.ullArguments); mZoomIntermediate = (float)gi.ullArguments;