From 75cc1a545ba1accab1a4d08d0edf1d01d43d6142 Mon Sep 17 00:00:00 2001 From: Joey Arhar Date: Mon, 6 May 2024 22:43:53 +0000 Subject: [PATCH] Remove DateInputInlineBlock flag This has been enabled by default for long enough that we can remove the flag now. Bug: 41462748 Change-Id: I54d644c6b49a33da0a3046dcee101c0eed9fcd5b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5515549 Reviewed-by: Kent Tamura Commit-Queue: Joey Arhar Cr-Commit-Position: refs/heads/main@{#1297164} --- third_party/blink/public/blink_resources.grd | 1 - .../core/html/forms/input_type_view.cc | 3 +- ...ultiple_fields_temporal_input_type_view.cc | 30 ++--- .../input_multiple_fields_inline_flex.css | 17 --- .../core/layout/layout_theme_default.cc | 10 +- .../platform/runtime_enabled_features.json5 | 7 - third_party/blink/web_tests/VirtualTestSuites | 16 --- .../form-controls/resets-expected.txt | 52 -------- ...te-appearance-pseudo-elements-expected.png | Bin 8782 -> 0 bytes ...th-appearance-pseudo-elements-expected.png | Bin 9260 -> 0 bytes .../fast/forms/suggested-value-expected.txt | 123 ------------------ ...me-appearance-pseudo-elements-expected.png | Bin 8684 -> 0 bytes ...ek-appearance-pseudo-elements-expected.png | Bin 9270 -> 0 bytes .../README.md | 8 -- ...te-appearance-pseudo-elements-expected.png | Bin 8778 -> 0 bytes ...th-appearance-pseudo-elements-expected.png | Bin 9139 -> 0 bytes .../fast/forms/suggested-value-expected.txt | 104 --------------- ...me-appearance-pseudo-elements-expected.png | Bin 8336 -> 0 bytes ...ek-appearance-pseudo-elements-expected.png | Bin 9176 -> 0 bytes 19 files changed, 10 insertions(+), 361 deletions(-) delete mode 100644 third_party/blink/renderer/core/html/resources/input_multiple_fields_inline_flex.css delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/external/wpt/html/rendering/non-replaced-elements/form-controls/resets-expected.txt delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/fast/forms/date/date-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/fast/forms/month/month-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/fast/forms/suggested-value-expected.txt delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/fast/forms/time/time-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/fast/forms/week/week-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/README.md delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/fast/forms/date/date-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/fast/forms/month/month-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/fast/forms/suggested-value-expected.txt delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/fast/forms/time/time-appearance-pseudo-elements-expected.png delete mode 100644 third_party/blink/web_tests/virtual/date-input-inline-block-disabled/fast/forms/week/week-appearance-pseudo-elements-expected.png diff --git a/third_party/blink/public/blink_resources.grd b/third_party/blink/public/blink_resources.grd index 6df40d49204268..b36fe3cf874981 100644 --- a/third_party/blink/public/blink_resources.grd +++ b/third_party/blink/public/blink_resources.grd @@ -20,7 +20,6 @@ - diff --git a/third_party/blink/renderer/core/html/forms/input_type_view.cc b/third_party/blink/renderer/core/html/forms/input_type_view.cc index 92e11d1c1b034f..a3f12593ddcd58 100644 --- a/third_party/blink/renderer/core/html/forms/input_type_view.cc +++ b/third_party/blink/renderer/core/html/forms/input_type_view.cc @@ -97,8 +97,7 @@ HTMLFormElement* InputTypeView::FormForSubmission() const { LayoutObject* InputTypeView::CreateLayoutObject( const ComputedStyle& style) const { // Avoid LayoutInline, which can be split to multiple lines. - if (RuntimeEnabledFeatures::DateInputInlineBlockEnabled() && - style.IsDisplayInlineType() && !style.IsDisplayReplacedType()) { + if (style.IsDisplayInlineType() && !style.IsDisplayReplacedType()) { return MakeGarbageCollected(&GetElement()); } return LayoutObject::CreateObject(&GetElement(), style); diff --git a/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc b/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc index 4245d29b7d2864..a36fc39a8f2884 100644 --- a/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc +++ b/third_party/blink/renderer/core/html/forms/multiple_fields_temporal_input_type_view.cc @@ -396,19 +396,7 @@ void MultipleFieldsTemporalInputTypeView::Blur() { void MultipleFieldsTemporalInputTypeView::AdjustStyle( ComputedStyleBuilder& builder) { - if (!RuntimeEnabledFeatures::DateInputInlineBlockEnabled()) { - EDisplay original_display = builder.Display(); - EDisplay new_display = original_display; - if (original_display == EDisplay::kInline || - original_display == EDisplay::kInlineBlock) { - new_display = EDisplay::kInlineFlex; - } else if (original_display == EDisplay::kBlock) { - new_display = EDisplay::kFlex; - } - builder.SetDisplay(new_display); - } else { - builder.SetShouldIgnoreOverflowPropertyForInlineBlockBaseline(); - } + builder.SetShouldIgnoreOverflowPropertyForInlineBlockBaseline(); builder.SetDirection(ComputedTextDirection()); } @@ -418,15 +406,13 @@ void MultipleFieldsTemporalInputTypeView::CreateShadowSubtree() { Document& document = GetElement().GetDocument(); ContainerNode* container = GetElement().UserAgentShadowRoot(); - if (RuntimeEnabledFeatures::DateInputInlineBlockEnabled()) { - auto* container_div = MakeGarbageCollected(document); - container_div->SetShadowPseudoId( - shadow_element_names::kPseudoInternalDatetimeContainer); - container_div->SetInlineStyleProperty(CSSPropertyID::kUnicodeBidi, - CSSValueID::kNormal); - GetElement().UserAgentShadowRoot()->AppendChild(container_div); - container = container_div; - } + auto* container_div = MakeGarbageCollected(document); + container_div->SetShadowPseudoId( + shadow_element_names::kPseudoInternalDatetimeContainer); + container_div->SetInlineStyleProperty(CSSPropertyID::kUnicodeBidi, + CSSValueID::kNormal); + GetElement().UserAgentShadowRoot()->AppendChild(container_div); + container = container_div; container->AppendChild( MakeGarbageCollected elements - // inline-block for cross-browser compatibility. Enabled in M122, should - // be safe to remove in M126. - name: "DateInputInlineBlock", - status: "stable", - }, { // This is a killswitch for the `serializable` attribute on declarative // shadow roots. It should be removed in M125 (March 18, 2024) assuming diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites index c48bcd70a908a2..5fbc8bd1d66046 100644 --- a/third_party/blink/web_tests/VirtualTestSuites +++ b/third_party/blink/web_tests/VirtualTestSuites @@ -2180,22 +2180,6 @@ "args": ["--disable-features=OptionElementAlwaysUseLabel"], "expires": "Jul 1, 2024" }, - { - "prefix": "date-input-inline-block-disabled", - "owners": ["jarhar@chromium.org", "tkent@chromium.org"], - "platforms": ["Linux"], - "bases": [ - "external/wpt/html/rendering/non-replaced-elements/form-controls/resets.html", - "fast/forms/suggested-value.html", - "fast/forms/date/date-appearance-pseudo-elements.html", - "fast/forms/month/month-appearance-pseudo-elements.html", - "fast/forms/time/time-appearance-pseudo-elements.html", - "fast/forms/week/week-appearance-pseudo-elements.html" - ], - "args": ["--disable-blink-features=DateInputInlineBlock", - "--disable-threaded-compositing", "--disable-threaded-animation"], - "expires": "Oct 1, 2024" - }, { "prefix": "disable-device-id-pointer-event", "platforms": ["Linux", "Mac", "Win"], diff --git a/third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/external/wpt/html/rendering/non-replaced-elements/form-controls/resets-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/external/wpt/html/rendering/non-replaced-elements/form-controls/resets-expected.txt deleted file mode 100644 index 318058ecad2170..00000000000000 --- a/third_party/blink/web_tests/platform/linux/virtual/date-input-inline-block-disabled/external/wpt/html/rendering/non-replaced-elements/form-controls/resets-expected.txt +++ /dev/null @@ -1,52 +0,0 @@ -This is a testharness.js-based test. -Found 24 FAIL, 0 TIMEOUT, 0 NOTRUN. -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - display - assert_equals: expected "inline-block" but got "inline-flex" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - display - assert_equals: expected "inline-block" but got "inline-flex" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - display - assert_equals: expected "inline-block" but got "inline-flex" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - display - assert_equals: expected "inline-block" but got "inline-flex" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - display - assert_equals: expected "inline-block" but got "inline-flex" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "hidden" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL] - overflow - assert_equals: expected "clip" but got "visible" -[FAIL]