5 files changed, 3 insertions, 55 deletions
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 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1128054
--->
-<head>
-  <title>Test for Bug 1128054</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1128054">Mozilla Bug 1128054</a>
-<p id="display"></p>
-<!-- Test default focusability -->
-<math></math>
-<math href="#" data-focusable=true></math>
-<!-- Test tabindex=0 focusability -->
-<math tabindex="0" data-focusable=true></math>
-<!-- Test tabindex=-1 focusability -->
-<math tabindex="-1" data-focusable=true></math>
-<!-- Test tabindex=invalid focusability -->
-<math tabindex="invalid"></math>
-<math href="#" tabindex="invalid" data-focusable=true></math>
-<!-- Tests code -->
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 1128054 **/
-
-add_task(function test_math_tabindex_focus() {
-  for (let element of document.querySelectorAll("math")) {
-    let focusable = element.dataset && element.dataset.focusable;
-    let desc = "<math";
-    for (let attr of ["href", "tabindex"]) {
-      if (element.hasAttribute(attr)) {
-        desc += ` ${attr}=${element.getAttribute(attr)}`;
-      }
-    }
-    desc += ">";
-    element.focus();
-    focusable ? is(document.activeElement, element, desc + " should focusable")
-              : isnot(document.activeElement, element, desc + " should not focusable");
-  }
-});
-
-</script>
-</body>
-</html>