wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 895274 part.262 Rename NS_SIMPLE_GESTURE_MAGNIFY_UPDATE to eMagnifyGestureUpdate r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-15 00:14:37 +09:00
parent 82769d99ba
commit 70291bd76c
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsDOMWindowUtils.cpp
View File

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

2
dom/events/EventNameList.h
View File

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

2
widget/EventMessageList.h
View File

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

2
widget/android/nsWindow.cpp
View File

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

2
widget/cocoa/nsChildView.mm
View File

@ -4227,7 +4227,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
break;
case eGestureState_MagnifyGesture:
msg = NS_SIMPLE_GESTURE_MAGNIFY_UPDATE;
msg = eMagnifyGestureUpdate;
break;
case eGestureState_None:

2
widget/windows/nsWinGesture.cpp
View File

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