From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- dom/mathml/MathMLElement.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dom/mathml/MathMLElement.cpp') diff --git a/dom/mathml/MathMLElement.cpp b/dom/mathml/MathMLElement.cpp index af5e9bc22b..04e8648a3f 100644 --- a/dom/mathml/MathMLElement.cpp +++ b/dom/mathml/MathMLElement.cpp @@ -7,10 +7,10 @@ #include "mozilla/dom/MathMLElement.h" #include "base/compiler_specific.h" +#include "mozilla/FocusModel.h" #include "mozilla/dom/BindContext.h" #include "mozilla/ArrayUtils.h" #include "mozilla/EventListenerManager.h" -#include "mozilla/FontPropertyTypes.h" #include "mozilla/StaticPrefs_mathml.h" #include "mozilla/TextUtils.h" #include "nsGkAtoms.h" @@ -20,7 +20,6 @@ #include "nsStyleConsts.h" #include "mozilla/dom/Document.h" #include "nsPresContext.h" -#include "mozAutoDocUpdate.h" #include "nsIScriptError.h" #include "nsContentUtils.h" #include "nsIURI.h" @@ -612,7 +611,7 @@ void MathMLElement::SetIncrementScriptLevel(bool aIncrementScriptLevel, int32_t MathMLElement::TabIndexDefault() { return IsLink() ? 0 : -1; } // XXX Bug 1586011: Share logic with other element classes. -Focusable MathMLElement::IsFocusableWithoutStyle(bool aWithMouse) { +Focusable MathMLElement::IsFocusableWithoutStyle(IsFocusableFlags) { if (!IsInComposedDoc() || IsInDesignMode()) { // In designMode documents we only allow focusing the document. return {}; @@ -637,7 +636,7 @@ Focusable MathMLElement::IsFocusableWithoutStyle(bool aWithMouse) { return {}; } - if ((sTabFocusModel & eTabFocus_linksMask) == 0) { + if (!FocusModel::IsTabFocusable(TabFocusableType::Links)) { tabIndex = -1; } -- cgit v1.2.3