Bug 895274 part.258 Rename NS_SIMPLE_GESTURE_ROTATE to eRotateGesture r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-15 00:14:36 +09:00
parent 618e324af6
commit e5034e6176
5 changed files with 9 additions and 10 deletions

View File

@ -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;

View File

@ -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,

View File

@ -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)

View File

@ -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) {

View File

@ -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;