Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 895274 part.261 Rename NS_SIMPLE_GESTURE_MAGNIFY to eMagnifyGesture r=smaug

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

6
dom/base/nsDOMWindowUtils.cpp
View File

@ -1310,9 +1310,9 @@ nsDOMWindowUtils::SendSimpleGestureEvent(const nsAString& aType,
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;

2
dom/events/EventNameList.h
View File

@ -876,7 +876,7 @@ NON_IDL_EVENT(MozMagnifyGestureUpdate,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozMagnifyGesture,
NS_SIMPLE_GESTURE_MAGNIFY,
eMagnifyGesture,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozRotateGestureStart,

2
widget/EventMessageList.h
View File

@ -279,7 +279,7 @@ NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE_END, NS_SIMPLE_GESTURE_EVENT_START
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)

2
widget/android/nsWindow.cpp
View File

@ -1136,7 +1136,7 @@ nsWindow::OnNativeGestureEvent(AndroidGeckoEvent *ae)
mLastDist += delta;
break;
case AndroidMotionEvent::ACTION_MAGNIFY_END:
msg = NS_SIMPLE_GESTURE_MAGNIFY;
msg = eMagnifyGesture;
delta -= mStartDist;
break;
default:

3
widget/cocoa/nsChildView.mm
View File

@ -4339,8 +4339,7 @@ NSEvent* gLastDragMouseDownEvent = nil;
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];

2
widget/windows/nsWinGesture.cpp
View File

@ -340,7 +340,7 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam,
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;