Bug 895274 part.48 Rename NS_POINTER_UP to ePointerUp r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-01 00:20:06 +09:00
parent 94b71f3722
commit 0d4cc424b7
5 changed files with 10 additions and 10 deletions

View File

@ -704,7 +704,7 @@ nsDOMWindowUtils::SendPointerEventCommon(const nsAString& aType,
if (aType.EqualsLiteral("pointerdown")) {
msg = ePointerDown;
} else if (aType.EqualsLiteral("pointerup")) {
msg = NS_POINTER_UP;
msg = ePointerUp;
} else if (aType.EqualsLiteral("pointermove")) {
msg = NS_POINTER_MOVE;
} else if (aType.EqualsLiteral("pointerover")) {

View File

@ -319,7 +319,7 @@ EVENT(pointermove,
EventNameType_All,
ePointerEventClass)
EVENT(pointerup,
NS_POINTER_UP,
ePointerUp,
EventNameType_All,
ePointerEventClass)
EVENT(pointercancel,

View File

@ -3008,7 +3008,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
// This break was commented specially
// break;
}
case NS_POINTER_UP: {
case ePointerUp: {
WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent();
// After UP/Cancel Touch pointers become invalid so we can remove relevant helper from Table
// Mouse/Pen pointers are valid all the time (not only between down/up)
@ -4164,7 +4164,7 @@ EventStateManager::GenerateMouseEnterExit(WidgetMouseEvent* aMouseEvent)
}
}
break;
case NS_POINTER_UP:
case ePointerUp:
{
// Get the target content target (mousemove target == mouseover target)
nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aMouseEvent);

View File

@ -6358,7 +6358,7 @@ PresShell::UpdateActivePointerState(WidgetGUIEvent* aEvent)
new PointerInfo(true, pointerEvent->inputSource, pointerEvent->isPrimary));
}
break;
case NS_POINTER_UP:
case ePointerUp:
// In this case we remove information about pointer or turn off active state
if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) {
if(pointerEvent->inputSource != nsIDOMMouseEvent::MOZ_SOURCE_TOUCH) {
@ -6675,7 +6675,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell,
pointerMessage = NS_POINTER_MOVE;
break;
case eMouseUp:
pointerMessage = NS_POINTER_UP;
pointerMessage = ePointerUp;
break;
case eMouseDown:
pointerMessage = ePointerDown;
@ -6701,7 +6701,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell,
pointerMessage = NS_POINTER_MOVE;
break;
case NS_TOUCH_END:
pointerMessage = NS_POINTER_UP;
pointerMessage = ePointerUp;
break;
case NS_TOUCH_START:
pointerMessage = ePointerDown;
@ -7465,10 +7465,10 @@ PresShell::HandleEvent(nsIFrame* aFrame,
frame = capturingFrame;
}
if (pointerEvent->mMessage == NS_POINTER_UP ||
if (pointerEvent->mMessage == ePointerUp ||
pointerEvent->mMessage == ePointerCancel) {
// Implicitly releasing capture for given pointer.
// ePointerLostCapture should be send after NS_POINTER_UP or
// ePointerLostCapture should be send after ePointerUp or
// ePointerCancel.
releasePointerCaptureCaller.SetTarget(pointerId, pointerCapturingContent);
}

View File

@ -65,7 +65,7 @@ NS_EVENT_MESSAGE(eMouseLongTap, eMouseEventFirst + 36)
// Pointer spec events
NS_EVENT_MESSAGE(ePointerEventFirst, 4400)
NS_EVENT_MESSAGE(NS_POINTER_MOVE, ePointerEventFirst)
NS_EVENT_MESSAGE(NS_POINTER_UP, ePointerEventFirst + 1)
NS_EVENT_MESSAGE(ePointerUp, ePointerEventFirst + 1)
NS_EVENT_MESSAGE(ePointerDown, ePointerEventFirst + 2)
NS_EVENT_MESSAGE(ePointerOver, ePointerEventFirst + 22)
NS_EVENT_MESSAGE(ePointerOut, ePointerEventFirst + 23)