зеркало из https://github.com/mozilla/gecko-dev.git
Bug 895274 part.36 Rename NS_MOUSEENTER to eMouseEnter r=smaug
This commit is contained in:
Родитель
e41398ce2f
Коммит
af5b384d9a
|
@ -271,7 +271,7 @@ EVENT(mousedown,
|
||||||
EventNameType_All,
|
EventNameType_All,
|
||||||
eMouseEventClass)
|
eMouseEventClass)
|
||||||
EVENT(mouseenter,
|
EVENT(mouseenter,
|
||||||
NS_MOUSEENTER,
|
eMouseEnter,
|
||||||
EventNameType_All,
|
EventNameType_All,
|
||||||
eMouseEventClass)
|
eMouseEventClass)
|
||||||
EVENT(mouseleave,
|
EVENT(mouseleave,
|
||||||
|
|
|
@ -3742,7 +3742,7 @@ EventStateManager::DispatchMouseOrPointerEvent(WidgetMouseEvent* aMouseEvent,
|
||||||
// of a mouse cursor must not be dispatched (for example: mouseover, mouseout).
|
// of a mouse cursor must not be dispatched (for example: mouseover, mouseout).
|
||||||
if (sIsPointerLocked &&
|
if (sIsPointerLocked &&
|
||||||
(aMessage == NS_MOUSELEAVE ||
|
(aMessage == NS_MOUSELEAVE ||
|
||||||
aMessage == NS_MOUSEENTER ||
|
aMessage == eMouseEnter ||
|
||||||
aMessage == eMouseOver ||
|
aMessage == eMouseOver ||
|
||||||
aMessage == eMouseOut)) {
|
aMessage == eMouseOut)) {
|
||||||
mCurrentTargetContent = nullptr;
|
mCurrentTargetContent = nullptr;
|
||||||
|
@ -3853,7 +3853,7 @@ public:
|
||||||
|
|
||||||
~EnterLeaveDispatcher()
|
~EnterLeaveDispatcher()
|
||||||
{
|
{
|
||||||
if (mEventMessage == NS_MOUSEENTER ||
|
if (mEventMessage == eMouseEnter ||
|
||||||
mEventMessage == NS_POINTER_ENTER) {
|
mEventMessage == NS_POINTER_ENTER) {
|
||||||
for (int32_t i = mTargets.Count() - 1; i >= 0; --i) {
|
for (int32_t i = mTargets.Count() - 1; i >= 0; --i) {
|
||||||
mESM->DispatchMouseOrPointerEvent(mMouseEvent, mEventMessage,
|
mESM->DispatchMouseOrPointerEvent(mMouseEvent, mEventMessage,
|
||||||
|
@ -3991,7 +3991,7 @@ EventStateManager::NotifyMouseOver(WidgetMouseEvent* aMouseEvent,
|
||||||
Maybe<EnterLeaveDispatcher> enterDispatcher;
|
Maybe<EnterLeaveDispatcher> enterDispatcher;
|
||||||
if (dispatch) {
|
if (dispatch) {
|
||||||
enterDispatcher.emplace(this, aContent, lastOverElement, aMouseEvent,
|
enterDispatcher.emplace(this, aContent, lastOverElement, aMouseEvent,
|
||||||
isPointer ? NS_POINTER_ENTER : NS_MOUSEENTER);
|
isPointer ? NS_POINTER_ENTER : eMouseEnter);
|
||||||
}
|
}
|
||||||
|
|
||||||
NotifyMouseOut(aMouseEvent, aContent);
|
NotifyMouseOut(aMouseEvent, aContent);
|
||||||
|
|
|
@ -58,7 +58,7 @@ NS_EVENT_MESSAGE(eMouseActivate, eMouseEventFirst + 30)
|
||||||
NS_EVENT_MESSAGE(eMouseOver, eMouseEventFirst + 31)
|
NS_EVENT_MESSAGE(eMouseOver, eMouseEventFirst + 31)
|
||||||
NS_EVENT_MESSAGE(eMouseOut, eMouseEventFirst + 32)
|
NS_EVENT_MESSAGE(eMouseOut, eMouseEventFirst + 32)
|
||||||
NS_EVENT_MESSAGE(eMouseHitTest, eMouseEventFirst + 33)
|
NS_EVENT_MESSAGE(eMouseHitTest, eMouseEventFirst + 33)
|
||||||
NS_EVENT_MESSAGE(NS_MOUSEENTER, eMouseEventFirst + 34)
|
NS_EVENT_MESSAGE(eMouseEnter, eMouseEventFirst + 34)
|
||||||
NS_EVENT_MESSAGE(NS_MOUSELEAVE, eMouseEventFirst + 35)
|
NS_EVENT_MESSAGE(NS_MOUSELEAVE, eMouseEventFirst + 35)
|
||||||
NS_EVENT_MESSAGE(NS_MOUSE_MOZLONGTAP, eMouseEventFirst + 36)
|
NS_EVENT_MESSAGE(NS_MOUSE_MOZLONGTAP, eMouseEventFirst + 36)
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,7 @@ protected:
|
||||||
, clickCount(0)
|
, clickCount(0)
|
||||||
{
|
{
|
||||||
switch (aMessage) {
|
switch (aMessage) {
|
||||||
case NS_MOUSEENTER:
|
case eMouseEnter:
|
||||||
case NS_MOUSELEAVE:
|
case NS_MOUSELEAVE:
|
||||||
mFlags.mBubbles = false;
|
mFlags.mBubbles = false;
|
||||||
mFlags.mCancelable = false;
|
mFlags.mCancelable = false;
|
||||||
|
@ -224,7 +224,7 @@ public:
|
||||||
reason(aReason), context(aContext), exit(eChild), clickCount(0)
|
reason(aReason), context(aContext), exit(eChild), clickCount(0)
|
||||||
{
|
{
|
||||||
switch (aMessage) {
|
switch (aMessage) {
|
||||||
case NS_MOUSEENTER:
|
case eMouseEnter:
|
||||||
case NS_MOUSELEAVE:
|
case NS_MOUSELEAVE:
|
||||||
mFlags.mBubbles = false;
|
mFlags.mBubbles = false;
|
||||||
mFlags.mCancelable = false;
|
mFlags.mCancelable = false;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче