diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /dom/mathml | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/mathml')
| -rw-r--r-- | dom/mathml/MathMLElement.cpp | 7 | ||||
| -rw-r--r-- | dom/mathml/MathMLElement.h | 2 |
2 files changed, 4 insertions, 5 deletions
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; } diff --git a/dom/mathml/MathMLElement.h b/dom/mathml/MathMLElement.h index a8c21e841a..6168701beb 100644 --- a/dom/mathml/MathMLElement.h +++ b/dom/mathml/MathMLElement.h @@ -74,7 +74,7 @@ class MathMLElement final : public MathMLElementBase, public Link { int32_t TabIndexDefault() final; - Focusable IsFocusableWithoutStyle(bool aWithMouse) override; + Focusable IsFocusableWithoutStyle(IsFocusableFlags) override; already_AddRefed<nsIURI> GetHrefURI() const override; void NodeInfoChanged(Document* aOldDoc) override { |