Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 2 insertions, 7 deletions

diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.sys.mjs b/toolkit/components/tooltiptext/TooltipTextProvider.sys.mjs
index 96a3e8dd5f..a231f5b4cc 100644
--- a/toolkit/components/tooltiptext/TooltipTextProvider.sys.mjs
+++ b/toolkit/components/tooltiptext/TooltipTextProvider.sys.mjs
@@ -69,11 +69,7 @@ TooltipTextProvider.prototype = {
       }
       if (tipElement.namespaceURI == XUL_NS) {
         lookingForSVGTitle = false;
-        // NOTE: getAttribute behaves differently for XUL so we can't rely on
-        // it returning null, see bug 232598.
-        titleText = tipElement.hasAttribute("tooltiptext")
-          ? tipElement.getAttribute("tooltiptext")
-          : null;
+        titleText = tipElement.getAttribute("tooltiptext");
       } else if (!defView.SVGElement.isInstance(tipElement)) {
         lookingForSVGTitle = false;
         titleText = tipElement.getAttribute("title");
diff --git a/toolkit/components/tooltiptext/tests/browser.toml b/toolkit/components/tooltiptext/tests/browser.toml
index d03716e683..42aca4a7a6 100644
--- a/toolkit/components/tooltiptext/tests/browser.toml
+++ b/toolkit/components/tooltiptext/tests/browser.toml
@@ -11,7 +11,6 @@ support-files = ["xul_tooltiptext.xhtml"]
 ["browser_bug581947.js"]
 
 ["browser_input_file_tooltips.js"]
-skip-if = ["os == 'win' && os_version == '10.0'"]  # Permafail on Win 10 (bug 1400368)
 
 ["browser_nac_tooltip.js"]
 
diff --git a/toolkit/components/tooltiptext/tests/browser_bug581947.js b/toolkit/components/tooltiptext/tests/browser_bug581947.js
index 6e5eb9ea14..0971735470 100644
--- a/toolkit/components/tooltiptext/tests/browser_bug581947.js
+++ b/toolkit/components/tooltiptext/tests/browser_bug581947.js
@@ -55,7 +55,7 @@ function todo_check(aBrowser, aElementName, aBarred) {
   return SpecialPowers.spawn(
     aBrowser,
     [[aElementName, aBarred]],
-    async function ([aElementName, aBarred]) {
+    async function ([aElementName]) {
       let e = content.document.createElement(aElementName);
       let contentElement = content.document.getElementById("content");
       contentElement.appendChild(e);