From bd439689e1929361bfabe5e7c3f3d55307eda7d7 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 25 Jul 2024 15:42:08 +0200 Subject: [PATCH] Issue #2515 - Clarify only dispatching in chrome. --- dom/events/EventStateManager.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index e32655e77e..c6089d5d1c 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -4668,7 +4668,7 @@ EventStateManager::InitAndDispatchClickEvent(WidgetMouseEvent* aMouseUpEvent, nsIPresShell* aPresShell, nsIContent* aMouseUpContent, nsWeakFrame aCurrentTarget, - bool aNoContentDispatch) + bool aOnlyChromeDispatch) { MOZ_ASSERT(aMouseUpEvent); MOZ_ASSERT(EventCausesClickEvents(*aMouseUpEvent)); @@ -4682,7 +4682,7 @@ EventStateManager::InitAndDispatchClickEvent(WidgetMouseEvent* aMouseUpEvent, event.buttons = aMouseUpEvent->buttons; event.mTime = aMouseUpEvent->mTime; event.mTimeStamp = aMouseUpEvent->mTimeStamp; - event.mFlags.mOnlyChromeDispatch = aNoContentDispatch; + event.mFlags.mOnlyChromeDispatch = aOnlyChromeDispatch; event.button = aMouseUpEvent->button; event.inputSource = aMouseUpEvent->inputSource; @@ -4749,41 +4749,41 @@ EventStateManager::DispatchClickEvents(nsIPresShell* aPresShell, MOZ_ASSERT(aStatus); MOZ_ASSERT(aClickTarget); - bool notDispatchToContents = + bool onlyDispatchInChrome = (aMouseUpEvent->button == WidgetMouseEvent::eMiddleButton || aMouseUpEvent->button == WidgetMouseEvent::eRightButton); - bool fireAuxClick = notDispatchToContents; + bool fireAuxClick = onlyDispatchInChrome; nsWeakFrame currentTarget = aClickTarget->GetPrimaryFrame(); - nsresult ret = + nsresult rv = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseClick, aPresShell, aClickTarget, currentTarget, - notDispatchToContents); - if (NS_WARN_IF(NS_FAILED(ret))) { - return ret; + onlyDispatchInChrome); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; } // Fire auxclick even if necessary. if (fireAuxClick && aClickTarget && aClickTarget->IsInComposedDoc()) { - ret = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseAuxClick, + rv = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseAuxClick, aPresShell, aClickTarget, currentTarget, false); - NS_WARNING_ASSERTION(NS_SUCCEEDED(ret), "Failed to dispatch eMouseAuxClick"); + NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to dispatch eMouseAuxClick"); } // Fire double click event if click count is 2. if (aMouseUpEvent->mClickCount == 2 && !fireAuxClick && aClickTarget && aClickTarget->IsInComposedDoc()) { - ret = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseDoubleClick, + rv = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseDoubleClick, aPresShell, aClickTarget, currentTarget, - notDispatchToContents); - if (NS_WARN_IF(NS_FAILED(ret))) { - return ret; + onlyDispatchInChrome); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; } } - return ret; + return rv; } nsIFrame*