4 files changed, 6 insertions, 61 deletions
diff --git a/layout/forms/nsRangeFrame.h b/layout/forms/nsRangeFrame.h
index 10d0fc0095..206103ea44 100644
--- a/layout/forms/nsRangeFrame.h
+++ b/layout/forms/nsRangeFrame.h
@@ -105,8 +105,8 @@ class nsRangeFrame final : public nsContainerFrame,
   bool IsUpwards() const {
     MOZ_ASSERT(!IsHorizontal());
     mozilla::WritingMode wm = GetWritingMode();
-    return wm.GetBlockDir() == mozilla::WritingMode::eBlockTB ||
-           wm.GetInlineDir() == mozilla::WritingMode::eInlineBTT;
+    return wm.GetBlockDir() == mozilla::WritingMode::BlockDir::TB ||
+           wm.GetInlineDir() == mozilla::WritingMode::InlineDir::BTT;
   }
 
   double GetMin() const;
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 32e817be8a..3c44038d89 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -417,8 +417,10 @@ nsresult nsTextControlFrame::CreateAnonymousContent(
   // background on the placeholder doesn't obscure the caret.
   aElements.AppendElement(mRootNode);
 
-  if (StaticPrefs::layout_forms_reveal_password_button_enabled() &&
-      IsPasswordTextControl()) {
+  if ((StaticPrefs::layout_forms_reveal_password_button_enabled() ||
+       PresContext()->Document()->ChromeRulesEnabled()) &&
+      IsPasswordTextControl() &&
+      StyleDisplay()->EffectiveAppearance() != StyleAppearance::Textfield) {
     mRevealButton =
         MakeAnonElement(PseudoStyleType::mozReveal, nullptr, nsGkAtoms::button);
     mRevealButton->SetAttr(kNameSpaceID_None, nsGkAtoms::aria_hidden,
diff --git a/layout/forms/test/mochitest.toml b/layout/forms/test/mochitest.toml
index 0748041524..5eddbf6a7b 100644
--- a/layout/forms/test/mochitest.toml
+++ b/layout/forms/test/mochitest.toml
@@ -75,8 +75,6 @@ skip-if = ["os == 'android'"] # Bug 1635771
 
 ["test_bug717878_input_scroll.html"]
 
-["test_bug869314.html"]
-
 ["test_bug903715.html"]
 skip-if = ["true"]
 
diff --git a/layout/forms/test/test_bug869314.html b/layout/forms/test/test_bug869314.html
deleted file mode 100644
index 7c786fccfc..0000000000
--- a/layout/forms/test/test_bug869314.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=869314
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 869314</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <style type="text/css">
-    .selectbox {
-      background-color: #00FF00;
-    }
-  </style>
-
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=869314">Mozilla Bug 869314</a>
-<p id="display"></p>
-<div id="content">
-
-  <select id="selectbox1" name="non-native selectbox" class="selectbox">
-    <option value="item">test item</option>
-  </select>
-
-  <select id="selectbox2" name="native selectbox">
-    <option value="item">test item</option>
-  </select>
-
-  <script type="application/javascript">
-  let Cc = SpecialPowers.Cc;
-  let Ci = SpecialPowers.Ci;
-  let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-  let osName = sysInfo.getProperty("name");
-  let isNNT = SpecialPowers.getBoolPref("widget.non-native-theme.enabled");
-  if (osName == "Darwin" && !isNNT) { // Native styled macOS form controls.
-    // This test is for macOS with native styled form controls only. See bug for more info.
-    ok(document.getElementById("selectbox1").clientWidth >
-       document.getElementById("selectbox2").clientWidth,
-       "Non-native styled combobox does not have enough space for a " +
-       "dropmarker!");
-  } else {
-    // We need to call at least one test function to make the test harness
-    // happy.
-    ok(true, "Test wasn't ignored but should have been.");
-  }
-  </script>
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>