Bug 895274 part.255 Rename NS_SIMPLE_GESTURE_EDGE_STARTED to eEdgeUIStarted r=smaug
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1317,19 +1317,19 @@ nsDOMWindowUtils::SendSimpleGestureEvent
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"))
msg = NS_SIMPLE_GESTURE_TAP;
else if (aType.EqualsLiteral("MozPressTapGesture"))
msg = NS_SIMPLE_GESTURE_PRESSTAP;
- else if (aType.EqualsLiteral("MozEdgeUIStarted"))
- msg = NS_SIMPLE_GESTURE_EDGE_STARTED;
- else if (aType.EqualsLiteral("MozEdgeUICanceled")) {
+ else if (aType.EqualsLiteral("MozEdgeUIStarted")) {
+ msg = eEdgeUIStarted;
+ } else if (aType.EqualsLiteral("MozEdgeUICanceled")) {
msg = eEdgeUICanceled;
} else if (aType.EqualsLiteral("MozEdgeUICompleted")) {
msg = eEdgeUICompleted;
} else {
return NS_ERROR_FAILURE;
}
WidgetSimpleGestureEvent event(true, msg, widget);
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -895,17 +895,17 @@ NON_IDL_EVENT(MozTapGesture,
NS_SIMPLE_GESTURE_TAP,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozPressTapGesture,
NS_SIMPLE_GESTURE_PRESSTAP,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUIStarted,
- NS_SIMPLE_GESTURE_EDGE_STARTED,
+ eEdgeUIStarted,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUICanceled,
eEdgeUICanceled,
EventNameType_None,
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUICompleted,
eEdgeUICompleted,
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -280,17 +280,17 @@ NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_SWIPE
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(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(NS_SIMPLE_GESTURE_TAP, NS_SIMPLE_GESTURE_EVENT_START + 11)
NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_PRESSTAP, NS_SIMPLE_GESTURE_EVENT_START + 12)
-NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_EDGE_STARTED, NS_SIMPLE_GESTURE_EVENT_START + 13)
+NS_EVENT_MESSAGE(eEdgeUIStarted, NS_SIMPLE_GESTURE_EVENT_START + 13)
NS_EVENT_MESSAGE(eEdgeUICanceled, NS_SIMPLE_GESTURE_EVENT_START + 14)
NS_EVENT_MESSAGE(eEdgeUICompleted, NS_SIMPLE_GESTURE_EVENT_START + 15)
// These are used to send native events to plugins.
NS_EVENT_MESSAGE(ePluginEventFirst, 3600)
NS_EVENT_MESSAGE(ePluginInputEvent, ePluginEventFirst)
// Events to manipulate selection (WidgetSelectionEvent)