[iOS] Take logical-min-height value into account when setting minimum…

… platform height on buttons

https://bugs.webkit.org/show_bug.cgi?id=265500
<rdar://118572212>

Reviewed by Aditya Keerthi.

* LayoutTests/platform/ios/TestExpectations:
* Source/WebCore/rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::adjustButtonStyle const):

Canonical link: https://commits.webkit.org/271272@main

LayoutTests/platform/ios/TestExpectations

@@ -4617,8 +4617,6 @@ webkit.org/b/263471 fast/forms/ios/keydown-in-hidden-contenteditable-with-inputm
 
 webkit.org/b/263396 css3/color/text.html [ Skip ]
 
-webkit.org/b/265053 imported/w3c/web-platform-tests/css/css-sizing/button-min-width.html [ Failure ]
-
 # webkit.org/b/263439 [ iOS ] Several WPTs using wheel actions are timing out after b243272
 imported/w3c/web-platform-tests/css/css-overscroll-behavior/overscroll-behavior.html [ Skip ]
 imported/w3c/web-platform-tests/css/css-scroll-snap/snap-at-user-scroll-end.html [ Skip ]

Source/WebCore/rendering/RenderThemeIOS.mm

@@ -880,8 +880,13 @@ static void adjustInputElementButtonStyle(RenderStyle& style, const HTMLInputEle
     // If no size is specified, ensure the height of the button matches ControlBaseHeight scaled
     // with the font size. min-height is used rather than height to avoid clipping the contents of
     // the button in cases where the button contains more than one line of text.
-    if (style.logicalWidth().isIntrinsicOrAuto() || style.logicalHeight().isAuto())
-        style.setLogicalMinHeight(Length(ControlBaseHeight / ControlBaseFontSize * style.fontDescription().computedSize(), LengthType::Fixed));
+    if (style.logicalWidth().isIntrinsicOrAuto() || style.logicalHeight().isAuto()) {
+        auto minimumHeight = ControlBaseHeight / ControlBaseFontSize * style.fontDescription().computedSize();
+        if (style.logicalMinHeight().isFixed())
+            minimumHeight = std::max(minimumHeight, style.logicalMinHeight().value());
+        // FIXME: This may need to be a layout time adjustment to support various values like fit-content etc.
+        style.setLogicalMinHeight(Length(minimumHeight, LengthType::Fixed));
+    }
 
 #if ENABLE(INPUT_TYPE_COLOR)
     if (style.effectiveAppearance() == StyleAppearance::ColorWell)