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

Bug 1675847 - part 2: Rename some methods which handle "MouseClick" r=smaug

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

8
dom/xul/XULButtonElement.cpp
View File

@ -569,7 +569,7 @@ nsresult XULButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
}
if (NS_VK_RETURN == keyEvent->mKeyCode) {
if (RefPtr<nsIDOMXULButtonElement> button = AsXULButton()) {
if (MouseClicked(*keyEvent)) {
if (OnPointerClicked(*keyEvent)) {
aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
@ -593,7 +593,7 @@ nsresult XULButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
EventStateManager* esm = aVisitor.mPresContext->EventStateManager();
esm->SetContentState(nullptr, ElementState::ACTIVE);
esm->SetContentState(nullptr, ElementState::HOVER);
if (MouseClicked(*keyEvent)) {
if (OnPointerClicked(*keyEvent)) {
aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
@ -604,7 +604,7 @@ nsresult XULButtonElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
case ePointerClick: {
WidgetMouseEvent* mouseEvent = event->AsMouseEvent();
if (mouseEvent->IsLeftClickEvent()) {
if (MouseClicked(*mouseEvent)) {
if (OnPointerClicked(*mouseEvent)) {
aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
@ -632,7 +632,7 @@ void XULButtonElement::Blurred() {
mIsHandlingKeyEvent = false;
}
bool XULButtonElement::MouseClicked(WidgetGUIEvent& aEvent) {
bool XULButtonElement::OnPointerClicked(WidgetGUIEvent& aEvent) {
// Don't execute if we're disabled.
if (IsDisabled() || !IsInComposedDoc()) {
return false;

2
dom/xul/XULButtonElement.h
View File

@ -29,7 +29,7 @@ class XULButtonElement : public nsXULElement {
~XULButtonElement() override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY bool MouseClicked(WidgetGUIEvent&);
MOZ_CAN_RUN_SCRIPT_BOUNDARY bool OnPointerClicked(WidgetGUIEvent&);
MOZ_CAN_RUN_SCRIPT nsresult PostHandleEvent(EventChainPostVisitor&) override;
MOZ_CAN_RUN_SCRIPT void PostHandleEventForMenus(EventChainPostVisitor&);
MOZ_CAN_RUN_SCRIPT void HandleEnterKeyPress(WidgetEvent&);

23
editor/libeditor/EditorEventListener.cpp
View File

@ -461,9 +461,9 @@ NS_IMETHODIMP EditorEventListener::HandleEvent(Event* aEvent) {
widgetMouseEvent->PreventDefault();
return NS_OK;
}
nsresult rv = MouseClick(widgetMouseEvent);
nsresult rv = PointerClick(widgetMouseEvent);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"EditorEventListener::MouseClick() failed");
"EditorEventListener::PointerClick() failed");
return rv;
}
// focus
@ -697,14 +697,15 @@ nsresult EditorEventListener::KeyPress(WidgetKeyboardEvent* aKeyboardEvent) {
return NS_OK;
}
nsresult EditorEventListener::MouseClick(WidgetMouseEvent* aMouseClickEvent) {
if (NS_WARN_IF(!aMouseClickEvent) || DetachedFromEditor()) {
nsresult EditorEventListener::PointerClick(
WidgetMouseEvent* aPointerClickEvent) {
if (NS_WARN_IF(!aPointerClickEvent) || DetachedFromEditor()) {
return NS_OK;
}
// nothing to do if editor isn't editable or clicked on out of the editor.
OwningNonNull<EditorBase> editorBase = *mEditorBase;
if (editorBase->IsReadonly() ||
!editorBase->IsAcceptableInputEvent(aMouseClickEvent)) {
!editorBase->IsAcceptableInputEvent(aPointerClickEvent)) {
return NS_OK;
}
@ -714,14 +715,14 @@ nsresult EditorEventListener::MouseClick(WidgetMouseEvent* aMouseClickEvent) {
if (RefPtr<nsPresContext> presContext = GetPresContext()) {
RefPtr<Element> focusedElement = mEditorBase->GetFocusedElement();
IMEStateManager::OnClickInEditor(*presContext, focusedElement,
*aMouseClickEvent);
*aPointerClickEvent);
if (DetachedFromEditor()) {
return NS_OK;
}
}
}
if (DetachedFromEditorOrDefaultPrevented(aMouseClickEvent)) {
if (DetachedFromEditorOrDefaultPrevented(aPointerClickEvent)) {
// We're done if 'preventdefault' is true (see for example bug 70698).
return NS_OK;
}
@ -742,7 +743,7 @@ nsresult EditorEventListener::MouseClick(WidgetMouseEvent* aMouseClickEvent) {
// though this makes web apps cannot prevent middle click paste with
// calling preventDefault() of "click" nor "auxclick".
if (aMouseClickEvent->mButton != MouseButton::eMiddle ||
if (aPointerClickEvent->mButton != MouseButton::eMiddle ||
!WidgetMouseEvent::IsMiddleClickPasteEnabled()) {
return NS_OK;
}
@ -755,11 +756,11 @@ nsresult EditorEventListener::MouseClick(WidgetMouseEvent* aMouseClickEvent) {
if (NS_WARN_IF(!presContext)) {
return NS_OK;
}
MOZ_ASSERT(!aMouseClickEvent->DefaultPrevented());
MOZ_ASSERT(!aPointerClickEvent->DefaultPrevented());
nsEventStatus status = nsEventStatus_eIgnore;
RefPtr<EventStateManager> esm = presContext->EventStateManager();
DebugOnly<nsresult> rvIgnored = esm->HandleMiddleClickPaste(
presShell, aMouseClickEvent, &status, editorBase);
presShell, aPointerClickEvent, &status, editorBase);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rvIgnored),
"EventStateManager::HandleMiddleClickPaste() failed, but ignored");
@ -767,7 +768,7 @@ nsresult EditorEventListener::MouseClick(WidgetMouseEvent* aMouseClickEvent) {
// We no longer need to StopImmediatePropagation here since
// ClickHandlerChild.sys.mjs checks for and ignores editables, so won't
// re-handle the event
aMouseClickEvent->PreventDefault();
aPointerClickEvent->PreventDefault();
}
return NS_OK;
}

4
editor/libeditor/EditorEventListener.h
View File

@ -76,8 +76,8 @@ class EditorEventListener : public nsIDOMEventListener {
MOZ_CAN_RUN_SCRIPT virtual nsresult MouseUp(dom::MouseEvent* aMouseEvent) {
return NS_OK;
}
MOZ_CAN_RUN_SCRIPT virtual nsresult MouseClick(
WidgetMouseEvent* aMouseClickEvent);
MOZ_CAN_RUN_SCRIPT virtual nsresult PointerClick(
WidgetMouseEvent* aPointerClick);
MOZ_CAN_RUN_SCRIPT nsresult Focus(const InternalFocusEvent& aFocusEvent);
nsresult Blur(const InternalFocusEvent& aBlurEvent);
MOZ_CAN_RUN_SCRIPT nsresult DragOverOrDrop(dom::DragEvent* aDragEvent);

4
editor/libeditor/HTMLEditor.h
View File

@ -4501,8 +4501,8 @@ class HTMLEditor final : public EditorBase,
ManualNACPtr mRemoveRowButton;
ManualNACPtr mAddRowAfterButton;
void AddMouseClickListener(Element* aElement);
void RemoveMouseClickListener(Element* aElement);
void AddPointerClickListener(Element* aElement);
void RemovePointerClickListener(Element* aElement);
bool mDisabledLinkHandling = false;
bool mOldLinkHandlingEnabled = false;

10
editor/libeditor/HTMLEditorEventListener.cpp
View File

@ -404,14 +404,14 @@ nsresult HTMLEditorEventListener::MouseDown(MouseEvent* aMouseEvent) {
return rv;
}
nsresult HTMLEditorEventListener::MouseClick(
WidgetMouseEvent* aMouseClickEvent) {
nsresult HTMLEditorEventListener::PointerClick(
WidgetMouseEvent* aPointerClickEvent) {
if (NS_WARN_IF(DetachedFromEditor())) {
return NS_OK;
}
RefPtr<Element> element = Element::FromEventTargetOrNull(
aMouseClickEvent->GetOriginalDOMEventTarget());
aPointerClickEvent->GetOriginalDOMEventTarget());
if (NS_WARN_IF(!element)) {
return NS_ERROR_FAILURE;
}
@ -428,9 +428,9 @@ nsresult HTMLEditorEventListener::MouseClick(
return NS_OK;
}
nsresult rv = EditorEventListener::MouseClick(aMouseClickEvent);
nsresult rv = EditorEventListener::PointerClick(aPointerClickEvent);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"EditorEventListener::MouseClick() failed");
"EditorEventListener::PointerClick() failed");
return rv;
}

4
editor/libeditor/HTMLEditorEventListener.h
View File

@ -78,8 +78,8 @@ class HTMLEditorEventListener final : public EditorEventListener {
dom::MouseEvent* aMouseEvent) override;
MOZ_CAN_RUN_SCRIPT virtual nsresult MouseUp(
dom::MouseEvent* aMouseEvent) override;
MOZ_CAN_RUN_SCRIPT virtual nsresult MouseClick(
WidgetMouseEvent* aMouseClickEvent) override;
MOZ_CAN_RUN_SCRIPT virtual nsresult PointerClick(
WidgetMouseEvent* aPointerClickEvent) override;
nsresult ListenToMouseMoveEventForResizersOrGrabber(bool aListen,
bool aForGrabber);

28
editor/libeditor/HTMLInlineTableEditor.cpp
View File

@ -150,12 +150,12 @@ nsresult HTMLEditor::ShowInlineTableEditingUIInternal(Element& aCellElement) {
}
mAddRowAfterButton = std::move(addRowAfterButton);
AddMouseClickListener(mAddColumnBeforeButton);
AddMouseClickListener(mRemoveColumnButton);
AddMouseClickListener(mAddColumnAfterButton);
AddMouseClickListener(mAddRowBeforeButton);
AddMouseClickListener(mRemoveRowButton);
AddMouseClickListener(mAddRowAfterButton);
AddPointerClickListener(mAddColumnBeforeButton);
AddPointerClickListener(mRemoveColumnButton);
AddPointerClickListener(mAddColumnAfterButton);
AddPointerClickListener(mAddRowBeforeButton);
AddPointerClickListener(mRemoveRowButton);
AddPointerClickListener(mAddRowAfterButton);
nsresult rv = RefreshInlineTableEditingUIInternal();
NS_WARNING_ASSERTION(
@ -171,12 +171,12 @@ nsresult HTMLEditor::ShowInlineTableEditingUIInternal(Element& aCellElement) {
void HTMLEditor::HideInlineTableEditingUIInternal() {
mInlineEditedCell = nullptr;
RemoveMouseClickListener(mAddColumnBeforeButton);
RemoveMouseClickListener(mRemoveColumnButton);
RemoveMouseClickListener(mAddColumnAfterButton);
RemoveMouseClickListener(mAddRowBeforeButton);
RemoveMouseClickListener(mRemoveRowButton);
RemoveMouseClickListener(mAddRowAfterButton);
RemovePointerClickListener(mAddColumnBeforeButton);
RemovePointerClickListener(mRemoveColumnButton);
RemovePointerClickListener(mAddColumnAfterButton);
RemovePointerClickListener(mAddRowBeforeButton);
RemovePointerClickListener(mRemoveRowButton);
RemovePointerClickListener(mAddRowAfterButton);
// get the presshell's document observer interface.
RefPtr<PresShell> presShell = GetPresShell();
@ -371,7 +371,7 @@ nsresult HTMLEditor::DoInlineTableEditingAction(const Element& aElement) {
return NS_OK;
}
void HTMLEditor::AddMouseClickListener(Element* aElement) {
void HTMLEditor::AddPointerClickListener(Element* aElement) {
if (NS_WARN_IF(!aElement)) {
return;
}
@ -382,7 +382,7 @@ void HTMLEditor::AddMouseClickListener(Element* aElement) {
"EventTarget::AddEventListener(click) failed, but ignored");
}
void HTMLEditor::RemoveMouseClickListener(Element* aElement) {
void HTMLEditor::RemovePointerClickListener(Element* aElement) {
if (NS_WARN_IF(!aElement)) {
return;
}

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

@ -1991,7 +1991,7 @@ NS_IMETHODIMP mozInlineSpellChecker::HandleEvent(Event* aEvent) {
OnBlur(*aEvent);
return NS_OK;
case ePointerClick:
OnMouseClick(*aEvent);
OnPointerClick(*aEvent);
return NS_OK;
case eKeyDown:
OnKeyDown(*aEvent);
@ -2007,8 +2007,8 @@ void mozInlineSpellChecker::OnBlur(Event& aEvent) {
HandleNavigationEvent(true);
}
void mozInlineSpellChecker::OnMouseClick(Event& aMouseEvent) {
MouseEvent* mouseEvent = aMouseEvent.AsMouseEvent();
void mozInlineSpellChecker::OnPointerClick(Event& aPointerEvent) {
MouseEvent* mouseEvent = aPointerEvent.AsMouseEvent();
if (MOZ_UNLIKELY(!mouseEvent)) {
return;
}

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

@ -331,7 +331,7 @@ class mozInlineSpellChecker final : public nsIInlineSpellChecker,
void EndListeningToEditSubActions() { mIsListeningToEditSubActions = false; }
void OnBlur(mozilla::dom::Event& aEvent);
void OnMouseClick(mozilla::dom::Event& aMouseEvent);
void OnPointerClick(mozilla::dom::Event& aPointerEvent);
void OnKeyDown(mozilla::dom::Event& aKeyEvent);
};