diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index e4d5366a2bc..ba57e41480b 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -1316,9 +1316,9 @@ nsDOMWindowUtils::SendSimpleGestureEvent(const nsAString& aType, msg = NS_SIMPLE_GESTURE_ROTATE_START; else if (aType.EqualsLiteral("MozRotateGestureUpdate")) msg = NS_SIMPLE_GESTURE_ROTATE_UPDATE; - else if (aType.EqualsLiteral("MozRotateGesture")) - msg = NS_SIMPLE_GESTURE_ROTATE; - else if (aType.EqualsLiteral("MozTapGesture")) { + else if (aType.EqualsLiteral("MozRotateGesture")) { + msg = eRotateGesture; + } else if (aType.EqualsLiteral("MozTapGesture")) { msg = eTapGesture; } else if (aType.EqualsLiteral("MozPressTapGesture")) { msg = ePressTapGesture; diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 7a7ea3fd58c..d9fd96bca24 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -888,7 +888,7 @@ NON_IDL_EVENT(MozRotateGestureUpdate, EventNameType_None, eSimpleGestureEventClass) NON_IDL_EVENT(MozRotateGesture, - NS_SIMPLE_GESTURE_ROTATE, + eRotateGesture, EventNameType_None, eSimpleGestureEventClass) NON_IDL_EVENT(MozTapGesture, diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index d4f49750be9..ec3b7a05bda 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -282,7 +282,7 @@ NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY_UPDATE, NS_SIMPLE_GESTURE_EVENT_START NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_MAGNIFY, NS_SIMPLE_GESTURE_EVENT_START + 7) NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_ROTATE_START, NS_SIMPLE_GESTURE_EVENT_START + 8) NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_ROTATE_UPDATE, NS_SIMPLE_GESTURE_EVENT_START + 9) -NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_ROTATE, NS_SIMPLE_GESTURE_EVENT_START + 10) +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) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 07348cd481b..8c3b14fc05e 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -4352,8 +4352,7 @@ NSEvent* gLastDragMouseDownEvent = nil; case eGestureState_RotateGesture: { // Setup the "rotate" event. - WidgetSimpleGestureEvent geckoEvent(true, NS_SIMPLE_GESTURE_ROTATE, - mGeckoChild); + WidgetSimpleGestureEvent geckoEvent(true, eRotateGesture, mGeckoChild); [self convertCocoaMouseEvent:anEvent toGeckoEvent:&geckoEvent]; geckoEvent.delta = -mCumulativeRotation; if (mCumulativeRotation > 0.0) { diff --git a/widget/windows/nsWinGesture.cpp b/widget/windows/nsWinGesture.cpp index 568e7a12cb5..57f1254cc54 100644 --- a/widget/windows/nsWinGesture.cpp +++ b/widget/windows/nsWinGesture.cpp @@ -386,9 +386,9 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, if (gi.dwFlags & GF_BEGIN) evt.mMessage = NS_SIMPLE_GESTURE_ROTATE_START; - else if (gi.dwFlags & GF_END) - evt.mMessage = NS_SIMPLE_GESTURE_ROTATE; - else + else if (gi.dwFlags & GF_END) { + evt.mMessage = eRotateGesture; + } else evt.mMessage = NS_SIMPLE_GESTURE_ROTATE_UPDATE; } break;