Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1675847 - part 1: Rename eMouseClick and eMouseAuxClick r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D212999
This commit is contained in:
Masayuki Nakano 2024-06-14 00:18:46 +00:00
parent ae22ac0c53
commit 2fb07300f9
29 changed files with 79 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/base/Element.cpp
View File

@ -2363,7 +2363,7 @@ nsresult Element::DispatchClickEvent(nsPresContext* aPresContext,
MOZ_ASSERT(aSourceEvent, "Must have source event");
MOZ_ASSERT(aStatus, "Null out param?");
WidgetMouseEvent event(aSourceEvent->IsTrusted(), eMouseClick,
WidgetMouseEvent event(aSourceEvent->IsTrusted(), ePointerClick,
aSourceEvent->mWidget, WidgetMouseEvent::eReal);
event.mRefPoint = aSourceEvent->mRefPoint;
uint32_t clickCount = 1;
@ -3194,7 +3194,7 @@ bool Element::CheckHandleEventForLinksPrecondition(
}
if (aVisitor.mEventStatus == nsEventStatus_eConsumeNoDefault ||
(!aVisitor.mEvent->IsTrusted() &&
(aVisitor.mEvent->mMessage != eMouseClick) &&
(aVisitor.mEvent->mMessage != ePointerClick) &&
(aVisitor.mEvent->mMessage != eKeyPress) &&
(aVisitor.mEvent->mMessage != eLegacyDOMActivate)) ||
aVisitor.mEvent->mFlags.mMultipleActionsPrevented) {
@ -3273,8 +3273,8 @@ void Element::GetEventTargetParentForLinks(EventChainPreVisitor& aVisitor) {
// Only supported for click or auxclick events.
void Element::DispatchChromeOnlyLinkClickEvent(
EventChainPostVisitor& aVisitor) {
MOZ_ASSERT(aVisitor.mEvent->mMessage == eMouseAuxClick ||
aVisitor.mEvent->mMessage == eMouseClick,
MOZ_ASSERT(aVisitor.mEvent->mMessage == ePointerAuxClick ||
aVisitor.mEvent->mMessage == ePointerClick,
"DispatchChromeOnlyLinkClickEvent supports only click and "
"auxclick source events");
Document* doc = OwnerDoc();
@ -3310,8 +3310,8 @@ nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
// IMPORTANT: this switch and the switch below it must be kept in sync!
switch (aVisitor.mEvent->mMessage) {
case eMouseDown:
case eMouseClick:
case eMouseAuxClick:
case ePointerClick:
case ePointerAuxClick:
case eLegacyDOMActivate:
case eKeyPress:
break;
@ -3377,7 +3377,7 @@ nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
}
} break;
case eMouseClick: {
case ePointerClick: {
WidgetMouseEvent* mouseEvent = aVisitor.mEvent->AsMouseEvent();
if (mouseEvent->IsLeftClickEvent()) {
if (!mouseEvent->IsControl() && !mouseEvent->IsMeta() &&
@ -3416,13 +3416,13 @@ nsresult Element::PostHandleEventForLinks(EventChainPostVisitor& aVisitor) {
}
break;
}
case eMouseAuxClick: {
case ePointerAuxClick: {
DispatchChromeOnlyLinkClickEvent(aVisitor);
break;
}
case eLegacyDOMActivate: {
// If you modify this code, tweak also the code handling
// eMouseClick.
// ePointerClick.
if (aVisitor.mEvent->mOriginalTarget == this) {
if (nsCOMPtr<nsIURI> absURI = GetHrefURI()) {
nsAutoString target;

8
dom/base/PopupBlocker.cpp
View File

@ -214,7 +214,7 @@ PopupBlocker::PopupControlState PopupBlocker::GetEventPopupControlState(
uint32_t key = aEvent->AsKeyboardEvent()->mKeyCode;
switch (aEvent->mMessage) {
case eKeyPress:
// return key on focused button. see note at eMouseClick.
// return key on focused button. see note at ePointerClick.
if (key == NS_VK_RETURN) {
abuse = PopupBlocker::openAllowed;
} else if (PopupAllowedForEvent("keypress")) {
@ -222,7 +222,7 @@ PopupBlocker::PopupControlState PopupBlocker::GetEventPopupControlState(
}
break;
case eKeyUp:
// space key on focused button. see note at eMouseClick.
// space key on focused button. see note at ePointerClick.
if (key == NS_VK_SPACE) {
abuse = PopupBlocker::openAllowed;
} else if (PopupAllowedForEvent("keyup")) {
@ -274,7 +274,7 @@ PopupBlocker::PopupControlState PopupBlocker::GetEventPopupControlState(
abuse = PopupBlocker::openControlled;
}
break;
case eMouseClick:
case ePointerClick:
/* Click events get special treatment because of their
historical status as a more legitimate event handler. If
click popups are enabled in the prefs, clear the popup
@ -291,7 +291,7 @@ PopupBlocker::PopupControlState PopupBlocker::GetEventPopupControlState(
default:
break;
}
} else if (aEvent->mMessage == eMouseAuxClick) {
} else if (aEvent->mMessage == ePointerAuxClick) {
// Not eLeftButton
// There's not a strong reason to ignore other events (eg eMouseUp)
// for non-primary clicks as far as we know, so we could add them if

2
dom/base/UserActivation.cpp
View File

@ -94,10 +94,10 @@ bool UserActivation::IsUserInteractionEvent(const WidgetEvent* aEvent) {
return aEvent->AsKeyboardEvent()->CanTreatAsUserInput();
// eBasicEventClass
// eMouseEventClass
case eMouseClick:
case eMouseDown:
case eMouseUp:
// ePointerEventClass
case ePointerClick:
case ePointerDown:
case ePointerUp:
// eTouchEventClass

6
dom/events/EventDispatcher.cpp
View File

@ -1114,7 +1114,7 @@ nsresult EventDispatcher::Dispatch(EventTarget* aTarget,
RefPtr<nsRefreshDriver> refreshDriver;
if (aEvent->IsTrusted() &&
(aEvent->mMessage == eKeyPress ||
aEvent->mMessage == eMouseClick) &&
aEvent->mMessage == ePointerClick) &&
aPresContext && aPresContext->GetRootPresContext()) {
refreshDriver = aPresContext->GetRootPresContext()->RefreshDriver();
if (refreshDriver) {
@ -1225,7 +1225,7 @@ nsresult EventDispatcher::Dispatch(EventTarget* aTarget,
if (aEvent->IsTrusted() &&
(aEvent->mMessage == eKeyPress ||
aEvent->mMessage == eMouseClick) &&
aEvent->mMessage == ePointerClick) &&
aPresContext && aPresContext->GetRootPresContext()) {
nsRefreshDriver* driver =
aPresContext->GetRootPresContext()->RefreshDriver();
@ -1236,7 +1236,7 @@ nsresult EventDispatcher::Dispatch(EventTarget* aTarget,
{layers::CompositionPayloadType::eKeyPress,
aEvent->mTimeStamp});
break;
case eMouseClick: {
case ePointerClick: {
if (aEvent->AsMouseEvent()->mInputSource ==
MouseEvent_Binding::MOZ_SOURCE_MOUSE ||
aEvent->AsMouseEvent()->mInputSource ==

4
dom/events/EventNameList.h
View File

@ -158,8 +158,8 @@ EVENT(CheckboxStateChange, eFormCheckboxStateChange, EventNameType_None,
eBasicEventClass)
EVENT(RadioStateChange, eFormRadioStateChange, EventNameType_None,
eBasicEventClass)
EVENT(auxclick, eMouseAuxClick, EventNameType_All, eMouseEventClass)
EVENT(click, eMouseClick, EventNameType_All, eMouseEventClass)
EVENT(auxclick, ePointerAuxClick, EventNameType_All, eMouseEventClass)
EVENT(click, ePointerClick, EventNameType_All, eMouseEventClass)
EVENT(close, eClose, EventNameType_HTMLXUL, eBasicEventClass)
EVENT(contextmenu, eContextMenu,
EventNameType_HTMLXUL | EventNameType_SVGGraphic, eMouseEventClass)

13
dom/events/EventStateManager.cpp
View File

@ -754,8 +754,8 @@ void EventStateManager::TryToFlushPendingNotificationsToIME() {
static bool IsMessageMouseUserActivity(EventMessage aMessage) {
return aMessage == eMouseMove || aMessage == eMouseUp ||
aMessage == eMouseDown || aMessage == eMouseAuxClick ||
aMessage == eMouseDoubleClick || aMessage == eMouseClick ||
aMessage == eMouseDown || aMessage == ePointerAuxClick ||
aMessage == eMouseDoubleClick || aMessage == ePointerClick ||
aMessage == eMouseActivate || aMessage == eMouseLongTap;
}
@ -6014,7 +6014,7 @@ nsresult EventStateManager::DispatchClickEvents(
AutoWeakFrame currentTarget = aClickTarget->GetPrimaryFrame();
nsresult rv = InitAndDispatchClickEvent(
aMouseUpEvent, aStatus, eMouseClick, aPresShell, aClickTarget,
aMouseUpEvent, aStatus, ePointerClick, aPresShell, aClickTarget,
currentTarget, notDispatchToContents, aOverrideClickTarget);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
@ -6023,10 +6023,11 @@ nsresult EventStateManager::DispatchClickEvents(
// Fire auxclick event if necessary.
if (fireAuxClick && *aStatus != nsEventStatus_eConsumeNoDefault &&
aClickTarget && aClickTarget->IsInComposedDoc()) {
rv = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseAuxClick,
rv = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, ePointerAuxClick,
aPresShell, aClickTarget, currentTarget,
false, aOverrideClickTarget);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to dispatch eMouseAuxClick");
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Failed to dispatch ePointerAuxClick");
}
// Fire double click event if click count is 2.
@ -6048,7 +6049,7 @@ nsresult EventStateManager::HandleMiddleClickPaste(
nsEventStatus* aStatus, EditorBase* aEditorBase) {
MOZ_ASSERT(aPresShell);
MOZ_ASSERT(aMouseEvent);
MOZ_ASSERT((aMouseEvent->mMessage == eMouseAuxClick &&
MOZ_ASSERT((aMouseEvent->mMessage == ePointerAuxClick &&
aMouseEvent->mButton == MouseButton::eMiddle) ||
EventCausesClickEvents(*aMouseEvent));
MOZ_ASSERT(aStatus);

18
dom/events/EventStateManager.h
View File

@ -496,7 +496,7 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
*
* @param aPresShell The PresShell for the ESM. This lifetime
* should be guaranteed by the caller.
* @param aMouseEvent The eMouseClick event which caused the
* @param aMouseEvent The ePointerClick event which caused the
* paste.
* @param aStatus The event status of aMouseEvent.
* @param aEditorBase EditorBase which may be pasted the
@ -610,8 +610,8 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
* If the status indicates consumed, the
* value won't be overwritten with
* nsEventStatus_eIgnore.
* @param aMessage Should be eMouseClick, eMouseDoubleClick or
* eMouseAuxClick.
* @param aMessage Should be ePointerClick, eMouseDoubleClick
* or ePointerAuxClick.
* @param aPresShell The PresShell.
* @param aMouseUpContent The event target of aMouseUpEvent.
* @param aCurrentTarget Current target of the caller.
@ -634,8 +634,8 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
/**
* EventCausesClickEvents() returns true when aMouseEvent is an eMouseUp
* event and it should cause eMouseClick, eMouseDoubleClick and/or
* eMouseAuxClick events. Note that this method assumes that
* event and it should cause ePointerClick, eMouseDoubleClick and/or
* ePointerAuxClick events. Note that this method assumes that
* aMouseEvent.mClickCount has already been initialized with SetClickCount().
*/
static bool EventCausesClickEvents(const WidgetMouseEvent& aMouseEvent);
@ -660,8 +660,8 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
nsIContent* aOverrideClickTarget);
/**
* DispatchClickEvents() dispatches eMouseClick, eMouseDoubleClick and
* eMouseAuxClick events for aMouseUpEvent. aMouseUpEvent should cause
* DispatchClickEvents() dispatches ePointerClick, eMouseDoubleClick and
* ePointerAuxClick events for aMouseUpEvent. aMouseUpEvent should cause
* click event.
*
* @param aPresShell The PresShell.
@ -1402,8 +1402,8 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
// Click and double-click events need to be handled even for content that
// has no frame. This is required for Web compatibility.
#define NS_EVENT_NEEDS_FRAME(event) \
((event)->mMessage != eMouseClick && \
((event)->mMessage != ePointerClick && \
(event)->mMessage != eMouseDoubleClick && \
(event)->mMessage != eMouseAuxClick)
(event)->mMessage != ePointerAuxClick)
#endif // mozilla_EventStateManager_h_

4
dom/events/WheelHandlingHelper.cpp
View File

@ -315,8 +315,8 @@ void WheelTransaction::OnEvent(WidgetEvent* aEvent) {
case eMouseUp:
case eMouseDown:
case eMouseDoubleClick:
case eMouseAuxClick:
case eMouseClick:
case ePointerAuxClick:
case ePointerClick:
case eContextMenu:
case eDrop:
EndTransaction();

5
dom/html/HTMLInputElement.cpp
View File

@ -2987,7 +2987,8 @@ void HTMLInputElement::MaybeSubmitForm(nsPresContext* aPresContext) {
// Get the default submit element
if (RefPtr<nsGenericHTMLFormElement> submitContent =
mForm->GetDefaultSubmitElement()) {
WidgetMouseEvent event(true, eMouseClick, nullptr, WidgetMouseEvent::eReal);
WidgetMouseEvent event(true, ePointerClick, nullptr,
WidgetMouseEvent::eReal);
nsEventStatus status = nsEventStatus_eIgnore;
presShell->HandleDOMEventWithTarget(submitContent, &event, &status);
} else if (!mForm->ImplicitSubmissionIsDisabled()) {
@ -3982,7 +3983,7 @@ nsresult HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
break;
}
#endif
case eMouseClick: {
case ePointerClick: {
if (!aVisitor.mEvent->DefaultPrevented() &&
aVisitor.mEvent->IsTrusted() &&
aVisitor.mEvent->AsMouseEvent()->mButton ==

4
dom/html/HTMLLabelElement.cpp
View File

@ -95,7 +95,7 @@ nsresult HTMLLabelElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
case eMouseDown:
if (mouseEvent->mButton == MouseButton::ePrimary) {
// We reset the mouse-down point on every event because there is
// no guarantee we will reach the eMouseClick code below.
// no guarantee we will reach the ePointerClick code below.
LayoutDeviceIntPoint* curPoint =
new LayoutDeviceIntPoint(mouseEvent->mRefPoint);
SetProperty(nsGkAtoms::labelMouseDownPtProperty,
@ -104,7 +104,7 @@ nsresult HTMLLabelElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
}
break;
case eMouseClick:
case ePointerClick:
if (mouseEvent->IsLeftClickEvent()) {
LayoutDeviceIntPoint* mouseDownPoint =
static_cast<LayoutDeviceIntPoint*>(

2
dom/html/HTMLMediaElement.cpp
View File

@ -4766,7 +4766,7 @@ void HTMLMediaElement::GetEventTargetParent(EventChainPreVisitor& aVisitor) {
// content, since we always do that for touchstart.
case eTouchMove:
case eTouchStart:
case eMouseClick:
case ePointerClick:
case eMouseDoubleClick:
case eMouseDown:
case eMouseUp:

4
dom/html/nsGenericHTMLElement.cpp
View File

@ -2303,7 +2303,7 @@ void nsGenericHTMLElement::Click(CallerType aCallerType) {
SetHandlingClick();
// Mark this event trusted if Click() is called from system code.
WidgetMouseEvent event(aCallerType == CallerType::System, eMouseClick,
WidgetMouseEvent event(aCallerType == CallerType::System, ePointerClick,
nullptr, WidgetMouseEvent::eReal);
event.mFlags.mIsPositionless = true;
event.mInputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN;
@ -2459,7 +2459,7 @@ void nsGenericHTMLElement::HandleKeyboardActivation(
nsresult nsGenericHTMLElement::DispatchSimulatedClick(
nsGenericHTMLElement* aElement, bool aIsTrusted,
nsPresContext* aPresContext) {
WidgetMouseEvent event(aIsTrusted, eMouseClick, nullptr,
WidgetMouseEvent event(aIsTrusted, ePointerClick, nullptr,
WidgetMouseEvent::eReal);
event.mInputSource = MouseEvent_Binding::MOZ_SOURCE_KEYBOARD;
event.mFlags.mIsPositionless = true;

4
dom/performance/EventCounts.cpp
View File

@ -16,8 +16,6 @@ namespace mozilla::dom {
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(EventCounts, mParent)
static const EventMessage sQualifiedEventType[36] = {
EventMessage::eMouseAuxClick,
EventMessage::eMouseClick,
EventMessage::eContextMenu,
EventMessage::eMouseDoubleClick,
EventMessage::eMouseDown,
@ -26,6 +24,8 @@ static const EventMessage sQualifiedEventType[36] = {
EventMessage::eMouseOut,
EventMessage::eMouseOver,
EventMessage::eMouseUp,
EventMessage::ePointerAuxClick,
EventMessage::ePointerClick,
EventMessage::ePointerOver,
EventMessage::ePointerEnter,
EventMessage::ePointerDown,

4
dom/performance/PerformanceEventTiming.cpp
View File

@ -74,8 +74,6 @@ PerformanceEventTiming::TryGenerateEventTiming(const EventTarget* aTarget,
}
switch (aEvent->mMessage) {
case eMouseAuxClick:
case eMouseClick:
case eContextMenu:
case eMouseDoubleClick:
case eMouseDown:
@ -84,6 +82,8 @@ PerformanceEventTiming::TryGenerateEventTiming(const EventTarget* aTarget,
case eMouseOut:
case eMouseOver:
case eMouseUp:
case ePointerAuxClick:
case ePointerClick:
case ePointerOver:
case ePointerEnter:
case ePointerDown:

2
dom/performance/PerformanceMainThread.cpp
View File

@ -318,7 +318,7 @@ void PerformanceMainThread::DispatchPendingEventTimingEntries() {
}
break;
}
case eMouseClick:
case ePointerClick:
case eKeyDown:
case eMouseDown: {
mFirstInputEvent = entry->Clone();

2
dom/xul/XULButtonElement.cpp
View File

@ -601,7 +601,7 @@ nsresult XULButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
break;
}
case eMouseClick: {
case ePointerClick: {
WidgetMouseEvent* mouseEvent = event->AsMouseEvent();
if (mouseEvent->IsLeftClickEvent()) {
if (MouseClicked(*mouseEvent)) {

2
dom/xul/XULResizerElement.cpp
View File

@ -236,7 +236,7 @@ void XULResizerElement::PostHandleEventInternal(
}
} break;
case eMouseClick: {
case ePointerClick: {
auto* mouseEvent = event.AsMouseEvent();
if (mouseEvent->IsLeftClickEvent()) {
// Execute the oncommand event handler.

6
dom/xul/nsXULElement.cpp
View File

@ -866,9 +866,9 @@ void nsXULElement::List(FILE* out, int32_t aIndent) const {
bool nsXULElement::IsEventStoppedFromAnonymousScrollbar(EventMessage aMessage) {
return (IsRootOfNativeAnonymousSubtree() &&
IsAnyOfXULElements(nsGkAtoms::scrollbar, nsGkAtoms::scrollcorner) &&
(aMessage == eMouseClick || aMessage == eMouseDoubleClick ||
(aMessage == ePointerClick || aMessage == eMouseDoubleClick ||
aMessage == eXULCommand || aMessage == eContextMenu ||
aMessage == eDragStart || aMessage == eMouseAuxClick));
aMessage == eDragStart || aMessage == ePointerAuxClick));
}
nsresult nsXULElement::DispatchXULCommand(const EventChainVisitor& aVisitor,
@ -990,7 +990,7 @@ void nsXULElement::ClickWithInputSource(uint16_t aInputSource,
// This helps to avoid commands being dispatched from
// XULButtonElement::PostHandleEventForMenu.
eventUp.mFlags.mMultipleActionsPrevented = true;
WidgetMouseEvent eventClick(aIsTrustedEvent, eMouseClick, nullptr,
WidgetMouseEvent eventClick(aIsTrustedEvent, ePointerClick, nullptr,
WidgetMouseEvent::eReal);
eventDown.mInputSource = eventUp.mInputSource = eventClick.mInputSource =
aInputSource;

6
editor/libeditor/EditorEventListener.cpp
View File

@ -421,7 +421,7 @@ NS_IMETHODIMP EditorEventListener::HandleEvent(Event* aEvent) {
// has not received the preceding mousedown event of this mouseup event.
// So, mMouseDownOrUpConsumedByIME may be invalid here. However,
// this is not a matter because mMouseDownOrUpConsumedByIME is referred
// only by eMouseClick case but click event is fired only in case #1.
// only by ePointerClick case but click event is fired only in case #1.
// So, before a click event is fired, mMouseDownOrUpConsumedByIME is
// always initialized in the eMouseDown case if it's referred.
if (NotifyIMEOfMouseButtonEvent(internalEvent->AsMouseEvent())) {
@ -440,7 +440,7 @@ NS_IMETHODIMP EditorEventListener::HandleEvent(Event* aEvent) {
return rv;
}
// click
case eMouseClick: {
case ePointerClick: {
WidgetMouseEvent* widgetMouseEvent = internalEvent->AsMouseEvent();
// Don't handle non-primary click events
if (widgetMouseEvent->mButton != MouseButton::ePrimary) {
@ -449,7 +449,7 @@ NS_IMETHODIMP EditorEventListener::HandleEvent(Event* aEvent) {
[[fallthrough]];
}
// auxclick
case eMouseAuxClick: {
case ePointerAuxClick: {
WidgetMouseEvent* widgetMouseEvent = internalEvent->AsMouseEvent();
if (NS_WARN_IF(!widgetMouseEvent)) {
return NS_OK;

2
extensions/spellcheck/src/mozInlineSpellChecker.cpp
View File

@ -1990,7 +1990,7 @@ NS_IMETHODIMP mozInlineSpellChecker::HandleEvent(Event* aEvent) {
case eBlur:
OnBlur(*aEvent);
return NS_OK;
case eMouseClick:
case ePointerClick:
OnMouseClick(*aEvent);
return NS_OK;
case eKeyDown:

4
gfx/layers/apz/src/APZCTreeManager.cpp
View File

@ -2419,8 +2419,8 @@ void APZCTreeManager::UpdateWheelTransaction(
case eMouseUp:
case eMouseDown:
case eMouseDoubleClick:
case eMouseAuxClick:
case eMouseClick:
case ePointerAuxClick:
case ePointerClick:
case eContextMenu:
case eDrop:
txn->EndTransaction();

2
layout/base/AccessibleCaretEventHub.cpp
View File

@ -430,7 +430,7 @@ nsEventStatus AccessibleCaretEventHub::HandleMouseEvent(
nsPoint point = GetMouseEventPosition(aEvent);
if (aEvent->mMessage == eMouseDown || aEvent->mMessage == eMouseUp ||
aEvent->mMessage == eMouseClick ||
aEvent->mMessage == ePointerClick ||
aEvent->mMessage == eMouseDoubleClick ||
aEvent->mMessage == eMouseLongTap) {
// Don't reset the source on mouse movement since that can

5
layout/generic/nsImageFrame.cpp
View File

@ -2678,7 +2678,7 @@ nsresult nsImageFrame::HandleEvent(nsPresContext* aPresContext,
nsEventStatus* aEventStatus) {
NS_ENSURE_ARG_POINTER(aEventStatus);
if ((aEvent->mMessage == eMouseClick &&
if ((aEvent->mMessage == ePointerClick &&
aEvent->AsMouseEvent()->mButton == MouseButton::ePrimary) ||
aEvent->mMessage == eMouseMove) {
nsImageMap* map = GetImageMap();
@ -2719,7 +2719,8 @@ nsresult nsImageFrame::HandleEvent(nsPresContext* aPresContext,
NS_ENSURE_SUCCESS(rv, rv);
bool clicked = false;
if (aEvent->mMessage == eMouseClick && !aEvent->DefaultPrevented()) {
if (aEvent->mMessage == ePointerClick &&
!aEvent->DefaultPrevented()) {
*aEventStatus = nsEventStatus_eConsumeDoDefault;
clicked = true;
}

4
widget/BasicEvents.h
View File

@ -886,8 +886,8 @@ class WidgetEvent : public WidgetEventTime {
break;
case eMouseEventClass:
mFlags.mComposed =
mMessage == eMouseClick || mMessage == eMouseDoubleClick ||
mMessage == eMouseAuxClick || mMessage == eMouseDown ||
mMessage == ePointerClick || mMessage == eMouseDoubleClick ||
mMessage == ePointerAuxClick || mMessage == eMouseDown ||
mMessage == eMouseUp || mMessage == eMouseOver ||
mMessage == eMouseOut || mMessage == eMouseMove ||
mMessage == eContextMenu || mMessage == eXULPopupShowing ||

5
widget/EventMessageList.h
View File

@ -59,8 +59,6 @@ NS_EVENT_MESSAGE(eMouseDown)
NS_EVENT_MESSAGE(eMouseEnterIntoWidget)
NS_EVENT_MESSAGE(eMouseExitFromWidget)
NS_EVENT_MESSAGE(eMouseDoubleClick)
NS_EVENT_MESSAGE(eMouseClick)
NS_EVENT_MESSAGE(eMouseAuxClick)
// eMouseActivate is fired when the widget is activated by a click.
NS_EVENT_MESSAGE(eMouseActivate)
NS_EVENT_MESSAGE(eMouseOver)
@ -73,6 +71,9 @@ NS_EVENT_MESSAGE(eMouseLongTap)
NS_EVENT_MESSAGE(eMouseExploreByTouch)
NS_EVENT_MESSAGE_FIRST_LAST(eMouseEvent, eMouseMove, eMouseExploreByTouch)
NS_EVENT_MESSAGE(ePointerClick)
NS_EVENT_MESSAGE(ePointerAuxClick)
// Pointer spec events
NS_EVENT_MESSAGE(ePointerMove)
NS_EVENT_MESSAGE(ePointerUp)

4
widget/MouseEvents.h
View File

@ -165,7 +165,7 @@ class WidgetMouseEventBase : public WidgetInputEvent {
* Returns true if left click event.
*/
bool IsLeftClickEvent() const {
return mMessage == eMouseClick && mButton == MouseButton::ePrimary;
return mMessage == ePointerClick && mButton == MouseButton::ePrimary;
}
/**
@ -332,7 +332,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
Maybe<ExitFrom> mExitFrom;
// mClickCount may be non-zero value when mMessage is eMouseDown, eMouseUp,
// eMouseClick or eMouseDoubleClick. The number is count of mouse clicks.
// ePointerClick or eMouseDoubleClick. The number is count of mouse clicks.
// Otherwise, this must be 0.
uint32_t mClickCount;

6
widget/WidgetEventImpl.cpp
View File

@ -314,9 +314,7 @@ bool WidgetEvent::HasMouseEventMessage() const {
switch (mMessage) {
case eMouseDown:
case eMouseUp:
case eMouseClick:
case eMouseDoubleClick:
case eMouseAuxClick:
case eMouseEnterIntoWidget:
case eMouseExitFromWidget:
case eMouseActivate:
@ -325,6 +323,10 @@ bool WidgetEvent::HasMouseEventMessage() const {
case eMouseHitTest:
case eMouseMove:
return true;
// TODO: Perhaps, we should rename this method.
case ePointerClick:
case ePointerAuxClick:
return true;
default:
return false;
}

4
widget/nsBaseWidget.cpp
View File

@ -3326,10 +3326,10 @@ nsAutoString nsBaseWidget::debug_GuiEventToString(WidgetGUIEvent* aGuiEvent) {
_ASSIGN_eventName(eMouseExitFromWidget, "eMouseExitFromWidget");
_ASSIGN_eventName(eMouseDown, "eMouseDown");
_ASSIGN_eventName(eMouseUp, "eMouseUp");
_ASSIGN_eventName(eMouseClick, "eMouseClick");
_ASSIGN_eventName(eMouseAuxClick, "eMouseAuxClick");
_ASSIGN_eventName(eMouseDoubleClick, "eMouseDoubleClick");
_ASSIGN_eventName(eMouseMove, "eMouseMove");
_ASSIGN_eventName(ePointerClick, "ePointerClick");
_ASSIGN_eventName(ePointerAuxClick, "ePointerAuxClick");
_ASSIGN_eventName(eLoad, "eLoad");
_ASSIGN_eventName(ePopState, "ePopState");
_ASSIGN_eventName(eBeforeScriptExecute, "eBeforeScriptExecute");

2
widget/windows/WinUtils.cpp
View File

@ -688,7 +688,7 @@ bool WinUtils::GetIsMouseFromTouch(EventMessage aEventMessage) {
const uint32_t MOZ_T_I_SIGNATURE = TABLET_INK_TOUCH | TABLET_INK_SIGNATURE;
const uint32_t MOZ_T_I_CHECK_TCH = TABLET_INK_TOUCH | TABLET_INK_CHECK;
return ((aEventMessage == eMouseMove || aEventMessage == eMouseDown ||
aEventMessage == eMouseUp || aEventMessage == eMouseAuxClick ||
aEventMessage == eMouseUp || aEventMessage == ePointerAuxClick ||
aEventMessage == eMouseDoubleClick) &&
(GetMessageExtraInfo() & MOZ_T_I_SIGNATURE) == MOZ_T_I_CHECK_TCH);
}