diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 2d4662b008c..2669db2ea4e 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -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: diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp index d9a5eb9dddb..28043916424 100644 --- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -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 diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index ffe9452d000..77f3eacfcea 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -283,7 +283,7 @@ EVENT(mousemove, EventNameType_All, eMouseEventClass) EVENT(mouseout, - NS_MOUSE_OUT, + eMouseOut, EventNameType_All, eMouseEventClass) EVENT(mouseover, diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index d96f3bec590..1dc1e245871 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -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 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 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; diff --git a/dom/html/HTMLButtonElement.cpp b/dom/html/HTMLButtonElement.cpp index aa5d8f263dd..0ed8e3442a5 100644 --- a/dom/html/HTMLButtonElement.cpp +++ b/dom/html/HTMLButtonElement.cpp @@ -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); diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 6f466704798..abdecafc293 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -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; diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index 7f4baa1f435..6fcfcc83bf5 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -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 ? diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 82c8a12c54b..d66f61db340 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -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", diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp index 8f3f875cde5..a3fd568b341 100644 --- a/layout/xul/nsMenuFrame.cpp +++ b/layout/xul/nsMenuFrame.cpp @@ -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(); diff --git a/layout/xul/nsScrollBoxFrame.cpp b/layout/xul/nsScrollBoxFrame.cpp index 7c495780f1d..e3de4ed60c9 100644 --- a/layout/xul/nsScrollBoxFrame.cpp +++ b/layout/xul/nsScrollBoxFrame.cpp @@ -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 diff --git a/layout/xul/nsScrollbarButtonFrame.cpp b/layout/xul/nsScrollbarButtonFrame.cpp index f59a7e88206..99af0f7400a 100644 --- a/layout/xul/nsScrollbarButtonFrame.cpp +++ b/layout/xul/nsScrollbarButtonFrame.cpp @@ -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: { diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index 4a4adfa83d0..8a06c613732 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -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); diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp index cdc643ea251..10780395b68 100644 --- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -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; diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 3fe9833deec..1b841477f34 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -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) diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp index 5d8552c0b78..aaf2bf3495b 100644 --- a/widget/WidgetEventImpl.cpp +++ b/widget/WidgetEventImpl.cpp @@ -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;