diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index eebd6a4b1363..288a75fe498e 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -702,7 +702,7 @@ nsDOMWindowUtils::SendPointerEventCommon(const nsAString& aType, EventMessage msg; if (aType.EqualsLiteral("pointerdown")) { - msg = NS_POINTER_DOWN; + msg = ePointerDown; } else if (aType.EqualsLiteral("pointerup")) { msg = NS_POINTER_UP; } else if (aType.EqualsLiteral("pointermove")) { diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index 8fdd6717a9ac..19195dc4cbcb 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -311,7 +311,7 @@ EVENT(mozpointerlockerror, EventNameType_HTML, eBasicEventClass) EVENT(pointerdown, - NS_POINTER_DOWN, + ePointerDown, EventNameType_All, ePointerEventClass) EVENT(pointermove, diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index d638f50e474f..feeab9fec8e0 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -630,7 +630,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext, break; } case eMouseMove: - case NS_POINTER_DOWN: + case ePointerDown: case NS_POINTER_MOVE: { // on the Mac, GenerateDragGesture() may not return until the drag // has completed and so |aTargetFrame| may have been deleted (moving @@ -4149,7 +4149,7 @@ EventStateManager::GenerateMouseEnterExit(WidgetMouseEvent* aMouseEvent) } case NS_POINTER_MOVE: - case NS_POINTER_DOWN: + case ePointerDown: { // Get the target content target (mousemove target == mouseover target) nsCOMPtr targetElement = GetEventTargetContent(aMouseEvent); diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 16fb1cae0ceb..ec7fd796cb5c 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -6351,7 +6351,7 @@ PresShell::UpdateActivePointerState(WidgetGUIEvent* aEvent) new PointerInfo(false, mouseEvent->inputSource, true)); } break; - case NS_POINTER_DOWN: + case ePointerDown: // In this case we switch pointer to active state if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) { gActivePointersIds->Put(pointerEvent->pointerId, @@ -6678,7 +6678,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell, pointerMessage = NS_POINTER_UP; break; case eMouseDown: - pointerMessage = NS_POINTER_DOWN; + pointerMessage = ePointerDown; break; default: return NS_OK; @@ -6704,7 +6704,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell, pointerMessage = NS_POINTER_UP; break; case NS_TOUCH_START: - pointerMessage = NS_POINTER_DOWN; + pointerMessage = ePointerDown; break; case NS_TOUCH_CANCEL: pointerMessage = ePointerCancel; @@ -7450,7 +7450,7 @@ PresShell::HandleEvent(nsIFrame* aFrame, } if (aEvent->mClass == ePointerEventClass && - aEvent->mMessage != NS_POINTER_DOWN) { + aEvent->mMessage != ePointerDown) { if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) { uint32_t pointerId = pointerEvent->pointerId; nsIContent* pointerCapturingContent = GetPointerCapturingContent(pointerId); diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 306326dc7136..66ae622d2e91 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -66,7 +66,7 @@ NS_EVENT_MESSAGE(eMouseLongTap, eMouseEventFirst + 36) NS_EVENT_MESSAGE(ePointerEventFirst, 4400) NS_EVENT_MESSAGE(NS_POINTER_MOVE, ePointerEventFirst) NS_EVENT_MESSAGE(NS_POINTER_UP, ePointerEventFirst + 1) -NS_EVENT_MESSAGE(NS_POINTER_DOWN, ePointerEventFirst + 2) +NS_EVENT_MESSAGE(ePointerDown, ePointerEventFirst + 2) NS_EVENT_MESSAGE(ePointerOver, ePointerEventFirst + 22) NS_EVENT_MESSAGE(ePointerOut, ePointerEventFirst + 23) NS_EVENT_MESSAGE(ePointerEnter, ePointerEventFirst + 24)