Changeset 274411 in webkit

Timestamp:

Mar 15, 2021 4:27:16 AM (16 months ago)

Author:

svillar@igalia.com

Message:

Do not shrink radio buttons bellow its size
​https://bugs.webkit.org/show_bug.cgi?id=215575

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-flexbox/radiobutton-min-size-expected.txt: Replaced FAIL by PASS expectations.

Source/WebCore:

A radio button used as a flex item would be invisible by default because it'll compute is
min-size to 0. That's why we should not let them shrink below their size (width/height).

• platform/Theme.cpp:

(WebCore::Theme::minimumControlSize const): Do not let Radio buttons shrink bellow their size.

• platform/Theme.h: make minimumControlSize() protected. Add a new non-virtual method with the same parameter

plus another one (the minimum size under which we cannot shrink) which calls the virtual method.

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::adjustStyle): Pass the {style.width(),style.height()} as the minimum size under which
we should not shrink the control.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/radiobutton-min-size-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/Theme.cpp (modified) (1 diff)
• Source/WebCore/platform/Theme.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderTheme.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-03-10  Sergio Villar Senin  <svillar@igalia.com>
+
+        Do not shrink radio buttons bellow its size
+        https://bugs.webkit.org/show_bug.cgi?id=215575
+
+        Reviewed by Darin Adler.
+
+        * web-platform-tests/css/css-flexbox/radiobutton-min-size-expected.txt: Replaced FAIL by PASS expectations.
+
 2021-03-14  Sam Weinig  <weinig@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/radiobutton-min-size-expected.txt

@@ -5 +5 @@
 Text
 
-FAIL two radio button widths are identical assert_equals: width should be equal expected 0 but got 12
+PASS two radio button widths are identical
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-10  Sergio Villar Senin  <svillar@igalia.com>
+
+        Do not shrink radio buttons bellow its size
+        https://bugs.webkit.org/show_bug.cgi?id=215575
+
+        Reviewed by Darin Adler.
+
+        A radio button used as a flex item would be invisible by default because it'll compute is
+        min-size to 0. That's why we should not let them shrink below their size (width/height).
+
+        * platform/Theme.cpp:
+        (WebCore::Theme::minimumControlSize const): Do not let Radio buttons shrink bellow their size.
+        * platform/Theme.h: make minimumControlSize() protected. Add a new non-virtual method with the same parameter
+        plus another one (the minimum size under which we cannot shrink) which calls the virtual method.
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustStyle): Pass the {style.width(),style.height()} as the minimum size under which
+        we should not shrink the control.
+
 2021-03-15  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/platform/Theme.cpp

@@ -47 +47 @@
 {
     return zoomedSize;
+}
+
+LengthSize Theme::minimumControlSize(ControlPart part, const FontCascade& fontCascade, const LengthSize& zoomedSize, const LengthSize& nonShrinkableZoomedSize, float zoom) const
+{
+    auto minSize = minimumControlSize(part, fontCascade, zoomedSize, zoom);
+    if (part == ControlPart::RadioPart) {
+        if (zoomedSize.width.isIntrinsicOrAuto())
+            minSize.width = nonShrinkableZoomedSize.width;
+        if (zoomedSize.height.isIntrinsicOrAuto())
+            minSize.height = nonShrinkableZoomedSize.height;
+    }
+    return minSize;
 }
 

trunk/Source/WebCore/platform/Theme.h

@@ -58 +58 @@
 
     // Returns the minimum size for a control in zoomed coordinates.
-    virtual LengthSize minimumControlSize(ControlPart, const FontCascade&, const LengthSize& zoomedSize, float zoomFactor) const;
+    LengthSize minimumControlSize(ControlPart, const FontCascade&, const LengthSize& zoomedSize, const LengthSize& nonShrinkableZoomedSize, float zoomFactor) const;
     
     // Allows the theme to modify the existing padding/border.
@@ -85 +85 @@
     virtual ~Theme() = default;
 
+    virtual LengthSize minimumControlSize(ControlPart, const FontCascade&, const LengthSize& zoomedSize, float zoomFactor) const;
+
 private:
     Theme(const Theme&) = delete;

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -169 +169 @@
 
         // Min-Width / Min-Height
-        LengthSize minControlSize = Theme::singleton().minimumControlSize(part, style.fontCascade(), { style.minWidth(), style.minHeight() }, style.effectiveZoom());
+        LengthSize minControlSize = Theme::singleton().minimumControlSize(part, style.fontCascade(), { style.minWidth(), style.minHeight() }, { style.width(), style.height() }, style.effectiveZoom());
         if (minControlSize.width != style.minWidth())
             style.setMinWidth(WTFMove(minControlSize.width));