From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- layout/forms/nsRangeFrame.h | 4 +-- layout/forms/nsTextControlFrame.cpp | 6 ++-- layout/forms/test/mochitest.toml | 2 -- layout/forms/test/test_bug869314.html | 55 ----------------------------------- 4 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 layout/forms/test/test_bug869314.html (limited to 'layout/forms') 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 @@ - - - - - - Test for Bug 869314 - - - - - - - -Mozilla Bug 869314 -

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