corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 895274 part.47 Rename NS_POINTER_DOWN to ePointerDown r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano
2015-09-01 00:20:06 +09:00
parent 734fa8bb36
commit ed20b51fed
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsDOMWindowUtils.cpp
View File

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

2
dom/events/EventNameList.h
View File

@@ -311,7 +311,7 @@ EVENT(mozpointerlockerror,
EventNameType_HTML, EventNameType_HTML,
eBasicEventClass) eBasicEventClass)
EVENT(pointerdown, EVENT(pointerdown,
NS_POINTER_DOWN, ePointerDown,
EventNameType_All, EventNameType_All,
ePointerEventClass) ePointerEventClass)
EVENT(pointermove, EVENT(pointermove,

4
dom/events/EventStateManager.cpp
View File

@@ -630,7 +630,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
break; break;
} }
case eMouseMove: case eMouseMove:
case NS_POINTER_DOWN: case ePointerDown:
case NS_POINTER_MOVE: { case NS_POINTER_MOVE: {
// on the Mac, GenerateDragGesture() may not return until the drag // on the Mac, GenerateDragGesture() may not return until the drag
// has completed and so |aTargetFrame| may have been deleted (moving // 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_MOVE:
case NS_POINTER_DOWN: case ePointerDown:
{ {
// Get the target content target (mousemove target == mouseover target) // Get the target content target (mousemove target == mouseover target)
nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aMouseEvent); nsCOMPtr<nsIContent> targetElement = GetEventTargetContent(aMouseEvent);

8
layout/base/nsPresShell.cpp
View File

@@ -6351,7 +6351,7 @@ PresShell::UpdateActivePointerState(WidgetGUIEvent* aEvent)
new PointerInfo(false, mouseEvent->inputSource, true)); new PointerInfo(false, mouseEvent->inputSource, true));
} }
break; break;
case NS_POINTER_DOWN: case ePointerDown:
// In this case we switch pointer to active state // In this case we switch pointer to active state
if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) { if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) {
gActivePointersIds->Put(pointerEvent->pointerId, gActivePointersIds->Put(pointerEvent->pointerId,
@@ -6678,7 +6678,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell,
pointerMessage = NS_POINTER_UP; pointerMessage = NS_POINTER_UP;
break; break;
case eMouseDown: case eMouseDown:
pointerMessage = NS_POINTER_DOWN; pointerMessage = ePointerDown;
break; break;
default: default:
return NS_OK; return NS_OK;
@@ -6704,7 +6704,7 @@ DispatchPointerFromMouseOrTouch(PresShell* aShell,
pointerMessage = NS_POINTER_UP; pointerMessage = NS_POINTER_UP;
break; break;
case NS_TOUCH_START: case NS_TOUCH_START:
pointerMessage = NS_POINTER_DOWN; pointerMessage = ePointerDown;
break; break;
case NS_TOUCH_CANCEL: case NS_TOUCH_CANCEL:
pointerMessage = ePointerCancel; pointerMessage = ePointerCancel;
@@ -7450,7 +7450,7 @@ PresShell::HandleEvent(nsIFrame* aFrame,
} }
if (aEvent->mClass == ePointerEventClass && if (aEvent->mClass == ePointerEventClass &&
aEvent->mMessage != NS_POINTER_DOWN) { aEvent->mMessage != ePointerDown) {
if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) { if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) {
uint32_t pointerId = pointerEvent->pointerId; uint32_t pointerId = pointerEvent->pointerId;
nsIContent* pointerCapturingContent = GetPointerCapturingContent(pointerId); nsIContent* pointerCapturingContent = GetPointerCapturingContent(pointerId);

2
widget/EventMessageList.h
View File

@@ -66,7 +66,7 @@ NS_EVENT_MESSAGE(eMouseLongTap, eMouseEventFirst + 36)
NS_EVENT_MESSAGE(ePointerEventFirst, 4400) NS_EVENT_MESSAGE(ePointerEventFirst, 4400)
NS_EVENT_MESSAGE(NS_POINTER_MOVE, ePointerEventFirst) NS_EVENT_MESSAGE(NS_POINTER_MOVE, ePointerEventFirst)
NS_EVENT_MESSAGE(NS_POINTER_UP, ePointerEventFirst + 1) 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(ePointerOver, ePointerEventFirst + 22)
NS_EVENT_MESSAGE(ePointerOut, ePointerEventFirst + 23) NS_EVENT_MESSAGE(ePointerOut, ePointerEventFirst + 23)
NS_EVENT_MESSAGE(ePointerEnter, ePointerEventFirst + 24) NS_EVENT_MESSAGE(ePointerEnter, ePointerEventFirst + 24)