Title: [282440] trunk
Revision
282440
Author
[email protected]
Date
2021-09-14 23:14:11 -0700 (Tue, 14 Sep 2021)

Log Message

Fix button-min-width.html
https://bugs.webkit.org/show_bug.cgi?id=229984

Patch by Rob Buis <[email protected]> on 2021-09-14
Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-sizing/button-min-width-expected.txt:

Source/WebCore:

Do not use theme min-width/min-height values unless
it is bigger than the actual CSS property values.

* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle):

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (282439 => 282440)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2021-09-15 06:01:56 UTC (rev 282439)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2021-09-15 06:14:11 UTC (rev 282440)
@@ -1,3 +1,12 @@
+2021-09-14  Rob Buis  <[email protected]>
+
+        Fix button-min-width.html
+        https://bugs.webkit.org/show_bug.cgi?id=229984
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-sizing/button-min-width-expected.txt:
+
 2021-09-14  Myles C. Maxfield  <[email protected]>
 
         CSSFontFaceSrcValue.cssText should be quoted consistently with other browsers

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/button-min-width-expected.txt (282439 => 282440)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/button-min-width-expected.txt	2021-09-15 06:01:56 UTC (rev 282439)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-sizing/button-min-width-expected.txt	2021-09-15 06:14:11 UTC (rev 282440)
@@ -9,5 +9,5 @@
 Foo
 Bar
 
-FAIL min-width should force all buttons to be 200px wide assert_equals: expected 200 but got 36
+PASS min-width should force all buttons to be 200px wide
 

Modified: trunk/Source/WebCore/ChangeLog (282439 => 282440)


--- trunk/Source/WebCore/ChangeLog	2021-09-15 06:01:56 UTC (rev 282439)
+++ trunk/Source/WebCore/ChangeLog	2021-09-15 06:14:11 UTC (rev 282440)
@@ -1,3 +1,16 @@
+2021-09-14  Rob Buis  <[email protected]>
+
+        Fix button-min-width.html
+        https://bugs.webkit.org/show_bug.cgi?id=229984
+
+        Reviewed by Simon Fraser.
+
+        Do not use theme min-width/min-height values unless
+        it is bigger than the actual CSS property values.
+
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustStyle):
+
 2021-09-14  Xabier Rodriguez Calvar  <[email protected]>
 
         [GStreamer][EME] Accomodate cbcs as cipher-mode instead of mime

Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (282439 => 282440)


--- trunk/Source/WebCore/rendering/RenderTheme.cpp	2021-09-15 06:01:56 UTC (rev 282439)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp	2021-09-15 06:14:11 UTC (rev 282440)
@@ -167,9 +167,9 @@
 
         // Min-Width / Min-Height
         LengthSize minControlSize = Theme::singleton().minimumControlSize(part, style.fontCascade(), { style.minWidth(), style.minHeight() }, { style.width(), style.height() }, style.effectiveZoom());
-        if (minControlSize.width != style.minWidth())
+        if (minControlSize.width.value() > style.minWidth().value())
             style.setMinWidth(WTFMove(minControlSize.width));
-        if (minControlSize.height != style.minHeight())
+        if (minControlSize.height.value() > style.minHeight().value())
             style.setMinHeight(WTFMove(minControlSize.height));
 
         // Font
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to