From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/mathml/MathMLElement.cpp | 4 +- dom/mathml/MathMLElement.h | 2 +- dom/mathml/moz.build | 2 - dom/mathml/tests/mochitest/mochitest.toml | 3 -- .../tests/mochitest/test_math_tabindex_focus.html | 47 ---------------------- 5 files changed, 3 insertions(+), 55 deletions(-) delete mode 100644 dom/mathml/tests/mochitest/mochitest.toml delete mode 100644 dom/mathml/tests/mochitest/test_math_tabindex_focus.html (limited to 'dom/mathml') diff --git a/dom/mathml/MathMLElement.cpp b/dom/mathml/MathMLElement.cpp index b6d1ad7dec..af5e9bc22b 100644 --- a/dom/mathml/MathMLElement.cpp +++ b/dom/mathml/MathMLElement.cpp @@ -77,8 +77,8 @@ nsresult MathMLElement::BindToTree(BindContext& aContext, nsINode& aParent) { return rv; } -void MathMLElement::UnbindFromTree(bool aNullParent) { - MathMLElementBase::UnbindFromTree(aNullParent); +void MathMLElement::UnbindFromTree(UnbindContext& aContext) { + MathMLElementBase::UnbindFromTree(aContext); // Without removing the link state we risk a dangling pointer in the // mStyledLinks hashtable Link::UnbindFromTree(); diff --git a/dom/mathml/MathMLElement.h b/dom/mathml/MathMLElement.h index 46198d877d..a8c21e841a 100644 --- a/dom/mathml/MathMLElement.h +++ b/dom/mathml/MathMLElement.h @@ -34,7 +34,7 @@ class MathMLElement final : public MathMLElementBase, public Link { NS_IMPL_FROMNODE(MathMLElement, kNameSpaceID_MathML) nsresult BindToTree(BindContext&, nsINode& aParent) override; - void UnbindFromTree(bool aNullParent = true) override; + void UnbindFromTree(UnbindContext&) override; bool ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute, const nsAString& aValue, diff --git a/dom/mathml/moz.build b/dom/mathml/moz.build index e8b9fd61bb..a1e38eef33 100644 --- a/dom/mathml/moz.build +++ b/dom/mathml/moz.build @@ -22,5 +22,3 @@ FINAL_LIBRARY = "xul" LOCAL_INCLUDES += [ "/dom/base", ] - -MOCHITEST_MANIFESTS += ["tests/mochitest/mochitest.toml"] diff --git a/dom/mathml/tests/mochitest/mochitest.toml b/dom/mathml/tests/mochitest/mochitest.toml deleted file mode 100644 index 3da0a28b92..0000000000 --- a/dom/mathml/tests/mochitest/mochitest.toml +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] - -["test_math_tabindex_focus.html"] diff --git a/dom/mathml/tests/mochitest/test_math_tabindex_focus.html b/dom/mathml/tests/mochitest/test_math_tabindex_focus.html deleted file mode 100644 index fe03c13358..0000000000 --- a/dom/mathml/tests/mochitest/test_math_tabindex_focus.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Test for Bug 1128054 - - - - -Mozilla Bug 1128054 -

- - - - - - - - - - - - - - -- cgit v1.2.3