Bug 895274 part.34 Rename NS_MOUSE_OUT to eMouseOut r=smaug

This commit is contained in:
Masayuki Nakano 2015-08-29 08:58:32 +09:00
parent d2a1275d90
commit 8dea5f8abf
15 changed files with 22 additions and 22 deletions

View File

@ -2870,7 +2870,7 @@ Element::PreHandleEventForLinks(EventChainPreVisitor& aVisitor)
switch (aVisitor.mEvent->mMessage) {
case eMouseOver:
case NS_FOCUS_CONTENT:
case NS_MOUSE_OUT:
case eMouseOut:
case NS_BLUR_CONTENT:
break;
default:
@ -2904,7 +2904,7 @@ Element::PreHandleEventForLinks(EventChainPreVisitor& aVisitor)
}
break;
}
case NS_MOUSE_OUT:
case eMouseOut:
aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
// FALL THROUGH
case NS_BLUR_CONTENT:

View File

@ -678,7 +678,7 @@ nsIContent::PreHandleEvent(EventChainPreVisitor& aVisitor)
// inside chrome access only content.
bool isAnonForEvents = IsRootOfChromeAccessOnlySubtree();
if ((aVisitor.mEvent->mMessage == eMouseOver ||
aVisitor.mEvent->mMessage == NS_MOUSE_OUT ||
aVisitor.mEvent->mMessage == eMouseOut ||
aVisitor.mEvent->mMessage == NS_POINTER_OVER ||
aVisitor.mEvent->mMessage == NS_POINTER_OUT) &&
// Check if we should stop event propagation when event has just been

View File

@ -283,7 +283,7 @@ EVENT(mousemove,
EventNameType_All,
eMouseEventClass)
EVENT(mouseout,
NS_MOUSE_OUT,
eMouseOut,
EventNameType_All,
eMouseEventClass)
EVENT(mouseover,

View File

@ -3744,7 +3744,7 @@ EventStateManager::DispatchMouseOrPointerEvent(WidgetMouseEvent* aMouseEvent,
(aMessage == NS_MOUSELEAVE ||
aMessage == NS_MOUSEENTER ||
aMessage == eMouseOver ||
aMessage == NS_MOUSE_OUT)) {
aMessage == eMouseOut)) {
mCurrentTargetContent = nullptr;
nsCOMPtr<Element> pointerLockedElement =
do_QueryReferent(EventStateManager::sPointerLockedElement);
@ -3789,7 +3789,7 @@ EventStateManager::DispatchMouseOrPointerEvent(WidgetMouseEvent* aMouseEvent,
// If we are entering/leaving remote content, dispatch a mouse enter/exit
// event to the remote frame.
if (IsRemoteTarget(aTargetContent)) {
if (aMessage == NS_MOUSE_OUT) {
if (aMessage == eMouseOut) {
// For remote content, send a "top-level" widget mouse exit event.
nsAutoPtr<WidgetMouseEvent> remoteEvent;
CreateMouseOrPointerWidgetEvent(aMouseEvent, eMouseExitFromWidget,
@ -3935,7 +3935,7 @@ EventStateManager::NotifyMouseOut(WidgetMouseEvent* aMouseEvent,
isPointer ? NS_POINTER_LEAVE : NS_MOUSELEAVE);
// Fire mouseout
DispatchMouseOrPointerEvent(aMouseEvent, isPointer ? NS_POINTER_OUT : NS_MOUSE_OUT,
DispatchMouseOrPointerEvent(aMouseEvent, isPointer ? NS_POINTER_OUT : eMouseOut,
wrapper->mLastOverElement, aMovingInto);
wrapper->mLastOverFrame = nullptr;

View File

@ -355,7 +355,7 @@ HTMLButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
break;
// XXX this doesn't seem to do anything yet
case NS_MOUSE_OUT:
case eMouseOut:
{
aVisitor.mPresContext->EventStateManager()->
SetContentState(nullptr, NS_EVENT_STATE_HOVER);

View File

@ -3029,7 +3029,7 @@ HTMLInputElement::NeedToInitializeEditorForEvent(
case eMouseEnterIntoWidget:
case eMouseExitFromWidget:
case eMouseOver:
case NS_MOUSE_OUT:
case eMouseOut:
case NS_SCROLLPORT_UNDERFLOW:
case NS_SCROLLPORT_OVERFLOW:
return false;

View File

@ -1810,7 +1810,7 @@ CocoaEventTypeForEvent(const WidgetGUIEvent& anEvent, nsIFrame* aObjectFrame)
switch (anEvent.mMessage) {
case eMouseOver:
return NPCocoaEventMouseEntered;
case NS_MOUSE_OUT:
case eMouseOut:
return NPCocoaEventMouseExited;
case eMouseMove: {
// We don't know via information on events from the widget code whether or not
@ -1852,7 +1852,7 @@ TranslateToNPCocoaEvent(WidgetGUIEvent* anEvent, nsIFrame* aObjectFrame)
anEvent->mMessage == eMouseUp ||
anEvent->mMessage == NS_MOUSE_SCROLL ||
anEvent->mMessage == eMouseOver ||
anEvent->mMessage == NS_MOUSE_OUT)
anEvent->mMessage == eMouseOut)
{
nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(anEvent, aObjectFrame) -
aObjectFrame->GetContentRectRelativeToSelf().TopLeft();
@ -2108,7 +2108,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent)
anEvent.mMessage == eMouseUp ||
anEvent.mMessage == eMouseDoubleClick ||
anEvent.mMessage == eMouseOver ||
anEvent.mMessage == NS_MOUSE_OUT ||
anEvent.mMessage == eMouseOut ||
anEvent.mMessage == eMouseMove,
"Incorrect event type for coordinate translation");
nsPoint pt =
@ -2196,7 +2196,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent)
switch (anEvent.mMessage) {
case eMouseOver:
case NS_MOUSE_OUT:
case eMouseOut:
{
XCrossingEvent& event = pluginEvent.xcrossing;
event.type = anEvent.mMessage == eMouseOver ?

View File

@ -891,7 +891,7 @@ nsListControlFrame::HandleEvent(nsPresContext* aPresContext,
"NS_MOUSE_RIGHT_BUTTON_UP",
"NS_MOUSE_RIGHT_BUTTON_DOWN",
"eMouseOver",
"NS_MOUSE_OUT",
"eMouseOut",
"NS_MOUSE_LEFT_DOUBLECLICK",
"NS_MOUSE_MIDDLE_DOUBLECLICK",
"NS_MOUSE_RIGHT_DOUBLECLICK",

View File

@ -459,7 +459,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext,
*aEventStatus = nsEventStatus_eConsumeNoDefault;
Execute(aEvent);
}
else if (aEvent->mMessage == NS_MOUSE_OUT) {
else if (aEvent->mMessage == eMouseOut) {
// Kill our timer if one is active.
if (mOpenTimer) {
mOpenTimer->Cancel();

View File

@ -96,7 +96,7 @@ nsAutoRepeatBoxFrame::HandleEvent(nsPresContext* aPresContext,
break;
case eMouseExitFromWidget:
case NS_MOUSE_OUT:
case eMouseOut:
// always stop on mouse exit
StopRepeat();
// Not really necessary but do this to be safe

View File

@ -63,7 +63,7 @@ nsScrollbarButtonFrame::HandleEvent(nsPresContext* aPresContext,
case eMouseUp:
HandleRelease(aPresContext, aEvent, aEventStatus);
break;
case NS_MOUSE_OUT:
case eMouseOut:
mCursorOnThis = false;
break;
case eMouseMove: {

View File

@ -610,13 +610,13 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
#endif
// XXX hack until handle release is actually called in nsframe.
// if (aEvent->mMessage == NS_MOUSE_OUT ||
// if (aEvent->mMessage == eMouseOut ||
// aEvent->mMessage == NS_MOUSE_RIGHT_BUTTON_UP ||
// aEvent->mMessage == NS_MOUSE_LEFT_BUTTON_UP) {
// HandleRelease(aPresContext, aEvent, aEventStatus);
// }
if (aEvent->mMessage == NS_MOUSE_OUT && mChange)
if (aEvent->mMessage == eMouseOut && mChange)
HandleRelease(aPresContext, aEvent, aEventStatus);
return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);

View File

@ -2576,7 +2576,7 @@ nsTreeBodyFrame::HandleEvent(nsPresContext* aPresContext,
if (mMouseOverRow != -1)
InvalidateRow(mMouseOverRow);
}
} else if (aEvent->mMessage == NS_MOUSE_OUT) {
} else if (aEvent->mMessage == eMouseOut) {
if (mMouseOverRow != -1) {
InvalidateRow(mMouseOverRow);
mMouseOverRow = -1;

View File

@ -56,7 +56,7 @@ NS_EVENT_MESSAGE(eMouseClick, eMouseEventFirst + 27)
// eMouseActivate is fired when the widget is activated by a click.
NS_EVENT_MESSAGE(eMouseActivate, eMouseEventFirst + 30)
NS_EVENT_MESSAGE(eMouseOver, eMouseEventFirst + 31)
NS_EVENT_MESSAGE(NS_MOUSE_OUT, eMouseEventFirst + 32)
NS_EVENT_MESSAGE(eMouseOut, eMouseEventFirst + 32)
NS_EVENT_MESSAGE(NS_MOUSE_MOZHITTEST, eMouseEventFirst + 33)
NS_EVENT_MESSAGE(NS_MOUSEENTER, eMouseEventFirst + 34)
NS_EVENT_MESSAGE(NS_MOUSELEAVE, eMouseEventFirst + 35)

View File

@ -86,7 +86,7 @@ WidgetEvent::HasMouseEventMessage() const
case eMouseExitFromWidget:
case eMouseActivate:
case eMouseOver:
case NS_MOUSE_OUT:
case eMouseOut:
case NS_MOUSE_MOZHITTEST:
case eMouseMove:
return true;