mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1046101 part.17 Rename NS_SIMPLE_GESTURE_EVENT to eSimpleGestureEventClass r=smaug

This commit is contained in:
Masayuki Nakano 2014-08-04 14:28:53 +09:00
Родитель a35856075d
Коммит d9a2d921e1
13 изменённых файлов: 40 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/events/Event.cpp
Просмотреть файл

@ -161,7 +161,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Event)
case eMouseEventClass:
case eMouseScrollEventClass:
case eWheelEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
case ePointerEventClass:
tmp->mEvent->AsMouseEventBase()->relatedTarget = nullptr;
break;
@ -199,7 +199,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
case eMouseEventClass:
case eMouseScrollEventClass:
case eWheelEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
case ePointerEventClass:
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
cb.NoteXPCOMChild(tmp->mEvent->AsMouseEventBase()->relatedTarget);
@ -853,7 +853,7 @@ Event::GetScreenCoords(nsPresContext* aPresContext,
aEvent->mClass != ePointerEventClass &&
aEvent->mClass != NS_TOUCH_EVENT &&
aEvent->mClass != eDragEventClass &&
aEvent->mClass != NS_SIMPLE_GESTURE_EVENT)) {
aEvent->mClass != eSimpleGestureEventClass)) {
return nsIntPoint(0, 0);
}
@ -909,7 +909,7 @@ Event::GetClientCoords(nsPresContext* aPresContext,
aEvent->mClass != NS_TOUCH_EVENT &&
aEvent->mClass != eDragEventClass &&
aEvent->mClass != ePointerEventClass &&
aEvent->mClass != NS_SIMPLE_GESTURE_EVENT) ||
aEvent->mClass != eSimpleGestureEventClass) ||
!aPresContext ||
!aEvent->AsGUIEvent()->widget) {
return aDefaultPoint;

2
dom/events/EventDispatcher.cpp
Просмотреть файл

@ -735,7 +735,7 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
case NS_COMMAND_EVENT:
return NS_NewDOMCommandEvent(aDOMEvent, aOwner, aPresContext,
aEvent->AsCommandEvent());
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
return NS_NewDOMSimpleGestureEvent(aDOMEvent, aOwner, aPresContext,
aEvent->AsSimpleGestureEvent());
case ePointerEventClass:

30
dom/events/EventNameList.h
Просмотреть файл

@ -822,63 +822,63 @@ NON_IDL_EVENT(gamepaddisconnected,
NON_IDL_EVENT(MozSwipeGestureStart,
NS_SIMPLE_GESTURE_SWIPE_START,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozSwipeGestureUpdate,
NS_SIMPLE_GESTURE_SWIPE_UPDATE,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozSwipeGestureEnd,
NS_SIMPLE_GESTURE_SWIPE_END,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozSwipeGesture,
NS_SIMPLE_GESTURE_SWIPE,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozMagnifyGestureStart,
NS_SIMPLE_GESTURE_MAGNIFY_START,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozMagnifyGestureUpdate,
NS_SIMPLE_GESTURE_MAGNIFY_UPDATE,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozMagnifyGesture,
NS_SIMPLE_GESTURE_MAGNIFY,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozRotateGestureStart,
NS_SIMPLE_GESTURE_ROTATE_START,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozRotateGestureUpdate,
NS_SIMPLE_GESTURE_ROTATE_UPDATE,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozRotateGesture,
NS_SIMPLE_GESTURE_ROTATE,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozTapGesture,
NS_SIMPLE_GESTURE_TAP,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozPressTapGesture,
NS_SIMPLE_GESTURE_PRESSTAP,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUIStarted,
NS_SIMPLE_GESTURE_EDGE_STARTED,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUICanceled,
NS_SIMPLE_GESTURE_EDGE_CANCELED,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(MozEdgeUICompleted,
NS_SIMPLE_GESTURE_EDGE_COMPLETED,
EventNameType_None,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
NON_IDL_EVENT(transitionend,
NS_TRANSITION_END,

12
dom/events/MouseEvent.cpp
Просмотреть файл

@ -75,7 +75,7 @@ MouseEvent::InitMouseEvent(const nsAString& aType,
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT: {
case eSimpleGestureEventClass: {
WidgetMouseEventBase* mouseEventBase = mEvent->AsMouseEventBase();
mouseEventBase->relatedTarget = aRelatedTarget;
mouseEventBase->button = aButton;
@ -129,7 +129,7 @@ MouseEvent::InitMouseEvent(const nsAString& aType,
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
mEvent->AsInputEvent()->modifiers = modifiers;
return NS_OK;
default:
@ -160,7 +160,7 @@ MouseEvent::Constructor(const GlobalObject& aGlobal,
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
e->mEvent->AsMouseEventBase()->buttons = aParam.mButtons;
break;
default:
@ -219,7 +219,7 @@ MouseEvent::Button()
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
return mEvent->AsMouseEventBase()->button;
default:
NS_WARNING("Tried to get mouse button for non-mouse event!");
@ -244,7 +244,7 @@ MouseEvent::Buttons()
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
return mEvent->AsMouseEventBase()->buttons;
default:
MOZ_CRASH("Tried to get mouse buttons for non-mouse event!");
@ -269,7 +269,7 @@ MouseEvent::GetRelatedTarget()
case eWheelEventClass:
case eDragEventClass:
case ePointerEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
relatedTarget =
do_QueryInterface(mEvent->AsMouseEventBase()->relatedTarget);
break;

2
dom/events/SimpleGestureEvent.cpp
Просмотреть файл

@ -17,7 +17,7 @@ SimpleGestureEvent::SimpleGestureEvent(EventTarget* aOwner,
aEvent ? aEvent :
new WidgetSimpleGestureEvent(false, 0, nullptr))
{
NS_ASSERTION(mEvent->mClass == NS_SIMPLE_GESTURE_EVENT,
NS_ASSERTION(mEvent->mClass == eSimpleGestureEventClass,
"event type mismatch");
if (aEvent) {

4
dom/events/UIEvent.cpp
Просмотреть файл

@ -123,7 +123,7 @@ UIEvent::GetMovementPoint()
mEvent->mClass != eWheelEventClass &&
mEvent->mClass != eDragEventClass &&
mEvent->mClass != ePointerEventClass &&
mEvent->mClass != NS_SIMPLE_GESTURE_EVENT) ||
mEvent->mClass != eSimpleGestureEventClass) ||
!mEvent->AsGUIEvent()->widget) {
return nsIntPoint(0, 0);
}
@ -302,7 +302,7 @@ UIEvent::GetLayerPoint() const
mEvent->mClass != ePointerEventClass &&
mEvent->mClass != NS_TOUCH_EVENT &&
mEvent->mClass != eDragEventClass &&
mEvent->mClass != NS_SIMPLE_GESTURE_EVENT) ||
mEvent->mClass != eSimpleGestureEventClass) ||
!mPresContext ||
mEventIsInternal) {
return mLayerPoint;

4
dom/events/UIEvent.h
Просмотреть файл

@ -48,7 +48,7 @@ public:
aEvent->mClass != eWheelEventClass &&
aEvent->mClass != eDragEventClass &&
aEvent->mClass != ePointerEventClass &&
aEvent->mClass != NS_SIMPLE_GESTURE_EVENT)) {
aEvent->mClass != eSimpleGestureEventClass)) {
return nsIntPoint(0, 0);
}
@ -75,7 +75,7 @@ public:
aEvent->mClass != eWheelEventClass &&
aEvent->mClass != eDragEventClass &&
aEvent->mClass != ePointerEventClass &&
aEvent->mClass != NS_SIMPLE_GESTURE_EVENT) ||
aEvent->mClass != eSimpleGestureEventClass) ||
!aPresContext ||
!aEvent->AsGUIEvent()->widget) {
return aDefaultClientPoint

2
dom/xbl/nsXBLEventHandler.cpp
Просмотреть файл

@ -153,7 +153,7 @@ NS_NewXBLEventHandler(nsXBLPrototypeHandler* aHandler,
case eMouseEventClass:
case eMouseScrollEventClass:
case eWheelEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
*aResult = new nsXBLMouseEventHandler(aHandler);
break;
default:

2
layout/base/nsLayoutUtils.cpp
Просмотреть файл

@ -1873,7 +1873,7 @@ nsLayoutUtils::GetEventCoordinatesRelativeTo(const WidgetEvent* aEvent,
aEvent->mClass != eMouseScrollEventClass &&
aEvent->mClass != eWheelEventClass &&
aEvent->mClass != eDragEventClass &&
aEvent->mClass != NS_SIMPLE_GESTURE_EVENT &&
aEvent->mClass != eSimpleGestureEventClass &&
aEvent->mClass != ePointerEventClass &&
aEvent->mClass != eGestureNotifyEventClass &&
aEvent->mClass != NS_TOUCH_EVENT &&

2
widget/BasicEvents.h
Просмотреть файл

@ -48,7 +48,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
// TouchEvents.h
eGestureNotifyEventClass, // WidgetGestureNotifyEvent
NS_SIMPLE_GESTURE_EVENT, // WidgetSimpleGestureEvent
eSimpleGestureEventClass, // WidgetSimpleGestureEvent
NS_TOUCH_EVENT, // WidgetTouchEvent
// ContentEvents.h

6
widget/TouchEvents.h
Просмотреть файл

@ -97,7 +97,7 @@ public:
WidgetSimpleGestureEvent(bool aIsTrusted, uint32_t aMessage,
nsIWidget* aWidget)
: WidgetMouseEventBase(aIsTrusted, aMessage, aWidget,
NS_SIMPLE_GESTURE_EVENT)
eSimpleGestureEventClass)
, allowedDirections(0)
, direction(0)
, delta(0.0)
@ -107,7 +107,7 @@ public:
WidgetSimpleGestureEvent(const WidgetSimpleGestureEvent& aOther)
: WidgetMouseEventBase(aOther.mFlags.mIsTrusted, aOther.message,
aOther.widget, NS_SIMPLE_GESTURE_EVENT)
aOther.widget, eSimpleGestureEventClass)
, allowedDirections(aOther.allowedDirections)
, direction(aOther.direction)
, delta(aOther.delta)
@ -117,7 +117,7 @@ public:
virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
{
MOZ_ASSERT(mClass == NS_SIMPLE_GESTURE_EVENT,
MOZ_ASSERT(mClass == eSimpleGestureEventClass,
"Duplicate() must be overridden by sub class");
// Not copying widget, it is a weak reference.
WidgetSimpleGestureEvent* result =

2
widget/gtk/nsGtkKeyUtils.cpp
Просмотреть файл

@ -651,7 +651,7 @@ KeymapWrapper::InitInputEvent(WidgetInputEvent& aInputEvent,
case eMouseScrollEventClass:
case eWheelEventClass:
case eDragEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
break;
default:
return;

4
widget/windows/KeyboardLayout.cpp
Просмотреть файл

@ -285,7 +285,7 @@ ModifierKeyState::InitInputEvent(WidgetInputEvent& aInputEvent) const
case eMouseScrollEventClass:
case eWheelEventClass:
case eDragEventClass:
case NS_SIMPLE_GESTURE_EVENT:
case eSimpleGestureEventClass:
InitMouseEvent(aInputEvent);
break;
default:
@ -299,7 +299,7 @@ ModifierKeyState::InitMouseEvent(WidgetInputEvent& aMouseEvent) const
NS_ASSERTION(aMouseEvent.mClass == eMouseEventClass ||
aMouseEvent.mClass == eWheelEventClass ||
aMouseEvent.mClass == eDragEventClass ||
aMouseEvent.mClass == NS_SIMPLE_GESTURE_EVENT,
aMouseEvent.mClass == eSimpleGestureEventClass,
"called with non-mouse event");
if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {